working multi-thread

Author: vickiegpt

CMakeLists.txt

@@ -11,8 +11,8 @@ set(LINUX_SOURCE /lib/modules/${arch}/build/)
 
 set(CMAKE_CXX_STANDARD 26)
 add_subdirectory(lib/bpftime)
-# add_subdirectory(microbench)
-add_subdirectory(workloads)
+add_subdirectory(microbench)
+#add_subdirectory(workloads)
 
 list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
@@ -27,12 +27,12 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -latomic")
 add_executable(CXLMemSim ${SOURCE_FILES} src/main.cc)
 
 include_directories(CXLMemSim include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR} ${runtime_SOURCE_DIR}/include)
-target_link_libraries(CXLMemSim cxxopts::cxxopts bpftime_vm bpftime-object bpftime_base_attach_impl bpftime-agent ${CMAKE_CURRENT_BINARY_DIR}/lib/bpftime/runtime/libruntime.a -lspdlog -lfmt)
+target_link_libraries(CXLMemSim cxxopts::cxxopts bpftime_vm bpftime-object bpftime_base_attach_impl bpftime-agent )
 
 add_executable(CXLMemSimRoB ${SOURCE_FILES} src/rob.cc)
 
 include_directories(CXLMemSimRoB include ${cxxopts_INCLUDE_DIR} ${spdlog_INCLUDE_DIR} ${runtime_SOURCE_DIR}/include)
-target_link_libraries(CXLMemSimRoB cxxopts::cxxopts bpftime_vm bpftime-object bpftime_base_attach_impl bpftime-agent ${CMAKE_CURRENT_BINARY_DIR}/lib/bpftime/runtime/libruntime.a spdlog fmt)
+target_link_libraries(CXLMemSimRoB cxxopts::cxxopts bpftime_vm bpftime-object bpftime_base_attach_impl bpftime-agent)
 
 
 function(bpf prefix)

include/cxlcontroller.h

@@ -226,8 +226,8 @@ class CXLController : public CXLSwitch {
     int insert(uint64_t timestamp, uint64_t tid, uint64_t phys_addr, uint64_t virt_addr, int index) override;
     void delete_entry(uint64_t addr, uint64_t length) override;
     void set_stats(mem_stats stats);
-    static void set_process_info(const proc_info &process_info);
-    static void set_thread_info(const proc_info &thread_info);
+    void set_process_info(const proc_info &process_info);
+    void set_thread_info(const proc_info &thread_info);
     void perform_migration();
     // 添加缓存访问方法
     std::optional<uint64_t> access_cache(uint64_t addr, uint64_t timestamp) { return lru_cache.get(addr, timestamp); }

microbench/CMakeLists.txt

@@ -11,6 +11,7 @@ add_executable(ptr-chasing ptr-chasing.cpp)
 add_executable(branch_simple branch_simple.c)
 add_executable(cache-thrash cache-thrash.c)
 add_executable(cache-miss cache-miss.c)
+add_executable(thread thread.cpp)
 
 add_executable(ld1 ld.cpp)
 target_compile_definitions(ld1 PRIVATE -DFENCE_COUNT=1)

microbench/thread.cpp

@@ -0,0 +1,72 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/sched.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <sched.h>
+// set_tid_address 系统调用号
+#define SYS_set_tid_address 218
+
+// 用于存储线程ID的变量
+int *clear_child_tid = NULL;
+
+// 线程函数
+int thread_function(void *arg) {
+    printf("子线程: 我的 TID 是 %ld\n", syscall(SYS_gettid));
+    printf("子线程: clear_child_tid 地址是 %p\n", clear_child_tid);
+    
+    // 让线程运行一段时间
+    sleep(2);
+    
+    printf("子线程: 退出前 clear_child_tid 的值是 %d\n", *clear_child_tid);
+    return 0;
+}
+
+int main() {
+    // 分配内存用于存储线程ID
+    clear_child_tid = (int *)malloc(sizeof(int));
+    *clear_child_tid = 0;
+    
+    printf("主线程: clear_child_tid 地址是 %p\n", clear_child_tid);
+    
+    // 分配线程栈
+    void *stack = malloc(4096);
+    if (!stack) {
+        perror("malloc 失败");
+        return 1;
+    }
+    
+    // 创建子线程
+    pid_t child_pid = clone(thread_function, 
+                           (char *)stack + 4096,  // 栈顶
+                           CLONE_VM | CLONE_FS | CLONE_FILES | SIGCHLD, 
+                           NULL);
+    
+    if (child_pid == -1) {
+        perror("clone 失败");
+        free(stack);
+        free(clear_child_tid);
+        return 1;
+    }
+    
+    printf("主线程: 创建的子线程 ID 是 %d\n", child_pid);
+    
+    // 直接调用 set_tid_address 系统调用
+    long result = syscall(SYS_set_tid_address, clear_child_tid);
+    printf("主线程: set_tid_address 返回值是 %ld\n", result);
+    
+    // 等待子线程结束
+    waitpid(child_pid, NULL, 0);
+    
+    printf("主线程: 子线程结束后 clear_child_tid 的值是 %d\n", *clear_child_tid);
+    
+    // 释放资源
+    free(stack);
+    free(clear_child_tid);
+    
+    return 0;
+}

src/bpftimeruntime.cpp

@@ -53,7 +53,7 @@ int BpfTimeRuntime::read(CXLController *controller, BPFTimeRuntimeElem *elem) {
             SPDLOG_DEBUG("Process map key: {} {} thread_id:{}", key1, key,
                          std::this_thread::get_id()); // 使用std::this_thread获取当前线程ID
 
-            if (i == 10 && item2 != nullptr) {
+            if (i == 8 && item2 != nullptr) {
                 stats = *((mem_stats *)item2);
                 controller->set_stats(stats);
                 elem->total++;
@@ -63,7 +63,7 @@ int BpfTimeRuntime::read(CXLController *controller, BPFTimeRuntimeElem *elem) {
                 controller->set_process_info(proc_info1);
                 elem->total++;
             }
-            if (i == 8 && item2 != nullptr) {
+            if (i == 7 && item2 != nullptr) {
                 thread_info1 = *((proc_info *)item2);
                 controller->set_thread_info(thread_info1);
                 elem->total++;

src/cxlcontroller.cpp

@@ -85,8 +85,15 @@ void CXLController::set_process_info(const proc_info &process_info) {
 }
 
 void CXLController::set_thread_info(const proc_info &thread_info) {
-    monitors->enable(thread_info.current_pid, thread_info.current_tid, false, 0, 0);
+    if (thread_info .parent_pid == monitors->mon[0].tgid) {
+        monitors->enable(thread_info.current_pid, thread_info.current_tid, false, 0, 0);
+        std::cout << "set thread info " << thread_info.current_pid << " " << thread_info.current_tid << std::endl;
+        auto lbr_ = new lbr{.from = 0, .to = 0, .flags = 0};
+        this->insert_one(thread_map[thread_info.current_tid], *lbr_);
+        delete lbr_;
+    }
 }
+
 void CXLController::perform_migration() {
     if (!migration_policy)
         return;

src/main.cc

@@ -8,7 +8,7 @@
  *  Copyright 2025 Regents of the University of California
  *  UC Santa Cruz Sluglab.
  */
-#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
+#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_OFF
 #include "cxlendpoint.h"
 #include "helper.h"
 #include "monitor.h"
@@ -228,12 +228,13 @@ int main(int argc, char *argv[]) {
     if (t_process == 0) {
         sleep(1);
         std::vector<const char *> envp;
-        envp.push_back("LD_PRELOAD=/root/.bpftime/libbpftime-agent.so");
+        envp.emplace_back("LD_PRELOAD=/root/.bpftime/libbpftime-agent.so");
+        envp.emplace_back("OMP_NUM_THREADS=24");
         while (!env.empty()) {
-            envp.push_back(env.back().c_str());
+            envp.emplace_back(env.back().c_str());
             env.pop_back();
         }
-        envp.push_back(nullptr);
+        envp.emplace_back(nullptr);
         execve(filename, args, const_cast<char *const *>(envp.data()));
         SPDLOG_ERROR("Exec: failed to create target process");
         exit(1);