From 5c912c70e9333298ff48f7ea15424f72ca977b99 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期五, 17 九月 2021 09:43:55 +0800
Subject: [PATCH] Add the heartbeat logic feature.

---
 src/shm/hashtable.cpp |  119 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 2248ad9..c4a81fc 100755
--- a/src/shm/hashtable.cpp
+++ b/src/shm/hashtable.cpp
@@ -5,6 +5,9 @@
 #include "logger_factory.h"
 #include <set>
 #include <functional>
+#include <limits.h>
+
+
 
 typedef struct tailq_entry_t
 {
@@ -29,22 +32,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);
 }
 
 
@@ -130,6 +123,7 @@
 
         /* mm_free the item as we don't need it anymore. */
         mm_free(item);
+        hashtable->queueCount--;
         svsem_post(hashtable->mutex);
         return oldvalue;
       }
@@ -143,29 +137,97 @@
   }
 }
 
-
-
-
 void *hashtable_get(hashtable_t *hashtable, int key) {
+  int rv;
+
+  if((rv = svsem_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_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) {
     LoggerFactory::getLogger()->error(errno, "hashtable_put\n");
   }
+  if(overwrite) {
+    _hashtable_put(hashtable, key, value);
+    goto suc;
+  }
+  val = _hashtable_get(hashtable, key);
+  // val = 1鏄痑llockey鐨勬儏鍐�
+  if(val != NULL && val != (void *)1) 
+    goto fail;
 
   _hashtable_put(hashtable, key, value);
 
+suc:
   if(( rv = svsem_post(hashtable->mutex)) != 0) {
     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_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,29 +268,6 @@
   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(errno, "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(errno, "hashtable_alloc_key\n");
-  }
-  return key;
-}
-
-
 void hashtable_removeall(hashtable_t *hashtable)
 {
   tailq_entry_t *item;
@@ -252,6 +291,7 @@
     hashtable->array[i] = NULL;
   }
 
+  hashtable->queueCount = 0;
   if((rv = svsem_post(hashtable->mutex)) != 0) {
     LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
   }
@@ -262,7 +302,6 @@
 {
 
   return key % MAPSIZE;
-  /*printf("hashfun = %ld\n", code);*/
 }
 
 /**
@@ -285,4 +324,4 @@
     }
     printf("\n");
   }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0