From d52c87dee3aac4af66ad2e1a86094ca27209d816 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期二, 16 十一月 2021 16:19:45 +0800
Subject: [PATCH] Fix the service manager exits exceptionally issue.
---
/dev/null | 438 -------------------------------------------
src/socket/bus_server_socket.cpp | 2
src/shm/mm.cpp | 50 ++++
src/shm/hashtable.h | 3
src/shm/mm.h | 3
src/bh_api.cpp | 34 ++
src/proc_def.h | 1
src/shm/hashtable.cpp | 65 +++---
src/socket/shm_socket.cpp | 2
9 files changed, 113 insertions(+), 485 deletions(-)
diff --git a/src/bh_api.cpp b/src/bh_api.cpp
index c74c80d..b768e7e 100644
--- a/src/bh_api.cpp
+++ b/src/bh_api.cpp
@@ -3,6 +3,7 @@
#include "bus_server_socket_wrapper.h"
#include "shm_mm_wrapper.h"
#include "proc_def.h"
+#include "mm.h"
#include "usg_common.h"
#include "bh_api.h"
#include <pthread.h>
@@ -17,6 +18,7 @@
static Logger *logger = LoggerFactory::getLogger();
static int gRun_stat = 0;
+static int gRun_flag = true;
static void *gNetmod_socket = NULL;
static pthread_mutex_t mutex;
@@ -39,21 +41,22 @@
nsec = 0;
sprintf(buf, "%s", STR_EXEC);
data = net_mod_socket_int_get(gNetmod_socket);
- while(true) {
+ while(gRun_flag == true) {
rv = net_mod_socket_recvfrom(gNetmod_socket, &buf_temp, &size, &key, SVR_STR, data);
if (rv == 0) {
- BHFree(buf_temp, size);
+ if (strncmp((char *)buf_temp, STR_RET, strlen(STR_RET)) != 0) {
- if ((gNetmod_socket != NULL) && (gRun_stat != 0)) {
rv = net_mod_socket_sendto_timeout(gNetmod_socket, buf, strlen(buf), key, sec, nsec, SVR_STR, data);
if (rv != 0) {
logger->error("the process check response failed with error: %s!\n", bus_strerror(rv));
}
} else {
- break;
+ gRun_flag = false;
}
+
+ BHFree(buf_temp, size);
} else {
@@ -234,6 +237,7 @@
#endif
if (rv == 0) {
+ gRun_flag = true;
pthread_create(&gTids, NULL, client_run_check, NULL);
return true;
@@ -246,8 +250,11 @@
{
int rv;
int min;
+ int data;
+ int diff;
void *buf = NULL;
char *errString = NULL;
+ struct timeval start, end;
#if defined(PRO_DE_SERIALIZE)
struct _ProcInfo_proto
@@ -295,7 +302,23 @@
if (rv == 0) {
rv = net_mod_socket_reg(gNetmod_socket, NULL, 0, NULL, 0, timeout_ms, PROC_UNREG);
if (rv == 0) {
-
+ gettimeofday(&start, NULL);
+ data = net_mod_socket_int_get(gNetmod_socket);
+ rv = net_mod_socket_sendto_timeout(gNetmod_socket, STR_RET, strlen(STR_RET), data, 3, 0);
+ if (rv != 0) {
+ logger->error("the process check response failed with error: %s!\n", bus_strerror(rv));
+ }
+
+ while(gRun_flag == true) {
+ sleep(1);
+
+ gettimeofday(&end, NULL);
+
+ diff = end.tv_sec - start.tv_sec;
+ if (diff >= TIME_DUR)
+ break;
+ };
+
net_mod_socket_close(gNetmod_socket);
gNetmod_socket = NULL;
@@ -1465,7 +1488,6 @@
str = buf_temp;
val = net_mod_socket_buf_data_get(gNetmod_socket, str);
if(val > 0) {
-
rv = 0;
} else {
diff --git a/src/proc_def.h b/src/proc_def.h
index 4b6bf41..41a990e 100644
--- a/src/proc_def.h
+++ b/src/proc_def.h
@@ -23,6 +23,7 @@
#define STR_MAGIC ","
#define STR_EXEC "Success"
+#define STR_RET "Great"
typedef struct _ProcInfo {
#if 0
diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 14daaf0..2cc9e38 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -21,8 +21,6 @@
TAILQ_ENTRY(tailq_entry_t) joint;
} tailq_entry_t;
-#define START_KEY 1000
-
typedef TAILQ_HEAD(tailq_header_t, tailq_entry_t) tailq_header_t;
@@ -46,26 +44,25 @@
{
size_t code = hashcode(key);
tailq_entry_t *item;
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
+ tailq_header_t *my_tailq_head = hashtable->array[code];
+ if ((my_tailq_head == NULL) || (check_mm_valid(my_tailq_head) == false))
{
+ hashtable->array[code] = NULL;
return NULL;
}
- else
- {
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- if ((item != NULL) && (key == item->key)) {
- return item->value;
- } else {
- mm_free(my_tailq_head);
- hashtable->array[code] = NULL;
- hashtable->queueCount--;
- return NULL;
- }
- }
+ TAILQ_FOREACH(item, my_tailq_head, joint)
+ {
+ if ((check_mm_valid(item) == true) && (key == item->key))
+ return item->value;
+
+ break;
}
+
+ hashtable->array[code] = NULL;
+ hashtable->queueCount--;
+ mm_free(my_tailq_head);
+
return NULL;
}
@@ -75,8 +72,8 @@
size_t code = hashcode(key);
void *oldvalue;
tailq_entry_t *item;
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
+ tailq_header_t *my_tailq_head = hashtable->array[code];
+ if ((my_tailq_head == NULL) || (check_mm_valid(my_tailq_head) == false))
{
if (inter_key_get() == 0) {
inter_key_set(key);
@@ -91,13 +88,15 @@
TAILQ_FOREACH(item, my_tailq_head, joint)
{
- if ((item != NULL) && (key == item->key))
+ if ((check_mm_valid(item) == true) && (key ==item->key))
{
- oldvalue = item -> value;
+ oldvalue = item->value;
item->key= key;
item->value = value;
return oldvalue;
- }
+ }
+
+ goto putnew;
}
putnew:
@@ -107,7 +106,7 @@
item = (tailq_entry_t *) mm_malloc(sizeof(tailq_entry_t));
item->key = key;
item->value = value;
- TAILQ_INSERT_TAIL(my_tailq_head, item, joint);
+ TAILQ_INSERT_HEAD(my_tailq_head, item, joint);
return NULL;
}
@@ -120,9 +119,10 @@
if( (rv = svsem_uni_wait(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
+ tailq_header_t *my_tailq_head = hashtable->array[code];
+ if ((my_tailq_head == NULL) || (check_mm_valid(my_tailq_head) == false))
{
+ hashtable->array[code] = NULL;
if((rv = svsem_post(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
@@ -134,15 +134,14 @@
TAILQ_REMOVE(my_tailq_head, item, joint);
/* mm_free the item as we don't need it anymore. */
- mm_free(item);
+ if (check_mm_valid(item) == true)
+ mm_free(item);
- item = TAILQ_NEXT(item, joint);
- if (item == NULL) {
- mm_free(my_tailq_head);
- hashtable->array[code] = NULL;
- hashtable->queueCount--;
- svsem_post(hashtable->mutex);
- }
+ hashtable->array[code] = NULL;
+ hashtable->queueCount--;
+ mm_free(my_tailq_head);
+ svsem_post(hashtable->mutex);
+
return;
}
diff --git a/src/shm/hashtable.cpp.2 b/src/shm/hashtable.cpp.2
deleted file mode 100755
index 701bb17..0000000
--- a/src/shm/hashtable.cpp.2
+++ /dev/null
@@ -1,438 +0,0 @@
-#include "usg_common.h"
-#include "hashtable.h"
-#include "mm.h"
-#include "svsem.h"
-#include "logger_factory.h"
-#include <set>
-#include <functional>
-
-typedef struct tailq_entry_t
-{
- void *value;
- int key;
- /*
- * This holds the pointers to the next and previous joint in
- * the tail queue.
- */
- TAILQ_ENTRY(tailq_entry_t) joint;
-} tailq_entry_t;
-
-#define START_KEY 1000
-
-typedef TAILQ_HEAD(tailq_header_t, tailq_entry_t) tailq_header_t;
-
-
-static size_t hashcode(int key);
-
-static struct timespec TIMEOUT = {2, 0};
-
-void hashtable_init(hashtable_t *hashtable )
-{
-
- memset(hashtable, 0, sizeof(hashtable_t));
- hashtable->mutex = svsem_get(IPC_PRIVATE, 1);
- hashtable->wlock = svsem_get(IPC_PRIVATE, 1);
- hashtable->cond = svsem_get(IPC_PRIVATE, 1);
- hashtable->readcnt = 0;
-
- FILE * semfile = fopen("./sem.txt", "w+");
- if(semfile == NULL) {
- err_exit(errno, "fopen");
- }
- fprintf(semfile, "hashtable->mutex=%d\n", hashtable->mutex);
- fclose(semfile);
-}
-
-void hashtable_destroy(hashtable_t *hashtable) {
- svsem_remove( hashtable->mutex);
- svsem_remove( hashtable->wlock);
- svsem_remove( hashtable->cond);
-}
-
-
-static inline void *_hashtable_get(hashtable_t *hashtable, int key)
-{
- size_t code = hashcode(key);
- tailq_entry_t *item;
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
- {
- return NULL;
- }
- else
- {
-
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- if (key == item->key)
- return item->value;
- }
- }
- return NULL;
-
-}
-
-static inline void * _hashtable_put(hashtable_t *hashtable, int key, void *value)
-{
- size_t code = hashcode(key);
- void *oldvalue;
- tailq_entry_t *item;
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
- {
- my_tailq_head = (tailq_header_t*) mm_malloc(sizeof(tailq_header_t ));
- TAILQ_INIT(my_tailq_head);
- hashtable->array[code] = my_tailq_head;
- goto putnew;
- }
-
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- if (key ==item->key)
- {
- oldvalue = item -> value;
- item->key= key;
- item -> value = value;
- return oldvalue;
- }
- }
-putnew:
- item = (tailq_entry_t *) mm_malloc(sizeof(tailq_entry_t));
- item->key = key;
- item -> value = value;
- TAILQ_INSERT_TAIL(my_tailq_head, item, joint);
- return NULL;
-}
-
-void *hashtable_remove(hashtable_t *hashtable, int key)
-{
- size_t code = hashcode(key);
- tailq_entry_t *item;
- void *oldvalue;
- int rv;
-
- if( (rv = svsem_wait(hashtable->wlock)) != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
- }
- tailq_header_t *my_tailq_head = hashtable->array[code] ;
- if ( my_tailq_head == NULL)
- {
- svsem_post(hashtable->wlock);
- return NULL;
- }
- else
- {
- for (item = TAILQ_FIRST(my_tailq_head); item != NULL; item = TAILQ_NEXT(item, joint))
- {
- if (key == item->key)
- {
- oldvalue = item->value;
- /* Remove the item from the tail queue. */
- TAILQ_REMOVE(my_tailq_head, item, joint);
-
- /* mm_free the item as we don't need it anymore. */
- mm_free(item);
- svsem_post(hashtable->wlock);
- return oldvalue;
- }
- }
- }
- if((rv = svsem_post(hashtable->wlock)) != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
- }
-
- return NULL;
-
-}
-
-
-
-
-
-void hashtable_removeall(hashtable_t *hashtable)
-{
- tailq_entry_t *item;
- int rv;
- rv = svsem_wait(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n");
- }
- for (int i = 0; i < MAPSIZE; i++)
- {
- tailq_header_t *my_tailq_head = hashtable->array[i] ;
-
- if (my_tailq_head == NULL )
- continue;
-
- while ((item = TAILQ_FIRST(my_tailq_head)) )
- {
- TAILQ_REMOVE(my_tailq_head, item, joint);
- mm_free(item);
- }
- mm_free(my_tailq_head);
- hashtable->array[i] = NULL;
- }
- rv = svsem_post(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n");
- }
-}
-
-/**
- * for debug
- */
-void hashtable_printall(hashtable_t *hashtable)
-{
- tailq_entry_t *item;
- for (int i = 0; i < MAPSIZE; i++)
- {
- tailq_header_t *my_tailq_head = hashtable->array[i] ;
-
- if (my_tailq_head == NULL )
- continue;
-
- printf("code=%d\n", i);
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- printf("%d:%s\n", item->key, (char *)item->value);
- }
- printf("\n");
- }
-}
-
-static size_t hashcode(int key)
-{
-
- return key % MAPSIZE;
- /*printf("hashfun = %ld\n", code);*/
-}
-
-void *hashtable_get(hashtable_t *hashtable, int key) {
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 1");
-
- int rv;
- rv = svsem_wait(hashtable->mutex);
-
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 2");
-
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 1");
- }
- hashtable->readcnt++;
- if (hashtable->readcnt == 1) {
- //鑾峰彇璇诲啓閿�
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 3");
- rv = svsem_wait(hashtable->wlock);
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 4");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 2");
- }
- }
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 3");
- }
- // ================
-
- void * res = _hashtable_get(hashtable, key);
-
- // ==================
-
- rv = svsem_wait(hashtable->mutex);
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 5");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 4");
- }
- hashtable->readcnt--;
- if(hashtable->readcnt == 0) {
- //閲婃斁璇诲啓閿�
-
- rv = svsem_post(hashtable->wlock);
-LoggerFactory::getLogger()->debug( "==========hashtable_get before 6");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 5");
- }
- //閫氱煡鍐�
- rv = svsem_set(hashtable->cond, 1);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 6");
- }
- }
-
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_get 7");
- }
-LoggerFactory::getLogger()->debug( "==========hashtable_get after");
- return res;
-}
-
-void hashtable_put(hashtable_t *hashtable, int key, void *value) {
-
- int rv;
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 1");
- rv = svsem_wait(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 2");
- // 璁剧疆璇讳紭鍏堢骇楂�
- while (hashtable->readcnt > 0)
- {
- rv = svsem_set(hashtable->cond, 0);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
- //绛夊緟鍐欓�氱煡
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 3");
- rv = svsem_wait(hashtable->cond);
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 4");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
-
-
- rv = svsem_wait(hashtable->mutex);
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 5");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
- }
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
-
- //鑾峰彇璇诲啓閿�
- rv = svsem_wait(hashtable->wlock);
-LoggerFactory::getLogger()->debug( "==========hashtable_put before 6");
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
-
- _hashtable_put(hashtable, key, value);
-
- //閲婃斁璇诲啓閿�
- rv = svsem_post(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
- }
-
- LoggerFactory::getLogger()->debug( "==========hashtable_put after");
-}
-
-
-
-static inline void _hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
- tailq_entry_t *item;
- for (int i = 0; i < MAPSIZE; i++) {
- tailq_header_t *my_tailq_head = hashtable->array[i] ;
-
- if (my_tailq_head == NULL )
- continue;
-
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- cb(item->key, item -> value);
- }
- }
-}
-
-
-void hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
- int rv;
-
-
- LoggerFactory::getLogger()->debug("===hashtable_foreach before 1\n");
-
-
- rv = svsem_wait(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
- hashtable->readcnt++;
- if (hashtable->readcnt == 1) {
- //鑾峰彇璇诲啓閿�
- rv = svsem_wait(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
- }
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
-
- // ==================
-
- _hashtable_foreach(hashtable, cb);
-
- // ==================
-
- rv = svsem_wait(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
- hashtable->readcnt--;
- if(hashtable->readcnt == 0) {
- //閲婃斁璇诲啓閿�
- rv = svsem_post(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
- //閫氱煡鍐�
- rv = svsem_set(hashtable->cond, 1);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
- }
- rv = svsem_post(hashtable->mutex);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_foreach");
- }
-
-}
-
-
-std::set<int> * hashtable_keyset(hashtable_t *hashtable) {
- std::set<int> *keyset = new std::set<int>;
- tailq_entry_t *item;
- for (int i = 0; i < MAPSIZE; i++) {
- tailq_header_t *my_tailq_head = hashtable->array[i] ;
-
- if (my_tailq_head == NULL )
- continue;
-
- TAILQ_FOREACH(item, my_tailq_head, joint)
- {
- keyset->insert(item->key);
- }
- }
- return keyset;
-}
-
-
-int hashtable_alloc_key(hashtable_t *hashtable) {
- int rv;
- int key = START_KEY;
- rv = svsem_wait(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_alloc_key\n");
- }
-
- while(_hashtable_get(hashtable, key) != NULL) {
- key++;
- }
- // 鍗犵敤key
- _hashtable_put(hashtable, key, (void *)1);
-
- rv = svsem_post(hashtable->wlock);
- if(rv != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_alloc_key\n");
- }
- return key;
-}
diff --git a/src/shm/hashtable.h b/src/shm/hashtable.h
index 8909ae5..a4d99e8 100755
--- a/src/shm/hashtable.h
+++ b/src/shm/hashtable.h
@@ -5,7 +5,8 @@
#include <functional>
#include <set>
-#define MAPSIZE 4096
+#define START_KEY 1000
+#define MAPSIZE 81920
// 鍒涘缓Queue鏁伴噺鐨勪笂闄�
#define QUEUE_COUNT_LIMIT 300
diff --git a/src/shm/mm.cpp b/src/shm/mm.cpp
index 5837906..29e6364 100644
--- a/src/shm/mm.cpp
+++ b/src/shm/mm.cpp
@@ -3,6 +3,8 @@
*/
#include "mm.h"
#include "sem_util.h"
+#include "hashtable.h"
+#include "key_def.h"
#include "logger_factory.h"
#include "bh_api.h"
#include <sys/sem.h>
@@ -62,8 +64,6 @@
#define PREV_FBLKP(bp) (*PREDRP(bp))
/* $end mallocmacros */
-
-
// #define MAX_HEAP (512*(1<<20)) /* 20 MB */
#define MAX_HEAP (512) /* 20 MB */
@@ -138,8 +138,11 @@
*/
void mm_free(void *ptr, int enable)
{
- if ((ptr == 0) || (*(size_t *)(ptr - SIZE_T_SIZE) == 0x00))
- return;
+ if (ptr == 0)
+ return;
+
+ if (check_mm_valid(ptr) == false)
+ return;
/*
*if (!is_allocated(ptr) ) {
@@ -494,7 +497,7 @@
}
*(size_t *)bp = inter_key_get();
-
+
return (bp + SIZE_T_SIZE);
}
@@ -524,6 +527,10 @@
{
void *bp = heap_listp;
+ unsigned int diff;
+ struct timeval start, end;
+
+ gettimeofday(&start, NULL);
SemUtil::dec(mutex);
for (bp = heap_listp; GET_SIZE(HDRP(bp)) > 0; bp = NEXT_BLKP(bp))
{
@@ -532,10 +539,33 @@
mm_free(bp + SIZE_T_SIZE, false);
}
}
+
+ gettimeofday(&end, NULL);
+
+ diff = end.tv_sec - start.tv_sec;
+ if (diff >= TIME_DUR)
+ break;
}
SemUtil::inc(mutex);
return;
+}
+
+int check_mm_valid(void *bp)
+{
+ int val;
+
+ if ((bp >= mem_start_brk) && (bp <= mem_max_addr) && (GET_ALLOC(HDRP(bp - SIZE_T_SIZE)))) {
+
+ val = *(size_t *)(bp - SIZE_T_SIZE);
+ if (((val >= START_KEY) && (val <= (START_KEY + MAPSIZE))) || (val == SHM_BUS_KEY)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ return false;
}
/*
@@ -544,7 +574,10 @@
static void *find_fit(size_t size)
{
void *bp;
+ unsigned int diff;
+ struct timeval start, end;
+ gettimeofday(&start, NULL);
for (bp = NEXT_FBLKP(heap_listp); bp != heap_listp; bp = NEXT_FBLKP(bp))
{
if (!GET_ALLOC(HDRP(bp)) && (size <= GET_SIZE(HDRP(bp))))
@@ -554,7 +587,14 @@
{
break;
}
+
+ gettimeofday(&end, NULL);
+
+ diff = end.tv_sec - start.tv_sec;
+ if (diff >= TIME_DUR)
+ break;
}
+
return NULL; /* No fit */
}
diff --git a/src/shm/mm.h b/src/shm/mm.h
index d7d9a84..191bc1b 100644
--- a/src/shm/mm.h
+++ b/src/shm/mm.h
@@ -5,6 +5,8 @@
#include "usg_typedef.h"
#include "hashtable.h"
+#define TIME_DUR 100
+
extern bool mm_init(size_t heap_size);
extern bool mm_destroy(void);
@@ -12,6 +14,7 @@
void mm_free (void *ptr, int enable = true);
extern void *mm_realloc(void *ptr, size_t size);
extern void find_mm_data(int val);
+extern int check_mm_valid(void *bp);
extern void * mm_get_by_key(int key);
diff --git a/src/socket/bus_server_socket.cpp b/src/socket/bus_server_socket.cpp
index 0a44949..5243bf2 100644
--- a/src/socket/bus_server_socket.cpp
+++ b/src/socket/bus_server_socket.cpp
@@ -546,7 +546,7 @@
BusServerSocket::_data_remove(key);
len = (sizeof(buf_temp) - 1) > strlen((proc_iter->second).proc_id) ? strlen((proc_iter->second).proc_id) : (sizeof(buf_temp) - 1);
strncpy(buf_temp, (proc_iter->second).proc_id, len);
- proc->erase(proc_iter);
+ proc->erase(key);
}
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index ae9a98b..a6b6f93 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -426,7 +426,7 @@
exit(1);
}
}
-
+
sendpak.key = tmp_socket->key;
sendpak.size = send_size;
if(send_buf != NULL) {
--
Gitblit v1.8.0