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/hashtable.cpp | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 51 deletions(-)
diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 7a5faf4..14daaf0 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -2,9 +2,13 @@
#include "hashtable.h"
#include "mm.h"
#include "svsem.h"
+#include "bh_api.h"
#include "logger_factory.h"
#include <set>
#include <functional>
+#include <limits.h>
+
+
typedef struct tailq_entry_t
{
@@ -29,22 +33,12 @@
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);
+ hashtable->queueCount = 0;
+ hashtable->currentKey = START_KEY;
}
void hashtable_destroy(hashtable_t *hashtable) {
svsem_remove( hashtable->mutex);
- // svsem_remove( hashtable->wlock);
- // svsem_remove( hashtable->cond);
}
@@ -59,11 +53,17 @@
}
else
{
-
TAILQ_FOREACH(item, my_tailq_head, joint)
{
- if (key == item->key)
+ if ((item != NULL) && (key == item->key)) {
return item->value;
+ } else {
+ mm_free(my_tailq_head);
+ hashtable->array[code] = NULL;
+ hashtable->queueCount--;
+
+ return NULL;
+ }
}
}
return NULL;
@@ -78,7 +78,12 @@
tailq_header_t *my_tailq_head = hashtable->array[code] ;
if ( my_tailq_head == NULL)
{
+ if (inter_key_get() == 0) {
+ inter_key_set(key);
+ }
+
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;
@@ -86,30 +91,33 @@
TAILQ_FOREACH(item, my_tailq_head, joint)
{
- if (key ==item->key)
+ if ((item != NULL) && (key == item->key))
{
oldvalue = item -> value;
item->key= key;
- item -> value = value;
+ item->value = value;
return oldvalue;
- }
+ }
}
putnew:
+
+ if (inter_key_get() == 0) {
+ inter_key_set(key);
+ }
item = (tailq_entry_t *) mm_malloc(sizeof(tailq_entry_t));
item->key = key;
- item -> value = value;
+ item->value = value;
TAILQ_INSERT_TAIL(my_tailq_head, item, joint);
return NULL;
}
-void *hashtable_remove(hashtable_t *hashtable, int key)
+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->mutex)) != 0) {
+ if( (rv = svsem_uni_wait(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
tailq_header_t *my_tailq_head = hashtable->array[code] ;
@@ -118,45 +126,68 @@
if((rv = svsem_post(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
- return NULL;
+ return;
} else {
- for (item = TAILQ_FIRST(my_tailq_head); item != NULL; item = TAILQ_NEXT(item, joint))
+ for (item = TAILQ_FIRST(my_tailq_head); item != NULL;)
{
- if (key == item->key)
- {
- oldvalue = item->value;
- /* Remove the item from the tail queue. */
- TAILQ_REMOVE(my_tailq_head, item, joint);
+ /* 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);
+ /* mm_free the item as we don't need it anymore. */
+ 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);
- return oldvalue;
}
+ return;
}
if((rv = svsem_post(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
- return NULL;
+ return;
}
}
void *hashtable_get(hashtable_t *hashtable, int key) {
+ int rv;
+
+ if((rv = svsem_uni_wait(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_get\n");
+ }
void * res = _hashtable_get(hashtable, key);
+
+ if((rv = svsem_post(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_get\n");
+ }
return res;
}
void hashtable_put(hashtable_t *hashtable, int key, void *value) {
+ int rv;
+
+ if((rv = svsem_uni_wait(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+ }
_hashtable_put(hashtable, key, value);
+ hashtable->queueCount++;
+
+ if((rv = svsem_post(hashtable->mutex)) != 0) {
+ LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+ }
+
}
bool hashtable_check_put(hashtable_t *hashtable, int key, void *value, bool overwrite) {
int rv;
void * val;
- if(( rv = svsem_wait(hashtable->mutex)) != 0) {
+ if(( rv = svsem_uni_wait(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
}
if(overwrite) {
@@ -164,7 +195,6 @@
goto suc;
}
val = _hashtable_get(hashtable, key);
- // val = 1鏄痑llockey鐨勬儏鍐�
if(val != NULL && val != (void *)1)
goto fail;
@@ -183,12 +213,19 @@
return false;
}
-
+int hashtable_get_queue_count(hashtable_t *hashtable) {
+ return hashtable->queueCount;
+}
int hashtable_alloc_key(hashtable_t *hashtable) {
int rv;
- int key = START_KEY;
- rv = svsem_wait(hashtable->mutex);
+ int key = hashtable->currentKey;
+
+ if( key == INT_MAX || key < START_KEY) {
+ key = START_KEY;
+ }
+
+ rv = svsem_uni_wait(hashtable->mutex);
if(rv != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_alloc_key\n");
}
@@ -197,12 +234,15 @@
key++;
}
// 鍗犵敤key
+
_hashtable_put(hashtable, key, (void *)1);
+ hashtable->currentKey = key;
rv = svsem_post(hashtable->mutex);
if(rv != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_alloc_key\n");
}
+
return key;
}
@@ -245,22 +285,11 @@
return keyset;
}
-
-
-int hashtable_lock(hashtable_t *hashtable) {
- return svsem_wait(hashtable->mutex);
-}
-
-int hashtable_unlock(hashtable_t *hashtable) {
- return svsem_post(hashtable->mutex);
-}
-
-
void hashtable_removeall(hashtable_t *hashtable)
{
tailq_entry_t *item;
int rv;
- if( (rv = svsem_wait(hashtable->mutex)) != 0) {
+ if( (rv = svsem_uni_wait(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
}
for (int i = 0; i < MAPSIZE; i++)
@@ -279,6 +308,7 @@
hashtable->array[i] = NULL;
}
+ hashtable->queueCount = 0;
if((rv = svsem_post(hashtable->mutex)) != 0) {
LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
}
@@ -289,7 +319,6 @@
{
return key % MAPSIZE;
- /*printf("hashfun = %ld\n", code);*/
}
/**
@@ -312,4 +341,4 @@
}
printf("\n");
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0