diff --git a/CMakeLists.txt b/CMakeLists.txt index ec647cd..6d8e718 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,20 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb") include(ExternalProject) +ExternalProject_Add( + sqlite + PREFIX "" + URL https://www.sqlite.org/2025/sqlite-amalgamation-3480000.zip + URL_HASH SHA256=d9a15a42db7c78f88fe3d3c5945acce2f4bfe9e4da9f685cd19f6ea1d40aa884 + DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/downloads + SOURCE_DIR ${CMAKE_BINARY_DIR}/sqlite + CONFIGURE_COMMAND "" + BUILD_COMMAND + ${CMAKE_C_COMPILER} -c ${CMAKE_BINARY_DIR}/sqlite/sqlite3.c -o ${CMAKE_BINARY_DIR}/sqlite-prefix/sqlite3.o -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA -DSQLITE_OMIT_AUTOINIT -DSQLITE_STRICT_SUBTYPE=1 -DSQLITE_THREADSAFE=2 && + ${CMAKE_AR} rcs ${CMAKE_BINARY_DIR}/sqlite-prefix/libsqlite3.a ${CMAKE_BINARY_DIR}/sqlite-prefix/sqlite3.o + INSTALL_COMMAND "" +) + ExternalProject_Add( raylib PREFIX "" @@ -41,11 +55,16 @@ target_link_libraries(app ${CMAKE_BINARY_DIR}/raylib/lib/libraylib.a) add_executable(server server/src/server.cpp + server/src/sql.cpp + shared/src/TcpSocket.cpp + shared/src/values/Dna.cpp + shared/src/values/DnaManager.cpp + shared/src/values/mrand.cpp ) # Add include directories -target_include_directories(server PRIVATE server/inc shared/inc) - +target_include_directories(server PRIVATE server/inc shared/inc ${CMAKE_BINARY_DIR}/sqlite/) +target_link_libraries(server PRIVATE pthread dl m ${CMAKE_BINARY_DIR}/sqlite-prefix/libsqlite3.a) add_executable(client server/src/client.cpp diff --git a/app/src/DnaStore.cpp b/app/src/DnaStore.cpp index 95cf163..1959676 100644 --- a/app/src/DnaStore.cpp +++ b/app/src/DnaStore.cpp @@ -119,7 +119,7 @@ void DnaStore::saveGen(DnaManagerData *data) gen.resize(NUM_PER_GEN); for (std::size_t i = 0; i < NUM_PER_GEN; i++) { - gen[i].hash = ComputeCRC32((unsigned char *)&data->vector[i], sizeof(Dna)); + gen[i].hash = mrand::computeCRC32((unsigned char *)&data->vector[i], sizeof(Dna)); gen[i].liked = Liked::tbd; gen[i].index = i; } diff --git a/server/inc/sql.hpp b/server/inc/sql.hpp new file mode 100644 index 0000000..df75399 --- /dev/null +++ b/server/inc/sql.hpp @@ -0,0 +1,8 @@ + + +namespace sql +{ + void init(); + void shutdown(); + +} diff --git a/server/src/client.cpp b/server/src/client.cpp index 30a72f1..c334e33 100644 --- a/server/src/client.cpp +++ b/server/src/client.cpp @@ -1,9 +1,9 @@ #include "TcpSocket.hpp" +#include "NetConst.hpp" +#include "values/DnaManager.hpp" #include - -using namespace std; - -char mes[] = "Hello Server!"; +#include +#include int main() { @@ -15,24 +15,31 @@ int main() return 0; } - char tempBuffer[AS_DEFAULT_BUFFER_SIZE + 1]; - ssize_t messageLength; + std::ifstream idf("ID.bin", std::ios_base::binary); - // You should do an input loop, so the program won't terminate immediately - string input; - getline(cin, input); - while (input != "exit") - { - TcpSocket::sendt(sock, input.data(), input.size()); - messageLength = TcpSocket::recvt(sock, tempBuffer, AS_DEFAULT_BUFFER_SIZE); - if (messageLength <= 0) - { - break; - } - tempBuffer[messageLength] = 0; - printf("%s\n", tempBuffer); - getline(cin, input); - } + uint64_t ID = 0; + + idf.read((char *)&ID, sizeof(ID)); + printf("id: %ld\n", ID); + + TcpSocket::sendt(sock, &StartHeader, sizeof(StartHeader)); + TcpSocket::sendt(sock, &ID, sizeof(ID)); + + size_t needed_gen = 0; + + TcpSocket::recvt(sock, &needed_gen, sizeof(needed_gen)); + + char filename[20]; + int ret = sprintf(filename, "gen%04ld.bin", needed_gen); + + idf.close(); + idf.open(filename); + + std::vector net; + net.resize(NUM_PER_GEN); + + idf.read((char *)net.data(), NUM_PER_GEN * sizeof(NetUnit)); + TcpSocket::sendt(sock, net.data(), NUM_PER_GEN * sizeof(NetUnit)); TcpSocket::closet(sock); diff --git a/server/src/server.cpp b/server/src/server.cpp index 94411a5..bdce2d9 100644 --- a/server/src/server.cpp +++ b/server/src/server.cpp @@ -1,28 +1,103 @@ #include "TcpSocket.hpp" +#include "NetConst.hpp" +#include "sql.hpp" +#include "values/DnaManager.hpp" #include -using namespace std; +#include // use pthread rw_lock to lock db so you can safy clone .db file +typedef std::vector NetList; +typedef std::vector UserList; + +std::map data; + +NetList generate_first(uint64_t id) +{ + std::vector ret; + ret.resize(NUM_PER_GEN); + + uint128 randSeed = mrand::getState(id); + + for (std::size_t i = 0; i < NUM_PER_GEN; i++) + { + Dna dna; + DNA::newDna(&dna, &randSeed); + + ret[i].hash = mrand::computeCRC32(&dna, sizeof(Dna)); + ret[i].liked = Liked::tbd; + ret[i].index = i; + } + + return ret; +} + // When a new client connected: void call(int sock, sockaddr_in newSocketInfo) { std::cout << "new User" << std::endl; - char tempBuffer[AS_DEFAULT_BUFFER_SIZE + 1]; - ssize_t messageLength; - while ((messageLength = TcpSocket::recvt(sock, tempBuffer, AS_DEFAULT_BUFFER_SIZE)) > 0) + + uint64_t conf, id; + + TcpSocket::recvt(sock, &conf, sizeof(conf)); + TcpSocket::recvt(sock, &id, sizeof(id)); + + if (conf != StartHeader) { - tempBuffer[messageLength] = '\0'; - TcpSocket::sendt(sock, tempBuffer, messageLength); + TcpSocket::closet(sock); + return; } + + if (id == 0) + { + printf("ID ERROR\n"); + return; + } + + auto found = data.find(id); + if (found == data.end()) + { + printf("notfound\n"); + UserList list; + NetList netList = generate_first(id); + list.push_back(netList); + data.insert(std::pair(id, list)); + } + found = data.find(id); + + // repete point + size_t gen = found->second.size() - 1; + + TcpSocket::sendt(sock, &gen, sizeof(size_t)); + + NetList list; + list.resize(NUM_PER_GEN); + + TcpSocket::recvt(sock, list.data(), NUM_PER_GEN * sizeof(NetUnit)); + + for (size_t i = 0; i < NUM_PER_GEN; i++) + { + if (found->second[0][i].hash != list[i].hash) + { + found->second[0][i].liked != list[i].liked; + printf("Not same\n"); + } + } + + // generate the next generation hash form the new info and repete form repete point + + printf("same\n"); + + printf("id: %ld\n", id); + std::cout << "del USER" << std::endl; TcpSocket::closet(sock); } int main() { - + sql::init(); // Bind the server to a port. int err = TcpSocket::listent("0.0.0.0", 8888, call); if (err < 0) diff --git a/server/src/sql.cpp b/server/src/sql.cpp new file mode 100644 index 0000000..2d5022a --- /dev/null +++ b/server/src/sql.cpp @@ -0,0 +1,77 @@ +#include "sql.hpp" + +#include +#include + +#include + +const char create_table[] = "CREATE TABLE IF NOT EXISTS prim_table ( ID INTEGER PRIMARY KEY, GEN INTEGER, HASH INTEGER, POS INTEGER, LIKED INTEGER);"; + +const char create_index[] = "CREATE INDEX IF NOT EXISTS idx_id ON prim_table (ID);"; + +constexpr char DB_NAME[] = "data.db"; + +static int callback(void *NotUsed, int argc, char **argv, char **azColName) +{ + int i; + for (i = 0; i < argc; i++) + { + printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL"); + } + printf("\n"); + return 0; +} + +void sql::init() +{ + sqlite3_initialize(); + sqlite3 *db; + char *zErrMsg = 0; + int rc; + + /* Open database */ + rc = sqlite3_open(DB_NAME, &db); + + if (rc) + { + fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db)); + return; + } + else + { + fprintf(stdout, "Opened database successfully\n"); + } + + /* Execute SQL statement */ + rc = sqlite3_exec(db, create_table, callback, 0, &zErrMsg); + + if (rc != SQLITE_OK) + { + fprintf(stderr, "SQL error: %s\n", zErrMsg); + sqlite3_free(zErrMsg); + } + else + { + fprintf(stdout, "Table created successfully\n"); + } + + /* Execute SQL statement */ + rc = sqlite3_exec(db, create_index, callback, 0, &zErrMsg); + + if (rc != SQLITE_OK) + { + fprintf(stderr, "SQL error: %s\n", zErrMsg); + sqlite3_free(zErrMsg); + } + else + { + fprintf(stdout, "Index created successfully\n"); + } + + sqlite3_close(db); +} + +void sql::shutdown() +{ + sqlite3_shutdown(); +} \ No newline at end of file diff --git a/shared/inc/NetConst.hpp b/shared/inc/NetConst.hpp new file mode 100644 index 0000000..6e856fe --- /dev/null +++ b/shared/inc/NetConst.hpp @@ -0,0 +1,3 @@ +#include + +constexpr uint64_t StartHeader = 1737720524UL; \ No newline at end of file diff --git a/shared/inc/values/mrand.hpp b/shared/inc/values/mrand.hpp index 7832161..04b4cbc 100644 --- a/shared/inc/values/mrand.hpp +++ b/shared/inc/values/mrand.hpp @@ -13,4 +13,5 @@ namespace mrand uint128 getState(unsigned long long seed); float getFloat(uint128 *state); int getValue(int min, int max, uint128 *state); + unsigned int computeCRC32(void *data, int dataSize); } \ No newline at end of file diff --git a/shared/src/values/mrand.cpp b/shared/src/values/mrand.cpp index 2ab1e9c..1bacff2 100644 --- a/shared/src/values/mrand.cpp +++ b/shared/src/values/mrand.cpp @@ -60,4 +60,49 @@ namespace mrand { return my_rprand_xoshiro((uint32_t *)state) / 4294967295.0f; } + + unsigned int computeCRC32(void *data, int dataSize) + { + static unsigned int crcTable[256] = { + 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 crc = ~0u; + + unsigned char *datac = (unsigned char *)data; + for (int i = 0; i < dataSize; i++) + crc = (crc >> 8) ^ crcTable[datac[i] ^ (crc & 0xff)]; + + return ~crc; + } } \ No newline at end of file