fix: 尝试解决CMake构建问题

hevake · hevake · commit 5eccc280ebfc · 2024-06-12T08:24:52.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,6 +76,7 @@ option(TBOX_ENABLE_EVENTX "build eventx" ON)
 option(TBOX_ENABLE_LOG "build log" ON)
 option(TBOX_ENABLE_NETWORK "build network" ON)
 option(TBOX_ENABLE_TERMINAL "build terminal" ON)
+option(TBOX_ENABLE_TRACE "build trace" ON)
 option(TBOX_ENABLE_MAIN "build main" ON)
 
 option(TBOX_ENABLE_COROUTINE "build coroutine" ON)
@@ -157,6 +158,11 @@ if(TBOX_ENABLE_TERMINAL)
     list(APPEND TBOX_COMPONENTS terminal)
 endif()
 
+if(TBOX_ENABLE_TRACE)
+    message(STATUS "trace module enabled")
+    add_subdirectory(modules/trace/lib)
+endif()
+
 if(TBOX_ENABLE_MAIN)
     message(STATUS "main module enabled")
     list(APPEND TBOX_COMPONENTS main)
diff --git a/modules/alarm/CMakeLists.txt b/modules/alarm/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_ALARM_VERSION_MINOR 0)
 set(TBOX_ALARM_VERSION_PATCH 1)
 set(TBOX_ALARM_VERSION ${TBOX_ALARM_VERSION_MAJOR}.${TBOX_ALARM_VERSION_MINOR}.${TBOX_ALARM_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.alarm")
+add_definitions(-DMODULE_ID="tbox.alarm")
 
 set(TBOX_LIBRARY_NAME tbox_alarm)
 
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
@@ -23,7 +23,7 @@ set(TBOX_BASE_VERSION_MINOR 0)
 set(TBOX_BASE_VERSION_PATCH 1)
 set(TBOX_BASE_VERSION ${TBOX_BASE_VERSION_MAJOR}.${TBOX_BASE_VERSION_MINOR}.${TBOX_BASE_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.base")
+add_definitions(-DMODULE_ID="tbox.base")
 
 set(TBOX_LIBRARY_NAME tbox_base)
 
@@ -100,7 +100,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/base
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets
diff --git a/modules/base/recorder.cpp b/modules/base/recorder.cpp
@@ -19,7 +19,7 @@
 */
 #include"recorder.h"
 
-#include<sys/time.h>
+#include <sys/time.h>
 
 namespace tbox {
 namespace trace {
diff --git a/modules/coroutine/CMakeLists.txt b/modules/coroutine/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_COROUTINE_VERSION_MINOR 0)
 set(TBOX_COROUTINE_VERSION_PATCH 1)
 set(TBOX_COROUTINE_VERSION ${TBOX_COROUTINE_VERSION_MAJOR}.${TBOX_COROUTINE_VERSION_MINOR}.${TBOX_COROUTINE_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.coroutine")
+add_definitions(-DMODULE_ID="tbox.coroutine")
 set(TBOX_LIBRARY_NAME tbox_coroutine)
 
 set(TBOX_COROUTINE_HEADERS
diff --git a/modules/crypto/CMakeLists.txt b/modules/crypto/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_CRYPTO_VERSION_MINOR 0)
 set(TBOX_CRYPTO_VERSION_PATCH 1)
 set(TBOX_CRYPTO_VERSION ${TBOX_CRYPTO_VERSION_MAJOR}.${TBOX_CRYPTO_VERSION_MINOR}.${TBOX_CRYPTO_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.crypto")
+add_definitions(-DMODULE_ID="tbox.crypto")
 
 set(TBOX_LIBRARY_NAME tbox_crypto)
 
diff --git a/modules/dbus/CMakeLists.txt b/modules/dbus/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_DBUS_VERSION_MINOR 0)
 set(TBOX_DBUS_VERSION_PATCH 1)
 set(TBOX_DBUS_VERSION ${TBOX_DBUS_VERSION_MAJOR}.${TBOX_DBUS_VERSION_MINOR}.${TBOX_DBUS_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.dbus")
+add_definitions(-DMODULE_ID="tbox.dbus")
 
 set(TBOX_LIBRARY_NAME tbox_dbus)
 
diff --git a/modules/event/CMakeLists.txt b/modules/event/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_EVENT_VERSION_MINOR 1)
 set(TBOX_EVENT_VERSION_PATCH 2)
 set(TBOX_EVENT_VERSION ${TBOX_EVENT_VERSION_MAJOR}.${TBOX_EVENT_VERSION_MINOR}.${TBOX_EVENT_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.event")
+add_definitions(-DMODULE_ID="tbox.event")
 
 set(TBOX_LIBRARY_NAME tbox_event)
 
diff --git a/modules/eventx/CMakeLists.txt b/modules/eventx/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_EVENTX_VERSION_MINOR 0)
 set(TBOX_EVENTX_VERSION_PATCH 2)
 set(TBOX_EVENTX_VERSION ${TBOX_EVENTX_VERSION_MAJOR}.${TBOX_EVENTX_VERSION_MINOR}.${TBOX_EVENTX_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.eventx")
+add_definitions(-DMODULE_ID="tbox.eventx")
 
 set(TBOX_LIBRARY_NAME tbox_eventx)
 
diff --git a/modules/eventx/thread_pool.cpp b/modules/eventx/thread_pool.cpp
@@ -289,7 +289,6 @@ ThreadPool::Snapshot ThreadPool::snapshot() const
 
 void ThreadPool::threadProc(ThreadToken thread_token)
 {
-    RECORD_SCOPE();
     LogDbg("thread %u start", thread_token.id());
 
     while (true) {
diff --git a/modules/eventx/work_thread.cpp b/modules/eventx/work_thread.cpp
@@ -189,7 +189,6 @@ int WorkThread::cancel(TaskToken token)
 
 void WorkThread::threadProc()
 {
-    RECORD_SCOPE();
     while (true) {
         Task* item = nullptr;
         {
diff --git a/modules/flow/CMakeLists.txt b/modules/flow/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_FLOW_VERSION_MINOR 0)
 set(TBOX_FLOW_VERSION_PATCH 3)
 set(TBOX_FLOW_VERSION ${TBOX_FLOW_VERSION_MAJOR}.${TBOX_FLOW_VERSION_MINOR}.${TBOX_FLOW_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.flow")
+add_definitions(-DMODULE_ID="tbox.flow")
 
 set(TBOX_LIBRARY_NAME tbox_flow)
 
diff --git a/modules/http/CMakeLists.txt b/modules/http/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_HTTP_VERSION_MINOR 0)
 set(TBOX_HTTP_VERSION_PATCH 1)
 set(TBOX_HTTP_VERSION ${TBOX_HTTP_VERSION_MAJOR}.${TBOX_HTTP_VERSION_MINOR}.${TBOX_HTTP_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.http")
+add_definitions(-DMODULE_ID="tbox.http")
 
 set(TBOX_LIBRARY_NAME tbox_http)
 
diff --git a/modules/jsonrpc/CMakeLists.txt b/modules/jsonrpc/CMakeLists.txt
@@ -23,7 +23,7 @@ set(TBOX_JSONRPC_VERSION_MINOR 0)
 set(TBOX_JSONRPC_VERSION_PATCH 1)
 set(TBOX_JSONRPC_VERSION ${TBOX_JSONRPC_VERSION_MAJOR}.${TBOX_JSONRPC_VERSION_MINOR}.${TBOX_JSONRPC_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.jsonrpc")
+add_definitions(-DMODULE_ID="tbox.jsonrpc")
 
 set(TBOX_LIBRARY_NAME tbox_jsonrpc)
 
diff --git a/modules/log/CMakeLists.txt b/modules/log/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_LOG_VERSION_MINOR 0)
 set(TBOX_LOG_VERSION_PATCH 1)
 set(TBOX_LOG_VERSION ${TBOX_LOG_VERSION_MAJOR}.${TBOX_LOG_VERSION_MINOR}.${TBOX_LOG_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.log")
+add_definitions(-DMODULE_ID="tbox.log")
 
 set(TBOX_LIBRARY_NAME tbox_log)
 
diff --git a/modules/main/CMakeLists.txt b/modules/main/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_MAIN_VERSION_MINOR 1)
 set(TBOX_MAIN_VERSION_PATCH 2)
 set(TBOX_MAIN_VERSION ${TBOX_MAIN_VERSION_MAJOR}.${TBOX_MAIN_VERSION_MINOR}.${TBOX_MAIN_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.main")
+add_definitions(-DMODULE_ID="tbox.main")
 
 set(TBOX_LIBRARY_NAME tbox_main)
 
diff --git a/modules/mqtt/CMakeLists.txt b/modules/mqtt/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_MQTT_VERSION_MINOR 0)
 set(TBOX_MQTT_VERSION_PATCH 1)
 set(TBOX_MQTT_VERSION ${TBOX_MQTT_VERSION_MAJOR}.${TBOX_MQTT_VERSION_MINOR}.${TBOX_MQTT_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.mqtt")
+add_definitions(-DMODULE_ID="tbox.mqtt")
 
 set(TBOX_LIBRARY_NAME tbox_mqtt)
 
diff --git a/modules/network/CMakeLists.txt b/modules/network/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_NETWORK_VERSION_MINOR 0)
 set(TBOX_NETWORK_VERSION_PATCH 0)
 set(TBOX_NETWORK_VERSION ${TBOX_NETWORK_VERSION_MAJOR}.${TBOX_NETWORK_VERSION_MINOR}.${TBOX_NETWORK_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.network")
+add_definitions(-DMODULE_ID="tbox.network")
 
 set(TBOX_LIBRARY_NAME tbox_network)
 
diff --git a/modules/terminal/CMakeLists.txt b/modules/terminal/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_TERMINAL_VERSION_MINOR 0)
 set(TBOX_TERMINAL_VERSION_PATCH 2)
 set(TBOX_TERMINAL_VERSION ${TBOX_TERMINAL_VERSION_MAJOR}.${TBOX_TERMINAL_VERSION_MINOR}.${TBOX_TERMINAL_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.terminal")
+add_definitions(-DMODULE_ID="tbox.terminal")
 
 set(TBOX_LIBRARY_NAME tbox_terminal)
 
diff --git a/modules/trace/lib/CMakeLists.txt b/modules/trace/lib/CMakeLists.txt
@@ -25,20 +25,17 @@ set(TBOX_LOG_VERSION_MINOR 0)
 set(TBOX_LOG_VERSION_PATCH 1)
 set(TBOX_LOG_VERSION ${TBOX_LOG_VERSION_MAJOR}.${TBOX_LOG_VERSION_MINOR}.${TBOX_LOG_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.trace")
+add_definitions(-DMODULE_ID="tbox.trace")
 
 set(TBOX_LIBRARY_NAME tbox_trace)
 
 set(TBOX_LOG_HEADERS
-    recorder.h
     sink.h)
 
 set(TBOX_LOG_SOURCES
-    recorder.cpp
     sink.cpp)
 
 set(TBOX_LOG_TEST_SOURCES
-    recorder_test.cpp
     sink_test.cpp)
 
 add_library(${TBOX_LIBRARY_NAME} ${TBOX_BUILD_LIB_TYPE} ${TBOX_LOG_SOURCES})
diff --git a/modules/util/CMakeLists.txt b/modules/util/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TBOX_UTIL_VERSION_MINOR 0)
 set(TBOX_UTIL_VERSION_PATCH 2)
 set(TBOX_UTIL_VERSION ${TBOX_UTIL_VERSION_MAJOR}.${TBOX_UTIL_VERSION_MINOR}.${TBOX_UTIL_VERSION_PATCH})
 
-add_definitions(-DLOG_MODULE_ID="tbox.util")
+add_definitions(-DMODULE_ID="tbox.util")
 
 set(TBOX_LIBRARY_NAME tbox_util)
 
@@ -46,6 +46,7 @@ set(TBOX_UTIL_HEADERS
     execute_cmd.h
     buffer.h
     fd.h
+    scalable_integer.h
 )
 
 set(TBOX_UTIL_SOURCES
@@ -65,6 +66,7 @@ set(TBOX_UTIL_SOURCES
     execute_cmd.cpp
     buffer.cpp
     fd.cpp
+    scalable_integer.cpp
 )
 
 set(TBOX_UTIL_TEST_SOURCES
@@ -82,6 +84,7 @@ set(TBOX_UTIL_TEST_SOURCES
     execute_cmd_test.cpp
     buffer_test.cpp
     fd_test.cpp
+    scalable_integer_test.cpp
 )
 
 add_library(${TBOX_LIBRARY_NAME} ${TBOX_BUILD_LIB_TYPE} ${TBOX_UTIL_SOURCES})
diff --git a/version.mk b/version.mk
@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 9
-TBOX_VERSION_REVISION := 8
+TBOX_VERSION_REVISION := 9

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,6 @@ ThreadPool::Snapshot ThreadPool::snapshot() const`
`289`	`289`
`290`	`290`	`void ThreadPool::threadProc(ThreadToken thread_token)`
`291`	`291`	`{`
`292`		`- RECORD_SCOPE();`
`293`	`292`	`LogDbg("thread %u start", thread_token.id());`
`294`	`293`
`295`	`294`	`while (true) {`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ int WorkThread::cancel(TaskToken token)`
`189`	`189`
`190`	`190`	`void WorkThread::threadProc()`
`191`	`191`	`{`
`192`		`- RECORD_SCOPE();`
`193`	`192`	`while (true) {`
`194`	`193`	`Task* item = nullptr;`
`195`	`194`	`{`