Merge pull request 'fix/reinit' (#3) from fix/reinit into master

Reviewed-on: #3

.gitignore

@@ -4,4 +4,3 @@ build/
 compile_commands.json
 .gdb_history
 .cmake.conf
-third_party/

CMakeLists.txt

@@ -223,8 +223,26 @@ if((CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") OR (CMAKE_SYSTEM_PROCESSOR MATCHES
   endif()
 endif()
 
+# set(LIB_NAMES tile)
+#
+# if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR
+# ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}"
+# STREQUAL "GNU") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD") OR
+# ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") OR ("${CMAKE_SYSTEM_NAME}"
+# STREQUAL "DragonFly") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME:
+# It should be "GNU ld # for elf" set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES}
+# -Wl,--no-whole-archive) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+# set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) endif()
 
 add_library(tile::tile ALIAS tile)
+# add_library(tile SHARED $<TARGET_OBJECTS:tile>) target_include_directories(
+# tile PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt/include"
+# "${CMAKE_CURRENT_BINARY_DIR}/third_party/glog"
+# "${CMAKE_CURRENT_SOURCE_DIR}/third_party/glog/src"
+# "${CMAKE_CURRENT_SOURCE_DIR}" RPIVATE
+# "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include")
+# target_link_libraries( tile PRIVATE ${WHOLE_ARCHIVE_PREFIX} gflags::gflags
+# glog::glog libcurl fmt::fmt ${NO_WHOLE_ARCHIVE_PREFIX})
 
 if(TILE_BUILD_TESTS)
   enable_testing()

README.md

@@ -5,7 +5,4 @@
     - [ ] 支持UDP
     - [ ] 支持TCP
 
-## 同步容器
-  - [ ] queue
-
 

tile/init.cc

@@ -32,7 +32,6 @@ namespace tile {
 namespace {
 
 std::atomic<bool> g_quit_siganl{false};
-std::atomic<bool> g_tile_running{false};
 
 void
 QuitSignalHandler(int sig)
@@ -59,11 +58,6 @@ InstallQuitSignalHandler()
 int
 Start(int argc, char **argv, std::function<int(int, char **)> cb, bool single_thread, bool enable_crash_catch)
 {
-    {
-        bool expected = false;
-        TILE_CHECK(g_tile_running.compare_exchange_strong(expected, true), "tile already running.");
-    }
-
     if (enable_crash_catch) {
         // TODO: Add InstallFailureSignalHandler
         // google::InstallFailureSignalHandler();
@@ -140,14 +134,13 @@ TerminateBasicRuntime()
 std::mutex init_lock;
 std::condition_variable init_cv;
 std::thread *lib_thread;
+const char *my_argv[1] = {"unknown"};
 
 void
 Init(int argc, char **argv, std::function<int(int, char **)> cb)
 {
     std::unique_lock<std::mutex> _(init_lock);
-    TILE_CHECK(g_tile_running.load() == false, "tile already running.");
+    assert(!lib_thread && "ReInitialize!!!");
-    assert(lib_thread && "ReInitialize!!!");
-    const char *my_argv[1] = {"unknown"};
 
     if (!argv) {
         argc = 1;