diff --git a/cmake-build-debug/.cmake/api/v1/reply/cache-v2-c525c7eeda27dc1e9c2e.json b/cmake-build-debug/.cmake/api/v1/reply/cache-v2-74e388e3c83b5e9f141b.json similarity index 99% rename from cmake-build-debug/.cmake/api/v1/reply/cache-v2-c525c7eeda27dc1e9c2e.json rename to cmake-build-debug/.cmake/api/v1/reply/cache-v2-74e388e3c83b5e9f141b.json index 8510b67..1faff94 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/cache-v2-c525c7eeda27dc1e9c2e.json +++ b/cmake-build-debug/.cmake/api/v1/reply/cache-v2-74e388e3c83b5e9f141b.json @@ -635,7 +635,7 @@ } ], "type" : "INTERNAL", - "value" : "7" + "value" : "6" }, { "name" : "CMAKE_OBJCOPY", diff --git a/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-a8aaa00d4fa8b05c254c.json b/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-7bae8f6ecec2c20d44e8.json similarity index 98% rename from cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-a8aaa00d4fa8b05c254c.json rename to cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-7bae8f6ecec2c20d44e8.json index 265e591..7ed1b26 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-a8aaa00d4fa8b05c254c.json +++ b/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-7bae8f6ecec2c20d44e8.json @@ -123,9 +123,6 @@ "isExternal" : true, "path" : "/home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake" }, - { - "path" : "src/net/threads/CMakeLists.txt" - }, { "path" : "src/net/sockets/CMakeLists.txt" }, diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-27215020dd72ca5d2c67.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-1c7b18aeaee98d463d1b.json similarity index 82% rename from cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-27215020dd72ca5d2c67.json rename to cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-1c7b18aeaee98d463d1b.json index 192a855..882bb86 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-27215020dd72ca5d2c67.json +++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-1c7b18aeaee98d463d1b.json @@ -23,8 +23,8 @@ "childIndexes" : [ 2, - 5, - 6 + 4, + 5 ], "jsonFile" : "directory-src-Debug-b6cf2213fc5053b67c22.json", "minimumCMakeVersion" : @@ -39,8 +39,7 @@ "build" : "src/net", "childIndexes" : [ - 3, - 4 + 3 ], "jsonFile" : "directory-src.net-Debug-47a3c3dc6aa08e0f0c88.json", "minimumCMakeVersion" : @@ -55,17 +54,6 @@ 0 ] }, - { - "build" : "src/net/threads", - "jsonFile" : "directory-src.net.threads-Debug-6e3b6b31cb784f3b97cd.json", - "minimumCMakeVersion" : - { - "string" : "3.15" - }, - "parentIndex" : 2, - "projectIndex" : 0, - "source" : "src/net/threads" - }, { "build" : "src/net/sockets", "jsonFile" : "directory-src.net.sockets-Debug-ce26001da8dfcf6ecc09.json", @@ -119,8 +107,7 @@ 2, 3, 4, - 5, - 6 + 5 ], "name" : "netex", "targetIndexes" : @@ -136,21 +123,21 @@ { "directoryIndex" : 2, "id" : "netex::@fa6dfe1ce2083cdf68d6", - "jsonFile" : "target-netex-Debug-bfaae46eb44fcd1c27b4.json", + "jsonFile" : "target-netex-Debug-773e24b50692a35a441b.json", "name" : "netex", "projectIndex" : 0 }, { - "directoryIndex" : 6, + "directoryIndex" : 5, "id" : "netex_client::@8ca63c80a879d0067daa", - "jsonFile" : "target-netex_client-Debug-7bb063a5e032437645d0.json", + "jsonFile" : "target-netex_client-Debug-36867a3d6f50537a2a55.json", "name" : "netex_client", "projectIndex" : 0 }, { - "directoryIndex" : 5, + "directoryIndex" : 4, "id" : "netex_svr::@2804e40980a64c7d7ad1", - "jsonFile" : "target-netex_svr-Debug-eceba98322d47e70e99c.json", + "jsonFile" : "target-netex_svr-Debug-ebd43de8bd12df700549.json", "name" : "netex_svr", "projectIndex" : 0 } diff --git a/cmake-build-debug/.cmake/api/v1/reply/directory-src.net.threads-Debug-6e3b6b31cb784f3b97cd.json b/cmake-build-debug/.cmake/api/v1/reply/directory-src.net.threads-Debug-6e3b6b31cb784f3b97cd.json deleted file mode 100644 index 048c773..0000000 --- a/cmake-build-debug/.cmake/api/v1/reply/directory-src.net.threads-Debug-6e3b6b31cb784f3b97cd.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "backtraceGraph" : - { - "commands" : [], - "files" : [], - "nodes" : [] - }, - "installers" : [], - "paths" : - { - "build" : "src/net/threads", - "source" : "src/net/threads" - } -} diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T17-15-41-0520.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T22-16-12-0412.json similarity index 82% rename from cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T17-15-41-0520.json rename to cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T22-16-12-0412.json index 49836be..72faf08 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T17-15-41-0520.json +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-24T22-16-12-0412.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-27215020dd72ca5d2c67.json", + "jsonFile" : "codemodel-v2-1c7b18aeaee98d463d1b.json", "kind" : "codemodel", "version" : { @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-c525c7eeda27dc1e9c2e.json", + "jsonFile" : "cache-v2-74e388e3c83b5e9f141b.json", "kind" : "cache", "version" : { @@ -44,7 +44,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-a8aaa00d4fa8b05c254c.json", + "jsonFile" : "cmakeFiles-v1-7bae8f6ecec2c20d44e8.json", "kind" : "cmakeFiles", "version" : { @@ -66,7 +66,7 @@ { "cache-v2" : { - "jsonFile" : "cache-v2-c525c7eeda27dc1e9c2e.json", + "jsonFile" : "cache-v2-74e388e3c83b5e9f141b.json", "kind" : "cache", "version" : { @@ -76,7 +76,7 @@ }, "cmakeFiles-v1" : { - "jsonFile" : "cmakeFiles-v1-a8aaa00d4fa8b05c254c.json", + "jsonFile" : "cmakeFiles-v1-7bae8f6ecec2c20d44e8.json", "kind" : "cmakeFiles", "version" : { @@ -86,7 +86,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-27215020dd72ca5d2c67.json", + "jsonFile" : "codemodel-v2-1c7b18aeaee98d463d1b.json", "kind" : "codemodel", "version" : { diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-bfaae46eb44fcd1c27b4.json b/cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-773e24b50692a35a441b.json similarity index 88% rename from cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-bfaae46eb44fcd1c27b4.json rename to cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-773e24b50692a35a441b.json index f5dbf71..f8fa831 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-bfaae46eb44fcd1c27b4.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-netex-Debug-773e24b50692a35a441b.json @@ -23,7 +23,6 @@ "src/net/CMakeLists.txt", "/home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindOpenSSL.cmake", "CMakeLists.txt", - "src/net/threads/CMakeLists.txt", "src/net/sockets/CMakeLists.txt" ], "nodes" : @@ -80,17 +79,8 @@ { "command" : 6, "file" : 3, - "line" : 3, - "parent" : 9 - }, - { - "file" : 4 - }, - { - "command" : 6, - "file" : 4, "line" : 2, - "parent" : 11 + "parent" : 9 } ] }, @@ -125,10 +115,9 @@ [ 0, 1, - 2, + 3, 4, - 5, - 6 + 5 ] } ], @@ -169,18 +158,17 @@ [ 0, 1, - 2, + 3, 4, - 5, - 6 + 5 ] }, { "name" : "Header Files", "sourceIndexes" : [ - 3, - 7 + 2, + 6 ] } ], @@ -195,40 +183,34 @@ { "backtrace" : 10, "compileGroupIndex" : 0, - "path" : "src/net/threads/thread_manager.c", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 12, - "compileGroupIndex" : 0, "path" : "src/net/sockets/client.c", "sourceGroupIndex" : 0 }, { - "backtrace" : 12, + "backtrace" : 10, "path" : "src/net/sockets/communication.h", "sourceGroupIndex" : 1 }, { - "backtrace" : 12, + "backtrace" : 10, "compileGroupIndex" : 0, "path" : "src/net/sockets/sock_helper.c", "sourceGroupIndex" : 0 }, { - "backtrace" : 12, + "backtrace" : 10, "compileGroupIndex" : 0, "path" : "src/net/sockets/server.c", "sourceGroupIndex" : 0 }, { - "backtrace" : 12, + "backtrace" : 10, "compileGroupIndex" : 0, "path" : "src/net/sockets/thread_manager.c", "sourceGroupIndex" : 0 }, { - "backtrace" : 12, + "backtrace" : 10, "path" : "src/net/sockets/thread_manager.h", "sourceGroupIndex" : 1 } diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-7bb063a5e032437645d0.json b/cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-36867a3d6f50537a2a55.json similarity index 94% rename from cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-7bb063a5e032437645d0.json rename to cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-36867a3d6f50537a2a55.json index 4025c56..ff5d5fd 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-7bb063a5e032437645d0.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-netex_client-Debug-36867a3d6f50537a2a55.json @@ -106,8 +106,7 @@ "language" : "C", "sourceIndexes" : [ - 0, - 1 + 0 ] } ], @@ -166,8 +165,7 @@ "name" : "Source Files", "sourceIndexes" : [ - 0, - 1 + 0 ] } ], @@ -178,12 +176,6 @@ "compileGroupIndex" : 0, "path" : "src/client/main.c", "sourceGroupIndex" : 0 - }, - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "src/net/threads/thread_manager.c", - "sourceGroupIndex" : 0 } ], "type" : "EXECUTABLE" diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-eceba98322d47e70e99c.json b/cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-ebd43de8bd12df700549.json similarity index 94% rename from cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-eceba98322d47e70e99c.json rename to cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-ebd43de8bd12df700549.json index 0fc00b2..a03df08 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-eceba98322d47e70e99c.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-netex_svr-Debug-ebd43de8bd12df700549.json @@ -106,8 +106,7 @@ "language" : "C", "sourceIndexes" : [ - 0, - 1 + 0 ] } ], @@ -166,8 +165,7 @@ "name" : "Source Files", "sourceIndexes" : [ - 0, - 1 + 0 ] } ], @@ -178,12 +176,6 @@ "compileGroupIndex" : 0, "path" : "src/server/server.c", "sourceGroupIndex" : 0 - }, - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "src/net/threads/thread_manager.c", - "sourceGroupIndex" : 0 } ], "type" : "EXECUTABLE" diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index d93670d..f2f7b35 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 1d7ab20..5f46b8d 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,21 +1,11 @@ # ninja log v5 -146 220 1703436221823758554 debug/bin/libnetex.so 4c8e8b8e9c244ed1 -1 48 1703436134472793110 src/net/CMakeFiles/netex.dir/sockets/thread_manager.c.o 5c5a0caff432164e -0 146 1703436221750424409 src/net/CMakeFiles/netex.dir/netex.c.o da89b76b970f6a5c -1 43 1703436134469459740 src/net/CMakeFiles/netex.dir/sockets/sock_helper.c.o 740522a0ea7e1ae3 -1 70 1703436134496126701 src/net/CMakeFiles/netex.dir/sockets/server.c.o 52d37ab8fa80e77b -221 292 1703436221897092698 debug/bin/netex_svr 7e06ea11fb459236 -0 56 1703436134482793221 src/net/CMakeFiles/netex.dir/sockets/client.c.o 2122a8ee422198a -1 33 1703436221640423193 src/server/CMakeFiles/netex_svr.dir/server.c.o 17f3a11b15c63cc5 -2 37 1703438406571685727 src/server/CMakeFiles/netex_svr.dir/server.c.o 17f3a11b15c63cc5 -1 49 1703438406581685840 src/net/CMakeFiles/netex.dir/threads/thread_manager.c.o 6a74a73287a2da04 +146 223 1703438495692685822 debug/bin/libnetex.so c29a978d9713284e 2 50 1703438406581685840 src/net/CMakeFiles/netex.dir/sockets/thread_manager.c.o 5c5a0caff432164e 3 54 1703438406588352580 src/server/CMakeFiles/netex_svr.dir/__/net/threads/thread_manager.c.o 5ea6199c93850319 +1 146 1703438495616018294 src/net/CMakeFiles/netex.dir/netex.c.o da89b76b970f6a5c 2 61 1703438406595019323 src/net/CMakeFiles/netex.dir/sockets/sock_helper.c.o 740522a0ea7e1ae3 2 75 1703438406608352805 src/net/CMakeFiles/netex.dir/sockets/server.c.o 52d37ab8fa80e77b -1 77 1703438406611686176 src/net/CMakeFiles/netex.dir/sockets/client.c.o 2122a8ee422198a -1 32 1703438495502683690 src/server/CMakeFiles/netex_svr.dir/server.c.o 17f3a11b15c63cc5 -1 146 1703438495616018294 src/net/CMakeFiles/netex.dir/netex.c.o da89b76b970f6a5c -146 223 1703438495692685822 debug/bin/libnetex.so c29a978d9713284e -1 37 1703438546219919364 src/server/CMakeFiles/netex_svr.dir/server.c.o 17f3a11b15c63cc5 37 113 1703438546293253521 debug/bin/netex_svr b6b4e24be024abe9 +1 77 1703438406611686176 src/net/CMakeFiles/netex.dir/sockets/client.c.o 2122a8ee422198a +1 37 1703438546219919364 src/server/CMakeFiles/netex_svr.dir/server.c.o 17f3a11b15c63cc5 +1 49 1703438406581685840 src/net/CMakeFiles/netex.dir/threads/thread_manager.c.o 6a74a73287a2da04 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 1adbcf9..d757279 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 24 18:22 CET +Start testing: Dec 24 23:16 CET ---------------------------------------------------------- -End testing: Dec 24 18:22 CET +End testing: Dec 24 23:16 CET diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index 5abc28d..5d2d375 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -113,14 +113,6 @@ build src/net/CMakeFiles/netex.dir/netex.c.o: C_COMPILER__netex_unscanned_Debug OBJECT_DIR = src/net/CMakeFiles/netex.dir OBJECT_FILE_DIR = src/net/CMakeFiles/netex.dir -build src/net/CMakeFiles/netex.dir/threads/thread_manager.c.o: C_COMPILER__netex_unscanned_Debug /home/max/GitHub/netex/src/net/threads/thread_manager.c || cmake_object_order_depends_target_netex - DEFINES = -Dnetex_EXPORTS - DEP_FILE = src/net/CMakeFiles/netex.dir/threads/thread_manager.c.o.d - FLAGS = -g -fPIC -fdiagnostics-color=always -pthread - INCLUDES = -I/home/max/GitHub/netex/src/net/include - OBJECT_DIR = src/net/CMakeFiles/netex.dir - OBJECT_FILE_DIR = src/net/CMakeFiles/netex.dir/threads - build src/net/CMakeFiles/netex.dir/sockets/client.c.o: C_COMPILER__netex_unscanned_Debug /home/max/GitHub/netex/src/net/sockets/client.c || cmake_object_order_depends_target_netex DEFINES = -Dnetex_EXPORTS DEP_FILE = src/net/CMakeFiles/netex.dir/sockets/client.c.o.d @@ -161,7 +153,7 @@ build src/net/CMakeFiles/netex.dir/sockets/thread_manager.c.o: C_COMPILER__netex ############################################# # Link the shared library debug/bin/libnetex.so -build debug/bin/libnetex.so: C_SHARED_LIBRARY_LINKER__netex_Debug src/net/CMakeFiles/netex.dir/netex.c.o src/net/CMakeFiles/netex.dir/threads/thread_manager.c.o src/net/CMakeFiles/netex.dir/sockets/client.c.o src/net/CMakeFiles/netex.dir/sockets/sock_helper.c.o src/net/CMakeFiles/netex.dir/sockets/server.c.o src/net/CMakeFiles/netex.dir/sockets/thread_manager.c.o | /usr/lib/libssl.so /usr/lib/libcrypto.so +build debug/bin/libnetex.so: C_SHARED_LIBRARY_LINKER__netex_Debug src/net/CMakeFiles/netex.dir/netex.c.o src/net/CMakeFiles/netex.dir/sockets/client.c.o src/net/CMakeFiles/netex.dir/sockets/sock_helper.c.o src/net/CMakeFiles/netex.dir/sockets/server.c.o src/net/CMakeFiles/netex.dir/sockets/thread_manager.c.o | /usr/lib/libssl.so /usr/lib/libcrypto.so LANGUAGE_COMPILE_FLAGS = -g LINK_LIBRARIES = /usr/lib/libssl.so /usr/lib/libcrypto.so OBJECT_DIR = src/net/CMakeFiles/netex.dir @@ -201,34 +193,6 @@ build src/net/rebuild_cache: phony src/net/CMakeFiles/rebuild_cache.util # ============================================================================= -############################################# -# Utility command for edit_cache - -build src/net/threads/CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/max/GitHub/netex/cmake-build-debug/src/net/threads && /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. - DESC = No interactive CMake dialog available... - restat = 1 - -build src/net/threads/edit_cache: phony src/net/threads/CMakeFiles/edit_cache.util - - -############################################# -# Utility command for rebuild_cache - -build src/net/threads/CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/max/GitHub/netex/cmake-build-debug/src/net/threads && /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/bin/cmake --regenerate-during-build -S/home/max/GitHub/netex -B/home/max/GitHub/netex/cmake-build-debug - DESC = Running CMake to regenerate build system... - pool = console - restat = 1 - -build src/net/threads/rebuild_cache: phony src/net/threads/CMakeFiles/rebuild_cache.util - -# ============================================================================= -# Write statements declared in CMakeLists.txt: -# /home/max/GitHub/netex/src/net/CMakeLists.txt -# ============================================================================= - - ############################################# # Utility command for edit_cache @@ -272,13 +236,6 @@ build src/server/CMakeFiles/netex_svr.dir/server.c.o: C_COMPILER__netex_svr_unsc OBJECT_DIR = src/server/CMakeFiles/netex_svr.dir OBJECT_FILE_DIR = src/server/CMakeFiles/netex_svr.dir -build src/server/CMakeFiles/netex_svr.dir/__/net/threads/thread_manager.c.o: C_COMPILER__netex_svr_unscanned_Debug /home/max/GitHub/netex/src/net/threads/thread_manager.c || cmake_object_order_depends_target_netex_svr - DEP_FILE = src/server/CMakeFiles/netex_svr.dir/__/net/threads/thread_manager.c.o.d - FLAGS = -g -fdiagnostics-color=always -pthread - INCLUDES = -I/home/max/GitHub/netex/src/net/include - OBJECT_DIR = src/server/CMakeFiles/netex_svr.dir - OBJECT_FILE_DIR = src/server/CMakeFiles/netex_svr.dir/__/net/threads - # ============================================================================= # Link build statements for EXECUTABLE target netex_svr @@ -287,7 +244,7 @@ build src/server/CMakeFiles/netex_svr.dir/__/net/threads/thread_manager.c.o: C_C ############################################# # Link the executable debug/bin/netex_svr -build debug/bin/netex_svr: C_EXECUTABLE_LINKER__netex_svr_Debug src/server/CMakeFiles/netex_svr.dir/server.c.o src/server/CMakeFiles/netex_svr.dir/__/net/threads/thread_manager.c.o | debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so || debug/bin/libnetex.so +build debug/bin/netex_svr: C_EXECUTABLE_LINKER__netex_svr_Debug src/server/CMakeFiles/netex_svr.dir/server.c.o | debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so || debug/bin/libnetex.so FLAGS = -g LINK_LIBRARIES = -Wl,-rpath,/home/max/GitHub/netex/cmake-build-debug/debug/bin debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so OBJECT_DIR = src/server/CMakeFiles/netex_svr.dir @@ -340,13 +297,6 @@ build src/client/CMakeFiles/netex_client.dir/main.c.o: C_COMPILER__netex_client_ OBJECT_DIR = src/client/CMakeFiles/netex_client.dir OBJECT_FILE_DIR = src/client/CMakeFiles/netex_client.dir -build src/client/CMakeFiles/netex_client.dir/__/net/threads/thread_manager.c.o: C_COMPILER__netex_client_unscanned_Debug /home/max/GitHub/netex/src/net/threads/thread_manager.c || cmake_object_order_depends_target_netex_client - DEP_FILE = src/client/CMakeFiles/netex_client.dir/__/net/threads/thread_manager.c.o.d - FLAGS = -g -fdiagnostics-color=always -pthread - INCLUDES = -I/home/max/GitHub/netex/src/net/include - OBJECT_DIR = src/client/CMakeFiles/netex_client.dir - OBJECT_FILE_DIR = src/client/CMakeFiles/netex_client.dir/__/net/threads - # ============================================================================= # Link build statements for EXECUTABLE target netex_client @@ -355,7 +305,7 @@ build src/client/CMakeFiles/netex_client.dir/__/net/threads/thread_manager.c.o: ############################################# # Link the executable debug/bin/netex_client -build debug/bin/netex_client: C_EXECUTABLE_LINKER__netex_client_Debug src/client/CMakeFiles/netex_client.dir/main.c.o src/client/CMakeFiles/netex_client.dir/__/net/threads/thread_manager.c.o | debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so || debug/bin/libnetex.so +build debug/bin/netex_client: C_EXECUTABLE_LINKER__netex_client_Debug src/client/CMakeFiles/netex_client.dir/main.c.o | debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so || debug/bin/libnetex.so FLAGS = -g LINK_LIBRARIES = -Wl,-rpath,/home/max/GitHub/netex/cmake-build-debug/debug/bin debug/bin/libnetex.so /usr/lib/libssl.so /usr/lib/libcrypto.so OBJECT_DIR = src/client/CMakeFiles/netex_client.dir @@ -427,7 +377,7 @@ build src/client/all: phony debug/bin/netex_client ############################################# # Folder: /home/max/GitHub/netex/cmake-build-debug/src/net -build src/net/all: phony debug/bin/libnetex.so src/net/threads/all src/net/sockets/all +build src/net/all: phony debug/bin/libnetex.so src/net/sockets/all # ============================================================================= @@ -438,13 +388,6 @@ build src/net/sockets/all: phony # ============================================================================= -############################################# -# Folder: /home/max/GitHub/netex/cmake-build-debug/src/net/threads - -build src/net/threads/all: phony - -# ============================================================================= - ############################################# # Folder: /home/max/GitHub/netex/cmake-build-debug/src/server @@ -457,14 +400,14 @@ build src/server/all: phony debug/bin/netex_svr ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeGenericSystem.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeInitializeConfigs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInitialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindOpenSSL.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPkgConfig.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-Initialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/UnixPaths.cmake /home/max/GitHub/netex/CMakeLists.txt /home/max/GitHub/netex/src/CMakeLists.txt /home/max/GitHub/netex/src/client/CMakeLists.txt /home/max/GitHub/netex/src/net/CMakeLists.txt /home/max/GitHub/netex/src/net/sockets/CMakeLists.txt /home/max/GitHub/netex/src/net/threads/CMakeLists.txt /home/max/GitHub/netex/src/server/CMakeLists.txt CMakeCache.txt CMakeFiles/3.27.8/CMakeCCompiler.cmake CMakeFiles/3.27.8/CMakeSystem.cmake +build build.ninja: RERUN_CMAKE | /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeGenericSystem.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeInitializeConfigs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInitialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindOpenSSL.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPkgConfig.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-Initialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/UnixPaths.cmake /home/max/GitHub/netex/CMakeLists.txt /home/max/GitHub/netex/src/CMakeLists.txt /home/max/GitHub/netex/src/client/CMakeLists.txt /home/max/GitHub/netex/src/net/CMakeLists.txt /home/max/GitHub/netex/src/net/sockets/CMakeLists.txt /home/max/GitHub/netex/src/server/CMakeLists.txt CMakeCache.txt CMakeFiles/3.27.8/CMakeCCompiler.cmake CMakeFiles/3.27.8/CMakeSystem.cmake pool = console ############################################# # A missing CMake input file is not an error. -build /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeGenericSystem.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeInitializeConfigs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInitialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindOpenSSL.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPkgConfig.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-Initialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/UnixPaths.cmake /home/max/GitHub/netex/CMakeLists.txt /home/max/GitHub/netex/src/CMakeLists.txt /home/max/GitHub/netex/src/client/CMakeLists.txt /home/max/GitHub/netex/src/net/CMakeLists.txt /home/max/GitHub/netex/src/net/sockets/CMakeLists.txt /home/max/GitHub/netex/src/net/threads/CMakeLists.txt /home/max/GitHub/netex/src/server/CMakeLists.txt CMakeCache.txt CMakeFiles/3.27.8/CMakeCCompiler.cmake CMakeFiles/3.27.8/CMakeSystem.cmake: phony +build /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeGenericSystem.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeInitializeConfigs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInformation.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInitialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindOpenSSL.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPkgConfig.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-C.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-Initialize.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux.cmake /home/max/.local/share/JetBrains/Toolbox/apps/clion-nova/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/UnixPaths.cmake /home/max/GitHub/netex/CMakeLists.txt /home/max/GitHub/netex/src/CMakeLists.txt /home/max/GitHub/netex/src/client/CMakeLists.txt /home/max/GitHub/netex/src/net/CMakeLists.txt /home/max/GitHub/netex/src/net/sockets/CMakeLists.txt /home/max/GitHub/netex/src/server/CMakeLists.txt CMakeCache.txt CMakeFiles/3.27.8/CMakeCCompiler.cmake CMakeFiles/3.27.8/CMakeSystem.cmake: phony ############################################# diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index f24088c..8848b80 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -1,3 +1,4 @@ +# netex src add_library(netex SHARED "netex.c") @@ -7,5 +8,3 @@ target_link_libraries(netex OpenSSL::SSL) target_include_directories(netex PRIVATE ${CMAKE_SOURCE_DIR}/src/net/include) -add_subdirectory(threads) -add_subdirectory(sockets) diff --git a/src/net/threads/CMakeLists.txt b/src/net/threads/CMakeLists.txt deleted file mode 100644 index 7c9507f..0000000 --- a/src/net/threads/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# libnet threads - -target_sources(netex PUBLIC - "thread_manager.c") \ No newline at end of file diff --git a/src/net/threads/thread_manager.c b/src/net/threads/thread_manager.c deleted file mode 100644 index 7487ff0..0000000 --- a/src/net/threads/thread_manager.c +++ /dev/null @@ -1,18 +0,0 @@ -// -// Created by max on 24-12-23. -// - - -#include -#include "netex.h" -#include "netexthreads.h" - -pthread_t create_thread(void *(*func) (void*)) -{ - pthread_t thread; - if (pthread_create(&thread, NULL, func, NULL) != 0) - { - ERROR("[threadmanager] Failed to create thread!"); - } - return thread; -} \ No newline at end of file diff --git a/src/server/server.c b/src/server/server.c index 458cdd7..3cc3459 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -1,4 +1,3 @@ - #include #include "netex.h" #include "netexssl.h"