coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2025-12-07 01:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue caused by inconsistent lifecycle of the global IPC object.

Browse Source
This commit is contained in:
mutouyun 2025-05-06 17:59:03 +08:00
parent 32c2be29a9
commit 70121091d6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libipc/ipc.cpp
View File

@ -76,18 +76,18 @@ ipc::buff_t make_cache(T &data, std::size_t size) {
} }
acc_t *cc_acc(std::string const &pref) { acc_t *cc_acc(std::string const &pref) {
static ipc::unordered_map<std::string, ipc::shm::handle> handles; static auto *phs = new ipc::unordered_map<std::string, ipc::shm::handle>; // no delete
static std::mutex lock; static std::mutex lock;
std::lock_guard<std::mutex> guard {lock}; std::lock_guard<std::mutex> guard {lock};
auto it = handles.find(pref); auto it = phs->find(pref);
if (it == handles.end()) { if (it == phs->end()) {
std::string shm_name {ipc::make_prefix(pref, "CA_CONN__")}; std::string shm_name {ipc::make_prefix(pref, "CA_CONN__")};
ipc::shm::handle h; ipc::shm::handle h;
if (!h.acquire(shm_name.c_str(), sizeof(acc_t))) { if (!h.acquire(shm_name.c_str(), sizeof(acc_t))) {
ipc::error("[cc_acc] acquire failed: %s\n", shm_name.c_str()); ipc::error("[cc_acc] acquire failed: %s\n", shm_name.c_str());
return nullptr; return nullptr;
} }
it = handles.emplace(pref, std::move(h)).first; it = phs->emplace(pref, std::move(h)).first;
} }
return static_cast<acc_t *>(it->second.get()); return static_cast<acc_t *>(it->second.get());
} }
@ -248,8 +248,8 @@ auto& chunk_storages() {
}; };
using deleter_t = void (*)(chunk_handle_t*); using deleter_t = void (*)(chunk_handle_t*);
using chunk_handle_ptr_t = std::unique_ptr<chunk_handle_t, deleter_t>; using chunk_handle_ptr_t = std::unique_ptr<chunk_handle_t, deleter_t>;
static ipc::map<std::size_t, chunk_handle_ptr_t> chunk_hs; static auto *chunk_hs = new ipc::map<std::size_t, chunk_handle_ptr_t>; // no delete
return chunk_hs; return *chunk_hs;
} }
chunk_info_t *chunk_storage_info(conn_info_head *inf, std::size_t chunk_size) { chunk_info_t *chunk_storage_info(conn_info_head *inf, std::size_t chunk_size) {

2
test/imp/test_imp_system.cpp
View File

@ -6,5 +6,5 @@
TEST(system, conf) { TEST(system, conf) {
auto ret = ipc::sys::conf(ipc::sys::info::page_size); auto ret = ipc::sys::conf(ipc::sys::info::page_size);
EXPECT_TRUE(ret); EXPECT_TRUE(ret);
EXPECT_EQ(ret.value(), 4096); EXPECT_GE(ret.value(), 4096);
} }