update for no bpftime

Author: vickiegpt

.gitmodules

@@ -13,9 +13,6 @@
 [submodule "workloads/vectordb"]
 	path = workloads/vectordb
 	url = https://github.com/jina-ai/vectordb
-[submodule "lib/bpftime"]
-	path = lib/bpftime
-	url = https://github.com/victoryang00/bpftime
 [submodule "workloads/llama.cpp"]
 	path = workloads/llama.cpp
 	url = https://github.com/ggml-org/llama.cpp

CMakeLists.txt

@@ -11,54 +11,44 @@ set(LINUX_SOURCE /lib/modules/${arch}/build/)
 
 set(CMAKE_CXX_STANDARD 20)
 
-# Add option for server mode (disables bpftime dependencies)
-option(SERVER_MODE "Build in server mode without bpftime dependencies" OFF)
+# Always build in SERVER_MODE (bpftime dependencies removed)
+add_compile_definitions(SERVER_MODE)
 
-if(NOT SERVER_MODE)
-    # add_subdirectory(lib/bpftime)
-    # add_subdirectory(workloads)
-endif()
+# Use std::format instead of fmt for spdlog (C++20)
+add_compile_definitions(SPDLOG_USE_STD_FORMAT)
+
+# Use header-only spdlog to avoid library mismatch
+add_compile_definitions(SPDLOG_HEADER_ONLY)
 
 add_subdirectory(microbench)
 
 list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
 find_package(cxxopts REQUIRED)
 find_package(spdlog REQUIRED)
-file(GLOB_RECURSE SOURCE_FILES src/cxl*.cpp src/policy.cpp src/helper.cpp src/incore.cpp src/uncore.cpp src/perf.cpp)
+file(GLOB_RECURSE SOURCE_FILES src/cxl*.cpp src/policy.cpp src/helper.cpp src/incore.cpp src/uncore.cpp src/perf.cpp src/monitor.cpp)
 set(SERVER_SOURCES src/main_server.cc src/shared_memory_manager.cc src/shm_communication.cpp)
 
 execute_process(COMMAND uname -r OUTPUT_VARIABLE arch OUTPUT_STRIP_TRAILING_WHITESPACE)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -pthread")
 set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -latomic")
 
-# Add compile definition for server mode
-if(SERVER_MODE)
-    add_compile_definitions(SERVER_MODE)
-else()
-    # add_subdirectory(qemu_integration)
-endif()
 
 # Create a static library of CXL core functionality
 add_library(cxlmemsim STATIC ${SOURCE_FILES})
 target_include_directories(cxlmemsim PUBLIC include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR})
-target_link_libraries(cxlmemsim cxxopts::cxxopts spdlog::spdlog)
-
-if(SERVER_MODE)
-    # Build simple latency calculator for server mode
-    add_executable(cxlmemsim_latency src/calculateLatency.cc)
-    set_target_properties(cxlmemsim_latency PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-    add_executable(cxlmemsim_server ${SERVER_SOURCES})
-    target_include_directories(cxlmemsim_server PRIVATE include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR})
-    target_link_libraries(cxlmemsim_server cxlmemsim cxxopts::cxxopts spdlog::spdlog rt)
-else()
-    # Build full version with monitor support
-    add_executable(cxlmemsim_server ${SERVER_SOURCES})
-    target_include_directories(cxlmemsim_server PRIVATE include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR})
-    target_link_libraries(cxlmemsim_server cxlmemsim cxxopts::cxxopts spdlog::spdlog rt)
-endif()
+target_link_libraries(cxlmemsim cxxopts::cxxopts spdlog::spdlog_header_only)
+
+# Build latency calculator
+add_executable(cxlmemsim_latency src/calculateLatency.cc)
+set_target_properties(cxlmemsim_latency PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Build server
+add_executable(cxlmemsim_server ${SERVER_SOURCES})
+target_include_directories(cxlmemsim_server PRIVATE include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR})
+target_link_libraries(cxlmemsim_server cxlmemsim cxxopts::cxxopts spdlog::spdlog_header_only rt)
 # Find RDMA libraries
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(RDMACM REQUIRED librdmacm)