snapshot multithread test 12

Tencent · Oct 10, 2024 · fc7c752 · fc7c752
1 parent 1a355f3
commit fc7c752
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/bq_common/bq_common.h b/src/bq_common/bq_common.h
@@ -52,5 +52,7 @@ extern bq::platform::atomic<int32_t> cccc7;
 extern bq::platform::atomic<int32_t> cccc8;
 extern bq::platform::atomic<int32_t> cccc9;
 extern bq::platform::atomic<int32_t> cccc10;
+extern bq::platform::atomic<int32_t> cccc11;
+extern bq::platform::atomic<int32_t> cccc12;
 
 extern bq::platform::atomic<void*> ccc_snapshot_obj;
diff --git a/src/bq_common/utils/util.cpp b/src/bq_common/utils/util.cpp
@@ -356,6 +356,8 @@ bq::platform::atomic<int32_t> cccc7 = 0;
 bq::platform::atomic<int32_t> cccc8 = 0;
 bq::platform::atomic<int32_t> cccc9 = 0;
 bq::platform::atomic<int32_t> cccc10 = 0;
+bq::platform::atomic<int32_t> cccc11 = 0;
+bq::platform::atomic<int32_t> cccc12 = 0;
 
 
 bq::platform::atomic<void*> ccc_snapshot_obj = nullptr;
diff --git a/src/bq_log/log/log_snapshot.cpp b/src/bq_log/log/log_snapshot.cpp
@@ -88,7 +88,13 @@ namespace bq {
                 snapshot_buffer_->end_read();
                 delete snapshot_buffer_;
                 snapshot_buffer_ = new_buffer;
+                if (cccc.load()) {
+                    cccc11.fetch_add(1);
+                }
             } else {
+                if (cccc.load()) {
+                    cccc12.fetch_add(1);
+                }
                 snapshot_buffer_ = new ring_buffer(buffer_size_);
                 snapshot_buffer_->set_thread_check_enable(false);
             }
@@ -170,7 +176,7 @@ namespace bq {
             }
             return snapshot_text_[snapshot_text_index_];
         }
-        ccc_snapshot_obj = this;
+        ccc_snapshot_obj = snapshot_buffer_;
         snapshot_buffer_->begin_read();
         bool read_success = false;
         while (true) {

diff --git a/test/test_log_3.cpp b/test/test_log_3.cpp
@@ -874,7 +874,7 @@ namespace bq {
                     snapshot_idx_mode = (snapshot_idx_mode % 1024) + 1;
                 }
 
-                bq::util::log_device_console(bq::log_level::fatal, "%s, %p, 一:%d, 二:%d, 三:%d, 四:%d, 五:%d, 六:%d, 七:%d, 八:%d, 九:%d, 十:%d", ccc_continue.load() ? "Y" : "X", ccc_snapshot_obj.load(), cccc1.load(), cccc2.load(), cccc3.load(), cccc4.load(), cccc5.load(), cccc6.load(), cccc7.load(), cccc8.load(), cccc9.load(), cccc10.load());
+                bq::util::log_device_console(bq::log_level::fatal, "%s\t, %p\t, 一:%d\t, 二:%d\t, 开始w:%d\t, w成功:%d\t, 读没b:%d\t, 读成功:%d\t, 删:%d\t, 换-分配失败:%d\t, 换-读:%d\t, 读失败原因:%d\t 换:%d\t 创:%d", ccc_continue.load() ? "Y" : "X", ccc_snapshot_obj.load(), cccc1.load(), cccc2.load(), cccc3.load(), cccc4.load(), cccc5.load(), cccc6.load(), cccc7.load(), cccc8.load(), cccc9.load(), cccc10.load(), cccc11.load(), cccc12.load());
 
                 size_t new_percent = (size_t)(current_tested_num * 100 / total_test_num);
                 if (new_percent != current_tested_percent) {