From cb85aa8a8d02a3d6dc16e3f32e78da9e70f9c7f5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 17:49:21 +0800
Subject: [PATCH] update
---
src/shm/mm.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/shm/mm.cpp b/src/shm/mm.cpp
index d7cc375..8fff5c2 100644
--- a/src/shm/mm.cpp
+++ b/src/shm/mm.cpp
@@ -123,7 +123,8 @@
return aptr;
} else {
SemUtil::inc(mutex);
- err_msg(0, "mm_malloc : out of memery\n");
+ // abort();
+ err_exit(0, "mm_malloc : out of memery\n");
return NULL;
}
@@ -228,6 +229,7 @@
/*
* mm_init - Initialize the memory manager, M unit
+ * @return 鏄惁绗竴娆″垱寤�
*/
bool mm_init(size_t heap_size)
{
@@ -300,16 +302,17 @@
return first;
}
-
+/**
+ * @return 鏄惁鐪熸閿�姣佹垚鍔�
+ */
bool mm_destroy(void) {
struct shmid_ds shmid_ds;
-
SemUtil::dec(mutex);
if(shmctl(shmid, IPC_STAT, &shmid_ds) == 0) {
//LoggerFactory::getLogger()->debug("shm_nattch=%d\n", shmid_ds.shm_nattch);
- // 鍙湁褰撳墠涓�涓繘绋媋ttach鍒板叡浜唴瀛樹笂
+ // 澶氫釜杩涚▼attach鍦ㄥ叡浜唴瀛樹笂
if (shmid_ds.shm_nattch > 1) {
//detache
if (shmdt(shmp) == -1) {
@@ -318,7 +321,7 @@
SemUtil::inc(mutex);
return false;
} else {
-
+ // 鍙湁褰撳墠涓�涓繘绋媋ttach鍒板叡浜唴瀛樹笂
hashtable_destroy(hashtable);
//detache
if (shmdt(shmp) == -1) {
--
Gitblit v1.8.0