From e3c8f8edc1834b07ba7017c6d2c97e2f03ae0067 Mon Sep 17 00:00:00 2001 From: mutouyun Date: Sun, 27 Jun 2021 18:49:23 +0800 Subject: [PATCH] adjust test, chunk_storages revert to static --- src/ipc.cpp | 4 +++- test/test_ipc.cpp | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ipc.cpp b/src/ipc.cpp index 4e96c09..96aecea 100755 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -137,11 +137,13 @@ auto& chunk_storages() { return info; } }; - thread_local ipc::unordered_map chunk_s; + static ipc::unordered_map chunk_s; return chunk_s; } chunk_info_t *chunk_storage_info(std::size_t chunk_size) { + static std::mutex lock; + IPC_UNUSED_ std::lock_guard guard {lock}; return chunk_storages()[chunk_size].get_info(chunk_size); } diff --git a/test/test_ipc.cpp b/test/test_ipc.cpp index 5ca1a7c..a76b365 100755 --- a/test/test_ipc.cpp +++ b/test/test_ipc.cpp @@ -75,8 +75,8 @@ void test_basic(char const * name) { EXPECT_FALSE(que1.try_send(test2)); que_t que2 { que1.name(), ipc::receiver }; - EXPECT_TRUE(que1.send(test1)); - EXPECT_TRUE(que1.try_send(test2)); + ASSERT_TRUE(que1.send(test1)); + ASSERT_TRUE(que1.try_send(test2)); EXPECT_EQ(que2.recv(), test1); EXPECT_EQ(que2.recv(), test2); @@ -128,7 +128,11 @@ void test_sr(char const * name, int s_cnt, int r_cnt) { return; } ASSERT_TRUE((i >= 0) && (i < (int)data_set__.get().size())); - EXPECT_EQ(data_set__.get()[i], got); + if (data_set__.get()[i] != got) { + printf("data_set__.get()[%d] != got, size = %zd/%zd\n", + i, data_set__.get()[i].size(), got.size()); + EXPECT_TRUE(false); + } } }; }