Merge branch 'master' into develop

Author: hevake

examples/trace/demo/Makefile renamed to examples/trace/01_demo/Makefile

@@ -18,7 +18,7 @@
 # of the source tree.
 #
 
-PROJECT := examples/trace/demo
+PROJECT := examples/trace/01_demo
 EXE_NAME := ${PROJECT}
 
 CPP_SRC_FILES := main.cpp

examples/trace/01_demo/main.cpp

@@ -0,0 +1,52 @@
+/*
+ *     .============.
+ *    //  M A K E  / \
+ *   //  C++ DEV  /   \
+ *  //  E A S Y  /  \/ \
+ * ++ ----------.  \/\  .
+ *  \\     \     \ /\  /
+ *   \\     \     \   /
+ *    \\     \     \ /
+ *     -============'
+ *
+ * Copyright (c) 2024 Hevake and contributors, all rights reserved.
+ *
+ * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+ * Use of this source code is governed by MIT license that can be found
+ * in the LICENSE file in the root of the source tree. All contributing
+ * project authors may be found in the CONTRIBUTORS.md file in the root
+ * of the source tree.
+ */
+
+#include <iostream>
+#include <tbox/base/recorder.h>
+#include <tbox/trace/sink.h>
+
+void DoSomething()
+{
+    RECORD_SCOPE();
+    std::cout << "do something" << std::endl;
+}
+
+int main(int argc, char **argv)
+{
+    std::cout << "this is trace demo" << std::endl;
+
+    auto &ts = tbox::trace::Sink::GetInstance();
+    ts.setPathPrefix("/tmp/trace/01_demo"); //! 设置记录文件目录前缀
+    ts.setRecordFileMaxSize(1<<20); //! 设置记录文件大小为1MB
+    ts.enable();  //! 开始记录
+
+    RECORD_EVENT();
+
+    std::cout << "begin" << std::endl;
+
+    DoSomething();
+
+    std::cout << "end" << std::endl;
+
+    RECORD_EVENT();
+
+    ts.disable(); //! 停止记录
+    return 0;
+}

examples/trace/02_multi_threads/Makefile

@@ -0,0 +1,33 @@
+#
+#     .============.
+#    //  M A K E  / \
+#   //  C++ DEV  /   \
+#  //  E A S Y  /  \/ \
+# ++ ----------.  \/\  .
+#  \\     \     \ /\  /
+#   \\     \     \   /
+#    \\     \     \ /
+#     -============'
+#
+# Copyright (c) 2024 Hevake and contributors, all rights reserved.
+#
+# This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+# Use of this source code is governed by MIT license that can be found
+# in the LICENSE file in the root of the source tree. All contributing
+# project authors may be found in the CONTRIBUTORS.md file in the root
+# of the source tree.
+#
+
+PROJECT := examples/trace/02_multi_threads
+EXE_NAME := ${PROJECT}
+
+CPP_SRC_FILES := main.cpp
+
+CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
+LDFLAGS += \
+	-ltbox_trace \
+	-ltbox_util \
+	-ltbox_base \
+	-lpthread -ldl
+
+include $(TOP_DIR)/mk/exe_common.mk

examples/trace/demo/main.cpp renamed to examples/trace/02_multi_threads/main.cpp

@@ -20,6 +20,7 @@
 
 #include <thread>
 #include <mutex>
+#include <iostream>
 #include <tbox/base/recorder.h>
 #include <tbox/trace/sink.h>
 
@@ -31,15 +32,15 @@ void Bar()
 {
     std::lock_guard<std::mutex> lg(g_lock);
     RECORD_SCOPE();
-    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    std::this_thread::sleep_for(std::chrono::microseconds(10));
     RECORD_SCOPE();
 }
 void Foo()
 {
     RECORD_SCOPE();
     Bar();
     RECORD_SCOPE();
-    std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    std::this_thread::sleep_for(std::chrono::microseconds(5));
 }
 
 void Do() {
@@ -50,10 +51,11 @@ void Do() {
 
 int main(int argc, char **argv)
 {
-    //! 配置Track导出方式
-    auto &ts = trace::Sink::GetInstance();
-    ts.setPathPrefix("/tmp/test/trace-demo");
-    ts.setRecordFileMaxSize(1<<20);
+    std::cout << "this is trace multi-threads demo" << std::endl;
+
+    auto &ts = tbox::trace::Sink::GetInstance();
+    ts.setPathPrefix("/tmp/trace/02_multi_threads"); //! 设置记录文件目录前缀
+    ts.setRecordFileMaxSize(1<<20); //! 设置记录文件大小为1MB
     ts.enable();  //! 开始记录
 
     RECORD_EVENT();