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.

---
 src/shm/hashtable.cpp |   87 ++++++++++++++++++++++++++-----------------
 1 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 62d052e..2cc9e38 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -2,6 +2,7 @@
 #include "hashtable.h"
 #include "mm.h"
 #include "svsem.h"
+#include "bh_api.h"
 #include "logger_factory.h"
 #include <set>
 #include <functional>
@@ -19,8 +20,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;
 
@@ -45,20 +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 (key == item->key)
-        return item->value;
-    }
+  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;
 
 }
@@ -68,10 +72,15 @@
   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);
+    }
+
     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;
@@ -79,61 +88,68 @@
 
   TAILQ_FOREACH(item, my_tailq_head, joint)
   {
-    if (key ==item->key)
+    if ((check_mm_valid(item) == true) && (key ==item->key))
     {
-      oldvalue = item -> value;
+      oldvalue = item->value;
       item->key= key;
-      item -> value = value;
+      item->value = value;
       return oldvalue;
     }
+
+    goto putnew;
   }
 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;
-  TAILQ_INSERT_TAIL(my_tailq_head, item, joint);
+  item->value = value;
+  TAILQ_INSERT_HEAD(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_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");
     }
-    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 the item as we don't need it anymore. */
+      if (check_mm_valid(item) == true)
         mm_free(item);
-        hashtable->queueCount--;
-        svsem_post(hashtable->mutex);
-        return oldvalue;
-      }
+
+      hashtable->array[code] = NULL;
+      hashtable->queueCount--;
+      mm_free(my_tailq_head);
+      svsem_post(hashtable->mutex);
+      
+      return;
     }
 
     if((rv = svsem_post(hashtable->mutex)) != 0) {
       LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
     }
 
-    return NULL;
+    return;
   }
 }
 
@@ -217,6 +233,7 @@
     key++;
   }
   // 鍗犵敤key
+
   _hashtable_put(hashtable, key, (void *)1);
 
   hashtable->currentKey = key;

--
Gitblit v1.8.0