teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Move Utils from server to components

Browse source 
Rewrite CRC32 functions to the Boost equivalent
This commit is contained in:
Koncord 2017-03-04 13:08:22 +08:00
parent 9cffc1f661
commit c353e18645
9 changed files with 188 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/CMakeLists.txt
View file

@ -68,9 +68,9 @@ set(SERVER
main.cpp
Player.cpp
Networking.cpp
Utils.cpp
MasterClient.cpp
Cell.cpp
Utils.cpp
Script/Script.cpp Script/ScriptFunction.cpp
Script/ScriptFunctions.cpp

1
apps/openmw-mp/Script/Script.hpp
View file

@ -11,7 +11,6 @@
#include "Language.hpp"
#include <boost/any.hpp>
#include <Utils.hpp>
#include <unordered_map>
#include <memory>

2
apps/openmw-mp/Script/Types.hpp
View file

@ -10,7 +10,7 @@
#include <cstdint>
#include <type_traits>
#include <RakNetTypes.h>
#include <Utils.hpp>
#include "Utils.hpp"
#ifdef _WIN32
#include <winsock2.h>

226
apps/openmw-mp/Utils.cpp
View file

@ -1,43 +1,11 @@
//
// Created by koncord on 24.01.16.
// Created by koncord on 04.03.17.
//
#include "Utils.hpp"
#include <cstring>
#include <ctime>
#include <cmath>
#include <memory>
using namespace std;
#ifdef _WIN32
int setenv(const char *name, const char *value, int overwrite)
{
printf("%s: %s\n", name, value);
return _putenv_s(name, value);
}
#endif
std::string Utils::convertPath(std::string str)
{
#if defined(_WIN32)
#define _SEP_ '\\'
#elif defined(__APPLE__)
#define _SEP_ ':'
#endif
#if defined(_WIN32) || defined(__APPLE__)
for (auto &ch : str)
if (ch == '/')
ch = _SEP_;
#endif //defined(_WIN32) || defined(__APPLE__)
return str;
#undef _SEP_
}
const vector<string> Utils::split(const string &str, int delimiter)
{
string buffer;
@ -55,194 +23,4 @@ const vector<string> Utils::split(const string &str, int delimiter)
result.push_back(move(buffer));
return result;
}
void Utils::timestamp()
{
time_t ltime;
ltime = time(nullptr);
char t[32];
snprintf(t, sizeof(t), "[%s", asctime(localtime(&ltime)));
char* newline = strchr(t, '\n');
*newline = ']';
strcat(t, " ");
printf("%s", t);
}
// http://stackoverflow.com/questions/1637587/c-libcurl-console-progress-bar
int Utils::progress_func(double TotalToDownload, double NowDownloaded)
{
// how wide you want the progress meter to be
int totaldotz=40;
double fractiondownloaded = NowDownloaded / TotalToDownload;
// part of the progressmeter that's already "full"
int dotz = round(fractiondownloaded * totaldotz);
// create the "meter"
int ii=0;
printf("%3.0f%% [",fractiondownloaded*100);
// part that's full already
for ( ; ii < dotz;ii++) {
printf("=");
}
// remaining part (spaces)
for ( ; ii < totaldotz;ii++) {
printf(" ");
}
// and back to line begin - do not forget the fflush to avoid output buffering problems!
printf("]\r");
fflush(stdout);
return 1;
}
bool Utils::DoubleCompare(double a, double b, double epsilon)
{
return fabs(a - b) < epsilon;
}
string Utils::str_replace(const string& source, const char* find, const char* replace)
{
unsigned int find_len = strlen(find);
unsigned int replace_len = strlen(replace);
size_t pos = 0;
string dest = source;
while ((pos = dest.find(find, pos)) != string::npos)
{
dest.replace(pos, find_len, replace);
pos += replace_len;
}
return dest;
}
string& Utils::RemoveExtension(string& file)
{
size_t pos = file.find_last_of('.');
if (pos)
file = file.substr(0, pos);
return file;
}
long int Utils::FileLength(const char* file)
{
FILE* _file = fopen(file, "rb");
if (!_file)
return 0;
fseek(_file, 0, SEEK_END);
long int size = ftell(_file);
fclose(_file);
return size;
}
/* From:
http://web.archive.org/web/20080303102530/http://c.snippets.org/snip_lister.php?fname=crc_32.c
*/
#define UPDC32(octet,crc) (crc_32_tab[((crc)\
^ ((unsigned char)octet)) & 0xff] ^ ((crc) >> 8))
static unsigned int crc_32_tab[] = /* CRC polynomial 0xedb88320 */
{
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
unsigned int Utils::updateCRC32(unsigned char ch, unsigned int crc)
{
return UPDC32(ch, crc);
}
bool Utils::crc32file(const char* name, unsigned int* crc)
{
FILE* fin;
unsigned int oldcrc32;
long charcnt;
int c;
oldcrc32 = 0xFFFFFFFF;
charcnt = 0;
if ((fin = fopen(name, "rb")) == nullptr)
{
return false;
}
while ((c = getc(fin)) != EOF)
{
++charcnt;
oldcrc32 = UPDC32(c, oldcrc32);
}
if (ferror(fin))
{
charcnt = -1;
}
fclose(fin);
*crc = oldcrc32 = ~oldcrc32;
return true;
}
unsigned int Utils::crc32buf(char* buf, size_t len)
{
unsigned int oldcrc32;
oldcrc32 = 0xFFFFFFFF;
for (; len; --len, ++buf)
{
oldcrc32 = UPDC32(*buf, oldcrc32);
}
return ~oldcrc32;
}
}

35
apps/openmw-mp/Utils.hpp
View file

@ -1,12 +1,12 @@
//
// Created by koncord on 24.01.16.
// Created by koncord on 04.03.17.
//
#ifndef UTILS_HPP
#define UTILS_HPP
#ifndef OPENMW_UTILS_HPP
#define OPENMW_UTILS_HPP
#include <components/openmw-mp/Utils.hpp>
#include <cstddef>
#include <string>
#include <vector>
#if (!defined(DEBUG_PRINTF) && defined(DEBUG))
@ -15,16 +15,11 @@
#define DEBUG_PRINTF(...)
#endif
#ifdef _WIN32
int setenv(const char *name, const char *value, int overwrite);
#endif
namespace Utils
{
const std::vector<std::string> split(const std::string &str, int delimiter);
std::string convertPath(std::string str);
template<size_t N>
constexpr unsigned int hash(const char(&str)[N], size_t I = N)
{
@ -36,24 +31,6 @@ namespace Utils
return (I == 1 ? ((2166136261u ^ str[0]) * 16777619u) : ((hash(str, I - 1) ^ str[I - 1]) * 16777619u));
}
void timestamp();
int progress_func(double TotalToDownload, double NowDownloaded);
bool DoubleCompare(double a, double b, double epsilon);
std::string str_replace(const std::string &source, const char *find, const char *replace);
std::string &RemoveExtension(std::string &file);
long int FileLength(const char *file);
unsigned int crc32buf(char *buf, size_t len);
unsigned int updateCRC32(unsigned char ch, unsigned int crc);
bool crc32file(const char *name, unsigned int *crc);
template<typename F, typename T, typename E = void>
struct is_static_castable : std::false_type
{
@ -74,4 +51,6 @@ namespace Utils
F *from)
{ return dynamic_cast<T *>(from); }
}
#endif //UTILS_HPP
#endif //OPENMW_UTILS_HPP

1
apps/openmw-mp/main.cpp
View file

@ -15,6 +15,7 @@
#include <boost/iostreams/stream_buffer.hpp>
#include <boost/filesystem/fstream.hpp>
#include <components/openmw-mp/Version.hpp>
#include "Utils.hpp"
#include "MasterClient.hpp"

2
components/CMakeLists.txt
View file

@ -148,7 +148,7 @@ add_component_dir (version
)
add_component_dir (openmw-mp
Log
Log Utils
Controllers/PlayerPacketController Controllers/WorldPacketController
Packets/BasePacket Packets/Player/PlayerPacket Packets/World/WorldPacket

143
components/openmw-mp/Utils.cpp Normal file
View file

@ -0,0 +1,143 @@
//
// Created by koncord on 24.01.16.
//
#include "Utils.hpp"
#include <cstdio>
#include <cstring>
#include <ctime>
#include <cmath>
#include <memory>
#include <boost/crc.hpp>
#include <boost/filesystem/fstream.hpp>
using namespace std;
#ifdef _WIN32
int setenv(const char *name, const char *value, int overwrite)
{
printf("%s: %s\n", name, value);
return _putenv_s(name, value);
}
#endif
std::string Utils::convertPath(std::string str)
{
#if defined(_WIN32)
#define _SEP_ '\\'
#elif defined(__APPLE__)
#define _SEP_ ':'
#endif
#if defined(_WIN32) || defined(__APPLE__)
for (auto &ch : str)
if (ch == '/')
ch = _SEP_;
#endif //defined(_WIN32) || defined(__APPLE__)
return str;
#undef _SEP_
}
void Utils::timestamp()
{
time_t ltime;
ltime = time(0);
char t[32];
snprintf(t, sizeof(t), "[%s", asctime(localtime(&ltime)));
char* newline = strchr(t, '\n');
*newline = ']';
strcat(t, " ");
printf("%s", t);
}
// http://stackoverflow.com/questions/1637587/c-libcurl-console-progress-bar
int Utils::progress_func(double TotalToDownload, double NowDownloaded)
{
// how wide you want the progress meter to be
int totaldotz=40;
double fractiondownloaded = NowDownloaded / TotalToDownload;
// part of the progressmeter that's already "full"
int dotz = round(fractiondownloaded * totaldotz);
// create the "meter"
int ii=0;
printf("%3.0f%% [",fractiondownloaded*100);
// part that's full already
for ( ; ii < dotz;ii++) {
printf("=");
}
// remaining part (spaces)
for ( ; ii < totaldotz;ii++) {
printf(" ");
}
// and back to line begin - do not forget the fflush to avoid output buffering problems!
printf("]\r");
fflush(stdout);
return 1;
}
bool Utils::DoubleCompare(double a, double b, double epsilon)
{
return fabs(a - b) < epsilon;
}
string Utils::str_replace(const string& source, const char* find, const char* replace)
{
unsigned int find_len = strlen(find);
unsigned int replace_len = strlen(replace);
size_t pos = 0;
string dest = source;
while ((pos = dest.find(find, pos)) != string::npos)
{
dest.replace(pos, find_len, replace);
pos += replace_len;
}
return dest;
}
string& Utils::RemoveExtension(string& file)
{
size_t pos = file.find_last_of('.');
if (pos)
file = file.substr(0, pos);
return file;
}
long int Utils::FileLength(const char* file)
{
FILE* _file = fopen(file, "rb");
if (!_file)
return 0;
fseek(_file, 0, SEEK_END);
long int size = ftell(_file);
fclose(_file);
return size;
}
unsigned int ::Utils::crc32checksum(const std::string &file)
{
boost::crc_32_type crc32;
boost::filesystem::ifstream ifs(file, std::ios_base::binary);
if (ifs)
{
do
{
char buffer[1024];
ifs.read(buffer, 1024);
crc32.process_bytes( buffer, ifs.gcount() );
} while (ifs);
}
return crc32.checksum();
}

32
components/openmw-mp/Utils.hpp Normal file
View file

@ -0,0 +1,32 @@
//
// Created by koncord on 24.01.16.
//
#ifndef UTILS_HPP
#define UTILS_HPP
#include <string>
#ifdef _WIN32
int setenv(const char *name, const char *value, int overwrite);
#endif
namespace Utils
{
std::string convertPath(std::string str);
void timestamp();
int progress_func(double TotalToDownload, double NowDownloaded);
bool DoubleCompare(double a, double b, double epsilon);
std::string str_replace(const std::string &source, const char *find, const char *replace);
std::string &RemoveExtension(std::string &file);
long int FileLength(const char *file);
unsigned int crc32checksum(const std::string &file);
}
#endif //UTILS_HPP