From b984dac55bdd0a5b694837fb8fb2ceb07ce9808f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期二, 07 九月 2021 11:25:57 +0800
Subject: [PATCH] resize the buf allocation to dynamic buf.
---
src/shm/hashtable.cpp | 133 ++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 47 deletions(-)
diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp
index 60633bc..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);
}
@@ -110,13 +103,13 @@
int rv;
if( (rv = svsem_wait(hashtable->mutex)) != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
+ LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
tailq_header_t *my_tailq_head = hashtable->array[code] ;
if ( my_tailq_head == NULL)
{
if((rv = svsem_post(hashtable->mutex)) != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
+ LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
return NULL;
} else {
@@ -130,42 +123,111 @@
/* mm_free the item as we don't need it anymore. */
mm_free(item);
+ hashtable->queueCount--;
svsem_post(hashtable->mutex);
return oldvalue;
}
}
if((rv = svsem_post(hashtable->mutex)) != 0) {
- LoggerFactory::getLogger()->error(rv, "hashtable_remove\n");
+ LoggerFactory::getLogger()->error(errno, "hashtable_remove\n");
}
return NULL;
}
}
-
-
-
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(rv, "hashtable_put\n");
+ 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(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_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 +268,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");
+ LoggerFactory::getLogger()->error(errno, "hashtable_removeall\n");
}
for (int i = 0; i < MAPSIZE; i++)
{
@@ -252,8 +291,9 @@
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");
}
}
@@ -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