oceanbase · hnwyllmm · May 14, 2024 · May 14, 2024 · May 14, 2024
diff --git a/deps/memtracer/allocator.h b/deps/memtracer/allocator.h
@@ -48,13 +48,13 @@ mt_visible void  operator delete(void *ptr, std::size_t size) noexcept;
 mt_visible void  operator delete[](void *ptr, std::size_t size) noexcept;
 
 // unsupported libc functions, for simpler memory tracking.
-extern "C" mt_visible char *   realpath(const char *fname, char *resolved_name);
-extern "C" mt_visible void *   memalign(size_t alignment, size_t size);
-extern "C" mt_visible void *   valloc(size_t size);
-extern "C" mt_visible void *   pvalloc(size_t size);
+extern "C" mt_visible char    *realpath(const char *fname, char *resolved_name);
+extern "C" mt_visible void    *memalign(size_t alignment, size_t size);
+extern "C" mt_visible void    *valloc(size_t size);
+extern "C" mt_visible void    *pvalloc(size_t size);
 extern "C" mt_visible int      posix_memalign(void **memptr, size_t alignment, size_t size);
 extern "C" mt_visible int      brk(void *addr);
-extern "C" mt_visible void *   sbrk(intptr_t increment);
+extern "C" mt_visible void    *sbrk(intptr_t increment);
 extern "C" mt_visible long int syscall(long int __sysno, ...);
 
 // forword libc interface

diff --git a/deps/memtracer/memtracer.h b/deps/memtracer/memtracer.h
@@ -71,14 +71,13 @@ class MemTracer
   static void stat();
 
 private:
-  bool                is_inited_ = false;
-  bool                is_stop_   = false;
+  bool                is_stop_ = false;
   std::atomic<size_t> allocated_memory_{};
   std::atomic<size_t> alloc_cnt_{};
   std::atomic<size_t> free_cnt_{};
   std::once_flag      init_hook_funcs_once_;
   std::once_flag      memory_limit_once_;
-  size_t              memory_limit_   = UINT64_MAX;
+  size_t              memory_limit_      = UINT64_MAX;
   size_t              print_interval_ms_ = 0;
   std::thread         t_;
 };

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
@@ -1,25 +1,13 @@
 # 可以获取父cmake的变量
 MESSAGE("${CMAKE_COMMON_FLAGS}")
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/observer)
-
 find_package(GTest CONFIG REQUIRED)
 
 include(GoogleTest)
 
-#get_filename_component(<VAR> FileName
-#        PATH|ABSOLUTE|NAME|EXT|NAME_WE|REALPATH
-#        [CACHE])
-FILE(GLOB_RECURSE ALL_SRC *.cpp)
-# AUX_SOURCE_DIRECTORY 类似功能
-FOREACH (F ${ALL_SRC})
-    get_filename_component(prjName ${F} NAME_WE)
-    MESSAGE("Build ${prjName} according to ${F}")
-    ADD_EXECUTABLE(${prjName} ${F})
-    # TODO: 不是所有的单测都需要链接observer_static
-    TARGET_LINK_LIBRARIES(${prjName} common pthread dl gtest gtest_main observer_static)
-    add_test(NAME ${prjName} COMMAND ${prjName})
-    if (${prjName} STREQUAL "memtracer_test")
-        TARGET_LINK_LIBRARIES(${prjName} memtracer)
-    endif()
-ENDFOREACH (F)
+ADD_SUBDIRECTORY(common)
+IF (WITH_MEMTRACER)
+    ADD_SUBDIRECTORY(memtracer)
+ENDIF (WITH_MEMTRACER)
+
+ADD_SUBDIRECTORY(observer)
diff --git a/unittest/common/CMakeLists.txt b/unittest/common/CMakeLists.txt
@@ -0,0 +1,12 @@
+#get_filename_component(<VAR> FileName
+#        PATH|ABSOLUTE|NAME|EXT|NAME_WE|REALPATH
+#        [CACHE])
+FILE(GLOB_RECURSE ALL_SRC *.cpp)
+# AUX_SOURCE_DIRECTORY 类似功能
+FOREACH (F ${ALL_SRC})
+    get_filename_component(prjName ${F} NAME_WE)
+    MESSAGE("Build ${prjName} according to ${F}")
+    ADD_EXECUTABLE(${prjName} ${F})
+    TARGET_LINK_LIBRARIES(${prjName} common pthread dl gtest gtest_main)
+    add_test(NAME ${prjName} COMMAND ${prjName})
+ENDFOREACH (F)
diff --git a/unittest/bitmap_test.cpp → unittest/common/bitmap_test.cpp b/unittest/bitmap_test.cpp → unittest/common/bitmap_test.cpp
diff --git a/unittest/integer_generator_test.cpp → unittest/common/integer_generator_test.cpp b/unittest/integer_generator_test.cpp → unittest/common/integer_generator_test.cpp
diff --git a/unittest/log_test.cpp → unittest/common/log_test.cpp b/unittest/log_test.cpp → unittest/common/log_test.cpp
diff --git a/unittest/log_test.h → unittest/common/log_test.h b/unittest/log_test.h → unittest/common/log_test.h
diff --git a/unittest/lower_bound_test.cpp → unittest/common/lower_bound_test.cpp b/unittest/lower_bound_test.cpp → unittest/common/lower_bound_test.cpp
diff --git a/unittest/md5_test.cpp → unittest/common/md5_test.cpp b/unittest/md5_test.cpp → unittest/common/md5_test.cpp
diff --git a/unittest/md5_test.h → unittest/common/md5_test.h b/unittest/md5_test.h → unittest/common/md5_test.h
diff --git a/unittest/mem_pool_test.cpp → unittest/common/mem_pool_test.cpp b/unittest/mem_pool_test.cpp → unittest/common/mem_pool_test.cpp
diff --git a/unittest/pidfile_test.cpp → unittest/common/pidfile_test.cpp b/unittest/pidfile_test.cpp → unittest/common/pidfile_test.cpp
diff --git a/unittest/serializer_test.cpp → unittest/common/serializer_test.cpp b/unittest/serializer_test.cpp → unittest/common/serializer_test.cpp
diff --git a/unittest/simple_queue_test.cpp → unittest/common/simple_queue_test.cpp b/unittest/simple_queue_test.cpp → unittest/common/simple_queue_test.cpp
diff --git a/unittest/thread_pool_executor_test.cpp → ...test/common/thread_pool_executor_test.cpp b/unittest/thread_pool_executor_test.cpp → ...test/common/thread_pool_executor_test.cpp
diff --git a/unittest/memtracer/CMakeLists.txt b/unittest/memtracer/CMakeLists.txt
@@ -0,0 +1,12 @@
+#get_filename_component(<VAR> FileName
+#        PATH|ABSOLUTE|NAME|EXT|NAME_WE|REALPATH
+#        [CACHE])
+FILE(GLOB_RECURSE ALL_SRC *.cpp)
+# AUX_SOURCE_DIRECTORY 类似功能
+FOREACH (F ${ALL_SRC})
+    get_filename_component(prjName ${F} NAME_WE)
+    MESSAGE("Build ${prjName} according to ${F}")
+    ADD_EXECUTABLE(${prjName} ${F})
+    TARGET_LINK_LIBRARIES(${prjName} pthread dl gtest gtest_main memtracer)
+    add_test(NAME ${prjName} COMMAND ${prjName})
+ENDFOREACH (F)
diff --git a/unittest/memtracer_test.cpp → unittest/memtracer/memtracer_test.cpp b/unittest/memtracer_test.cpp → unittest/memtracer/memtracer_test.cpp
diff --git a/unittest/observer/CMakeLists.txt b/unittest/observer/CMakeLists.txt
@@ -0,0 +1,14 @@
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/observer)
+
+#get_filename_component(<VAR> FileName
+#        PATH|ABSOLUTE|NAME|EXT|NAME_WE|REALPATH
+#        [CACHE])
+FILE(GLOB_RECURSE ALL_SRC *.cpp)
+# AUX_SOURCE_DIRECTORY 类似功能
+FOREACH (F ${ALL_SRC})
+    get_filename_component(prjName ${F} NAME_WE)
+    MESSAGE("Build ${prjName} according to ${F}")
+    ADD_EXECUTABLE(${prjName} ${F})
+    TARGET_LINK_LIBRARIES(${prjName} common pthread dl gtest gtest_main observer_static)
+    add_test(NAME ${prjName} COMMAND ${prjName})
+ENDFOREACH (F)
diff --git a/unittest/arithmetic_expression_test.cpp → ...t/observer/arithmetic_expression_test.cpp b/unittest/arithmetic_expression_test.cpp → ...t/observer/arithmetic_expression_test.cpp
diff --git a/unittest/bp_manager_test.cpp → unittest/observer/bp_manager_test.cpp b/unittest/bp_manager_test.cpp → unittest/observer/bp_manager_test.cpp
diff --git a/unittest/bplus_tree_log_entry_test.cpp → ...st/observer/bplus_tree_log_entry_test.cpp b/unittest/bplus_tree_log_entry_test.cpp → ...st/observer/bplus_tree_log_entry_test.cpp
diff --git a/unittest/bplus_tree_log_test.cpp → unittest/observer/bplus_tree_log_test.cpp b/unittest/bplus_tree_log_test.cpp → unittest/observer/bplus_tree_log_test.cpp
diff --git a/unittest/bplus_tree_test.cpp → unittest/observer/bplus_tree_test.cpp b/unittest/bplus_tree_test.cpp → unittest/observer/bplus_tree_test.cpp
diff --git a/unittest/buffer_pool_log_test.cpp → unittest/observer/buffer_pool_log_test.cpp b/unittest/buffer_pool_log_test.cpp → unittest/observer/buffer_pool_log_test.cpp
diff --git a/unittest/disk_buffer_pool_test.cpp → unittest/observer/disk_buffer_pool_test.cpp b/unittest/disk_buffer_pool_test.cpp → unittest/observer/disk_buffer_pool_test.cpp
diff --git a/unittest/disk_log_handler_test.cpp → unittest/observer/disk_log_handler_test.cpp b/unittest/disk_log_handler_test.cpp → unittest/observer/disk_log_handler_test.cpp
diff --git a/unittest/double_write_buffer_test.cpp → ...est/observer/double_write_buffer_test.cpp b/unittest/double_write_buffer_test.cpp → ...est/observer/double_write_buffer_test.cpp
diff --git a/unittest/log_buffer_test.cpp → unittest/observer/log_buffer_test.cpp b/unittest/log_buffer_test.cpp → unittest/observer/log_buffer_test.cpp
diff --git a/unittest/log_entry_test.cpp → unittest/observer/log_entry_test.cpp b/unittest/log_entry_test.cpp → unittest/observer/log_entry_test.cpp
diff --git a/unittest/log_file_test.cpp → unittest/observer/log_file_test.cpp b/unittest/log_file_test.cpp → unittest/observer/log_file_test.cpp
diff --git a/unittest/mvcc_trx_log_test.cpp → unittest/observer/mvcc_trx_log_test.cpp b/unittest/mvcc_trx_log_test.cpp → unittest/observer/mvcc_trx_log_test.cpp
diff --git a/unittest/persist_test.cpp → unittest/observer/persist_test.cpp b/unittest/persist_test.cpp → unittest/observer/persist_test.cpp
diff --git a/unittest/record_manager_test.cpp → unittest/observer/record_manager_test.cpp b/unittest/record_manager_test.cpp → unittest/observer/record_manager_test.cpp
diff --git a/unittest/ring_buffer_test.cpp → unittest/observer/ring_buffer_test.cpp b/unittest/ring_buffer_test.cpp → unittest/observer/ring_buffer_test.cpp