fix multi-thread

Author: vickiegpt

lib/bpftime

@@ -26,7 +26,7 @@
 #define STR(x) STR_HELPER(x)
 
 #define MOVE_SIZE 128
-#define MAP_SIZE  (long)( 1024)
+#define MAP_SIZE  (long)(1024*1024 * 1024)
 #define CACHELINE_SIZE  64
 
 #ifndef FENCE_COUNT

microbench/ld.cpp

@@ -27,7 +27,7 @@
 #define STR(x) STR_HELPER(x)
 
 #define MOVE_SIZE 128
-#define MAP_SIZE  (long)(1024)
+#define MAP_SIZE  (long)(1024*1024 * 1024)
 #define CACHELINE_SIZE  64
 
 #ifndef FENCE_COUNT

microbench/ld_serial.cpp

@@ -12,7 +12,7 @@
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 #define MOVE_SIZE 128
-#define MAP_SIZE  (long)(1024)
+#define MAP_SIZE  (long)(1024*1024 * 1024)
 #define CACHELINE_SIZE  64
 #ifndef FENCE_COUNT
 #define FENCE_COUNT 8

microbench/st.cpp

@@ -20,7 +20,7 @@
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 #define MOVE_SIZE 128
-#define MAP_SIZE  (long)(1024)
+#define MAP_SIZE  (long)(1024*1024 * 1024)
 #define CACHELINE_SIZE  64
 #ifndef FENCE_COUNT
 #define FENCE_COUNT 8

microbench/st_serial.cpp

@@ -41,18 +41,20 @@ int main() {
     print_thread_id("主线程 ");
 
     // 创建一些普通工作线程
-    std::vector<std::thread> threads;
+    std::vector<std::shared_ptr<std::thread>> threads;
     for (int i = 0; i < 3; ++i) {
-        threads.emplace_back(thread_function, i);
+    std::cout << "english, finally\n";
+	    std::shared_ptr<std::thread> thread = std::make_shared<std::thread>(thread_function, i);
+        threads.push_back(thread);
     }
 
     // 创建将调用exit_group的线程
     std::thread exit_thread(exit_group_thread);
 
     // 等待所有工作线程完成
     for (auto& t : threads) {
-        if (t.joinable()) {
-            t.join();
+        if (t->joinable()) {
+            t->join();
         }
     }
 
@@ -65,4 +67,4 @@ int main() {
     std::cout << "主程序结束" << std::endl;
 
     return 0;
-}
+}

microbench/thread.cpp

@@ -296,13 +296,13 @@ def main():
     # 策略组合参数
     parser.add_argument("--run-policy-combinations", action="store_true", help="运行策略组合测试")
     parser.add_argument("--allocation-policies", nargs="+", choices=ALLOCATION_POLICIES,
-                        help=f"分配策略选项: {', '.join(ALLOCATION_POLICIES)}")
+                        help=f"分配策略选项: {', '.join(ALLOCATION_POLICIES)}",default=ALLOCATION_POLICIES)
     parser.add_argument("--migration-policies", nargs="+", choices=MIGRATION_POLICIES,
-                        help=f"迁移策略选项: {', '.join(MIGRATION_POLICIES)}")
+                        help=f"迁移策略选项: {', '.join(MIGRATION_POLICIES)}",default=MIGRATION_POLICIES)
     parser.add_argument("--paging-policies", nargs="+", choices=PAGING_POLICIES,
-                        help=f"分页策略选项: {', '.join(PAGING_POLICIES)}")
+                        help=f"分页策略选项: {', '.join(PAGING_POLICIES)}",default=PAGING_POLICIES)
     parser.add_argument("--caching-policies", nargs="+", choices=CACHING_POLICIES,
-                        help=f"缓存策略选项: {', '.join(CACHING_POLICIES)}")
+                        help=f"缓存策略选项: {', '.join(CACHING_POLICIES)}",default=CACHING_POLICIES)
 
     # 错误处理
     parser.add_argument("--ignore-errors", action="store_true", help="忽略错误继续运行")

script/get_all_results.py

@@ -3,3 +3,4 @@ wget https://files.rcsb.org/download/5pep.pdb
 gmx pdb2gmx -f 5pep.pdb -o 5pep.gro -water spc
 gmx editconf -f 5pep.gro -o 5pep-box.gro -c -d 1.0 -bt cubic
 gmx solvate -cp 5pep-box.gro -cs spc216.gro -o 5pep-solv.gro -p topol.top
+gmx mdrun -v -deffnm 5pep.mdp

script/run_gromacs.sh

@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <utility>
 #include <vector>
+#include <thread>
 #include "bpftimeruntime.h"
 
 BpfTimeRuntime::BpfTimeRuntime(pid_t tid, std::string program_location)
@@ -35,31 +36,43 @@ BpfTimeRuntime::BpfTimeRuntime(pid_t tid, std::string program_location)
 }
 
 BpfTimeRuntime::~BpfTimeRuntime() { bpftime_remove_global_shm(); }
-
 int BpfTimeRuntime::read(CXLController *controller, BPFTimeRuntimeElem *elem) {
     mem_stats stats;
     proc_info proc_info1;
     proc_info thread_info1;
+
     for (int i = 6; i < 11; i++) {
-        int key = 0;
-        int key1 = 0;
-        bpftime_map_get_next_key(i, &key1, &key); // process map
-        auto item2 = bpftime_map_lookup_elem(i, &key); // allocs map
-        SPDLOG_DEBUG("Process map key: {} {} {}", key1, key, tid);
-        if (i == 6 && item2 != nullptr) {
-            stats = *((mem_stats *)item2);
-            controller->set_stats(stats);
-            elem->total++;
-        }
-        if (i == 9 && item2 != nullptr) {
-            proc_info1 = *((proc_info *)item2);
-            controller->set_process_info(proc_info1);
-            elem->total++;
-        }
-        if (i == 10 && item2 != nullptr) {
-            thread_info1 = *((proc_info *)item2);
-            controller->set_thread_info(thread_info1);
-            elem->total++;
+        // 修改数据类型匹配 bpftime_map_get_next_key 预期的大小
+        uint64_t key = 0; // 改为8字节
+        uint64_t key1 = 0; // 改为8字节
+        void *item2 = (void *)1;
+        while(item2){
+            int ret = bpftime_map_get_next_key(i, &key1, &key); // 获取key
+            if (ret != 0) {
+                SPDLOG_DEBUG("Failed to get next key for map {}", i);
+                break;
+            }
+
+            item2 = (void*)bpftime_map_lookup_elem(i, &key);
+            SPDLOG_DEBUG("Process map key: {} {} thread_id:{}", key1, key,
+                         std::this_thread::get_id()); // 使用std::this_thread获取当前线程ID
+
+            if (i == 6 && item2 != nullptr) {
+                stats = *((mem_stats *)item2);
+                controller->set_stats(stats);
+                elem->total++;
+            }
+            if (i == 9 && item2 != nullptr) {
+                proc_info1 = *((proc_info *)item2);
+                controller->set_process_info(proc_info1);
+                elem->total++;
+            }
+            if (i == 10 && item2 != nullptr) {
+                thread_info1 = *((proc_info *)item2);
+                controller->set_thread_info(thread_info1);
+                elem->total++;
+            }
+            key1 = key; // 更新key1为当前key
         }
     }
     return 0;

src/bpftimeruntime.cpp

@@ -81,11 +81,11 @@ void CXLController::set_stats(mem_stats stats) {
 }
 
 void CXLController::set_process_info(const proc_info &process_info) {
-    monitors->enable(process_info.current_pid, process_info.current_tid, true, 1000, 0);
+    monitors->enable(process_info.current_pid, process_info.current_tid, true, 1000, helper.num_of_cpu());
 }
 
 void CXLController::set_thread_info(const proc_info &thread_info) {
-    monitors->enable(thread_info.current_pid, thread_info.current_tid, false, 0, 0);
+    monitors->enable(thread_info.current_pid, thread_info.current_tid, false, 0, helper.num_of_cpu());
 }
 void CXLController::perform_migration() {
     if (!migration_policy)
@@ -252,6 +252,7 @@ int CXLController::insert(uint64_t timestamp, uint64_t tid, uint64_t phys_addr,
     for (int i = last_index; i < index; i++) {
         // 更新当前时间戳
         current_timestamp += time_step;
+        // std::cout << std::format("{} {}", current_timestamp, i) << std::endl;
 
         // 首先检查LRU缓存
         auto cache_result = access_cache(phys_addr, current_timestamp);