From 7fa99e0efe07a120af719da2cae5c1151f024403 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 03 四月 2024 10:17:25 +0800
Subject: [PATCH] remove some defer

---
 src/shm/hashtable.cpp |  232 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 147 insertions(+), 85 deletions(-)

diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 60633bc..ab07ad1 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
 {
@@ -17,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;
 
 
@@ -29,22 +31,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);
 }
 
 
@@ -52,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) || (code == item->key)))
+      return item->value;
+
+    break;
   }
+
+  hashtable->array[code] = NULL;
+  hashtable->queueCount--;
+  mm_free(my_tailq_head);
+
   return NULL;
 
 }
@@ -75,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;
@@ -86,86 +88,162 @@
 
   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_wait(hashtable->mutex)) != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
+  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(rv, "hashtable_remove\n");
+      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);
-        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(rv, "hashtable_remove\n");
+      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;
-  if(( rv = svsem_wait(hashtable->mutex)) != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
+  void * val;
+  if(( rv = svsem_uni_wait(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
   }
+  if(overwrite) {
+    _hashtable_put(hashtable, key, value);
+    goto suc;
+  }
+  val = _hashtable_get(hashtable, key);
+  if(val != NULL && val != (void *)1) 
+    goto fail;
 
   _hashtable_put(hashtable, key, value);
 
+suc:
   if(( rv = svsem_post(hashtable->mutex)) != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_put\n");
+    LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
   }
+  return true;
+
+fail:
+  if(( rv = svsem_post(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
+  }
+  return false;
 }
 
+int hashtable_get_queue_count(hashtable_t *hashtable) {
+  return hashtable->queueCount;
+}
 
+int hashtable_alloc_key(hashtable_t *hashtable) {
+  int rv;
+  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");
+  }
+
+  while(_hashtable_get(hashtable, key) != NULL) {
+    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;
+}
 
 static inline void _hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)>  cb) {
   tailq_entry_t *item;
@@ -206,35 +284,12 @@
   return keyset;
 }
 
-
-int hashtable_alloc_key(hashtable_t *hashtable) {
-  int rv;
-  int key = START_KEY;
-  rv = svsem_wait(hashtable->mutex);
-  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->mutex);
-  if(rv != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_alloc_key\n");
-  }
-  return key;
-}
-
-
 void hashtable_removeall(hashtable_t *hashtable)
 {
   tailq_entry_t *item;
   int rv;
-  if( (rv = svsem_wait(hashtable->mutex)) != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n");
+  if( (rv = svsem_uni_wait(hashtable->mutex)) != 0) {
+    LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
   }
   for (int i = 0; i < MAPSIZE; i++)
   {
@@ -252,17 +307,24 @@
     hashtable->array[i] = NULL;
   }
 
+  hashtable->queueCount = 0;
   if((rv = svsem_post(hashtable->mutex)) != 0) {
-    LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n");
+    LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
   }
 }
 
 
 static size_t hashcode(int key)
 {
+  int val;
 
-  return key % MAPSIZE;
-  /*printf("hashfun = %ld\n", code);*/
+  if (key < MAPSIZE) {
+    val = key;
+  } else {
+    val = key % MAPSIZE % (MAPSIZE - START_KEY) + START_KEY;
+  }
+
+  return val;
 }
 
 /**
@@ -285,4 +347,4 @@
     }
     printf("\n");
   }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0