From d69e2a2ed12d639cca99a4718250aacd6579987c Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期日, 10 十月 2021 13:33:50 +0800
Subject: [PATCH] Add the deadlock detect feature.
---
src/shm/mm.cpp | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/shm/mm.cpp b/src/shm/mm.cpp
index e4ef672..13ec443 100644
--- a/src/shm/mm.cpp
+++ b/src/shm/mm.cpp
@@ -147,7 +147,7 @@
*}
*/
- SemUtil::dec(mutex);
+ SemUtil::dec_uni(mutex);
size_t size = GET_SIZE(HDRP(ptr));
PUT(HDRP(ptr), PACK(size, 0));
PUT(FTRP(ptr), PACK(size, 0));
@@ -237,7 +237,7 @@
{
//鍚屼竴杩涚▼鍐呭凡缁忓垵濮嬪寲杩囦簡
- SemUtil::dec(mutex);
+ SemUtil::dec_uni(mutex);
if (shmid != -1){
hashtable = (hashtable_t *)shmp;
SemUtil::inc(mutex);
@@ -311,7 +311,7 @@
bool mm_destroy(void) {
struct shmid_ds shmid_ds;
- SemUtil::dec(mutex);
+ SemUtil::dec_uni(mutex);
if(shmctl(shmid, IPC_STAT, &shmid_ds) == 0) {
//LoggerFactory::getLogger()->debug("shm_nattch=%d\n", shmid_ds.shm_nattch);
@@ -336,8 +336,6 @@
//remove shared memery
if (shmctl(shmid, IPC_RMID, 0) == -1)
err_exit(errno, "mm_destroy shmctl IPC_RMID");
- else
- LoggerFactory::getLogger()->debug("shared memory destroy\n");
SemUtil::inc(mutex);
SemUtil::remove(mutex);
--
Gitblit v1.8.0