From c479ef57baaaa28964fc3ec8d80ff99dffa7d49f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期三, 10 十一月 2021 09:49:29 +0800
Subject: [PATCH] Fix the system hang issue when the app is killed contantly.
---
src/shm/mm.cpp | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 deletions(-)
diff --git a/src/shm/mm.cpp b/src/shm/mm.cpp
index 7f1fda3..5837906 100644
--- a/src/shm/mm.cpp
+++ b/src/shm/mm.cpp
@@ -4,6 +4,7 @@
#include "mm.h"
#include "sem_util.h"
#include "logger_factory.h"
+#include "bh_api.h"
#include <sys/sem.h>
#include <sys/shm.h>
@@ -113,7 +114,6 @@
newsize = ALIGN(size + (SIZE_T_SIZE << 1) + (PTR_SIZE << 1) );
- //fprintf(stderr, "mm_malloc : size=%u\n", size);
/* Search the free list for a fit */
SemUtil::dec(mutex);
if ((ptr = find_fit(newsize)) != NULL)
@@ -123,8 +123,11 @@
return aptr;
} else {
SemUtil::inc(mutex);
- abort();
- err_exit(0, "mm_malloc : out of memery\n");
+ err_msg(0, "mm_malloc : out of memery\n");
+ LoggerFactory::getLogger()->fatal("mm_malloc : out of memery\n");
+ // abort();
+ exit(1);
+
return NULL;
}
@@ -133,10 +136,10 @@
/*
* mm_free - Free a block
*/
-void mm_free(void *ptr)
+void mm_free(void *ptr, int enable)
{
- if (ptr == 0)
- return;
+ if ((ptr == 0) || (*(size_t *)(ptr - SIZE_T_SIZE) == 0x00))
+ return;
/*
*if (!is_allocated(ptr) ) {
@@ -145,15 +148,19 @@
*}
*/
- SemUtil::dec(mutex);
+ if (enable == true) {
+ SemUtil::dec_uni(mutex);
+ }
+ ptr -= SIZE_T_SIZE;
size_t size = GET_SIZE(HDRP(ptr));
PUT(HDRP(ptr), PACK(size, 0));
PUT(FTRP(ptr), PACK(size, 0));
+ *(size_t *)ptr = 0x00;
coalesce(ptr);
- SemUtil::inc(mutex);
+ if (enable == true) {
+ SemUtil::inc(mutex);
+ }
}
-
-
/*
* mm_realloc - Naive implementation of realloc
@@ -229,12 +236,13 @@
/*
* mm_init - Initialize the memory manager, M unit
+ * @return 鏄惁绗竴娆″垱寤�
*/
bool mm_init(size_t heap_size)
{
//鍚屼竴杩涚▼鍐呭凡缁忓垵濮嬪寲杩囦簡
- SemUtil::dec(mutex);
+ SemUtil::dec_uni(mutex);
if (shmid != -1){
hashtable = (hashtable_t *)shmp;
SemUtil::inc(mutex);
@@ -253,6 +261,7 @@
first = false;
shmid = shmget(SHM_KEY, 0, 0);
}
+
if (shmid == -1)
err_exit(errno, "mm_init shmget");
shmp = shmat(shmid, key_addr, 0);
@@ -301,16 +310,17 @@
return first;
}
-
+/**
+ * @return 鏄惁鐪熸閿�姣佹垚鍔�
+ */
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);
- // 鍙湁褰撳墠涓�涓繘绋媋ttach鍒板叡浜唴瀛樹笂
+ // 澶氫釜杩涚▼attach鍦ㄥ叡浜唴瀛樹笂
if (shmid_ds.shm_nattch > 1) {
//detache
if (shmdt(shmp) == -1) {
@@ -319,7 +329,7 @@
SemUtil::inc(mutex);
return false;
} else {
-
+ // 鍙湁褰撳墠涓�涓繘绋媋ttach鍒板叡浜唴瀛樹笂
hashtable_destroy(hashtable);
//detache
if (shmdt(shmp) == -1) {
@@ -331,10 +341,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");
-
- LoggerFactory::getLogger()->debug( "mm_destroy: real destroy.");
SemUtil::inc(mutex);
SemUtil::remove(mutex);
@@ -359,6 +365,7 @@
void mm_free_by_key(int key) {
void *ptr;
+
ptr = hashtable_get(hashtable, key);
if(ptr != NULL) {
mm_free(ptr);
@@ -387,15 +394,13 @@
PUT(HDRP(bp), PACK(size, 0)); /* Free block header */ //line:vm:mm:freeblockhdr
PUT(FTRP(bp), PACK(size, 0)); /* Free block footer */ //line:vm:mm:freeblockftr
PUT(HDRP(NEXT_BLKP(bp)), PACK(0, 1)); /* New epilogue header */ //line:vm:mm:newepihdr
-
+
/* Coalesce if the previous block was free */
return coalesce(bp); //line:vm:mm:returnblock
}
static void insert_fblock (void *bp)
{
- //鍚庤繘鍏堝嚭鐨勬柟寮忔彃鍏ワ紝鍗虫彃鍏ラ摼琛ㄥご浣嶇疆
-
// insert into the header of the free list
PUT_PTR(SUCCRP(bp), NEXT_FBLKP(heap_listp)); //the successor of bp point to the old first free block
PUT_PTR(PREDRP(NEXT_FBLKP(heap_listp)), bp); //the predecessor of the old first free block point to bp
@@ -487,7 +492,10 @@
PUT(FTRP(bp), PACK(csize, 1));
rm_fblock(bp);
}
- return bp;
+
+ *(size_t *)bp = inter_key_get();
+
+ return (bp + SIZE_T_SIZE);
}
static int is_allocated(void *ptr)
@@ -512,6 +520,24 @@
}
+void find_mm_data(int val)
+{
+ void *bp = heap_listp;
+
+ SemUtil::dec(mutex);
+ for (bp = heap_listp; GET_SIZE(HDRP(bp)) > 0; bp = NEXT_BLKP(bp))
+ {
+ if (GET_ALLOC(HDRP(bp))) {
+ if ((*(size_t *)bp) == val) {
+ mm_free(bp + SIZE_T_SIZE, false);
+ }
+ }
+ }
+ SemUtil::inc(mutex);
+
+ return;
+}
+
/*
* find_fit - Find a fit for a block with size bytes
*/
@@ -524,6 +550,9 @@
if (!GET_ALLOC(HDRP(bp)) && (size <= GET_SIZE(HDRP(bp))))
{
return bp;
+ } else if (GET_ALLOC(HDRP(bp)) && (GET_SIZE(HDRP(bp)) == 0))
+ {
+ break;
}
}
return NULL; /* No fit */
--
Gitblit v1.8.0