From d5da31067c3b602729047d4cf8f48b6580187869 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期四, 21 一月 2021 18:09:36 +0800 Subject: [PATCH] update --- src/shm/hashtable.cpp | 111 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 48 deletions(-) diff --git a/src/shm/hashtable.cpp b/src/shm/hashtable.cpp index 338d482..701bb17 100755 --- a/src/shm/hashtable.cpp +++ b/src/shm/hashtable.cpp @@ -1,7 +1,7 @@ #include "usg_common.h" #include "hashtable.h" #include "mm.h" -#include "sem_util.h" +#include "svsem.h" #include "logger_factory.h" #include <set> #include <functional> @@ -30,9 +30,9 @@ { memset(hashtable, 0, sizeof(hashtable_t)); - hashtable->mutex = SemUtil::get(IPC_PRIVATE, 1); - hashtable->wlock = SemUtil::get(IPC_PRIVATE, 1); - hashtable->cond = SemUtil::get(IPC_PRIVATE, 1); + 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+"); @@ -44,9 +44,9 @@ } void hashtable_destroy(hashtable_t *hashtable) { - SemUtil::remove( hashtable->mutex); - SemUtil::remove( hashtable->wlock); - SemUtil::remove( hashtable->cond); + svsem_remove( hashtable->mutex); + svsem_remove( hashtable->wlock); + svsem_remove( hashtable->cond); } @@ -111,13 +111,13 @@ void *oldvalue; int rv; - if( (rv = SemUtil::dec(hashtable->wlock)) != 0) { + if( (rv = svsem_wait(hashtable->wlock)) != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_remove\n"); } tailq_header_t *my_tailq_head = hashtable->array[code] ; if ( my_tailq_head == NULL) { - SemUtil::inc(hashtable->wlock); + svsem_post(hashtable->wlock); return NULL; } else @@ -132,12 +132,12 @@ /* mm_free the item as we don't need it anymore. */ mm_free(item); - SemUtil::inc(hashtable->wlock); + svsem_post(hashtable->wlock); return oldvalue; } } } - if((rv = SemUtil::inc(hashtable->wlock)) != 0) { + if((rv = svsem_post(hashtable->wlock)) != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_remove\n"); } @@ -153,7 +153,7 @@ { tailq_entry_t *item; int rv; - rv = SemUtil::dec(hashtable->wlock); + rv = svsem_wait(hashtable->wlock); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n"); } @@ -172,7 +172,7 @@ mm_free(my_tailq_head); hashtable->array[i] = NULL; } - rv = SemUtil::inc(hashtable->wlock); + rv = svsem_post(hashtable->wlock); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_removeall\n"); } @@ -208,12 +208,12 @@ } void *hashtable_get(hashtable_t *hashtable, int key) { - LoggerFactory::getLogger()->debug( "==========hashtable_get before 1"); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 1"); int rv; - rv = SemUtil::dec(hashtable->mutex); + rv = svsem_wait(hashtable->mutex); - LoggerFactory::getLogger()->debug( "==========hashtable_get before 2"); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 2"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 1"); @@ -221,12 +221,14 @@ hashtable->readcnt++; if (hashtable->readcnt == 1) { //鑾峰彇璇诲啓閿� - rv = SemUtil::dec(hashtable->wlock); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 3"); + rv = svsem_wait(hashtable->wlock); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 4"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 2"); } } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 3"); } @@ -236,70 +238,78 @@ // ================== - rv = SemUtil::dec(hashtable->mutex); + rv = svsem_wait(hashtable->mutex); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 5"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 4"); } hashtable->readcnt--; if(hashtable->readcnt == 0) { //閲婃斁璇诲啓閿� - rv = SemUtil::inc(hashtable->wlock); + + rv = svsem_post(hashtable->wlock); +LoggerFactory::getLogger()->debug( "==========hashtable_get before 6"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 5"); } //閫氱煡鍐� - rv = SemUtil::set(hashtable->cond, 1); + rv = svsem_set(hashtable->cond, 1); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 6"); } } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_get 7"); } - LoggerFactory::getLogger()->debug( "==========hashtable_get after"); +LoggerFactory::getLogger()->debug( "==========hashtable_get after"); return res; } void hashtable_put(hashtable_t *hashtable, int key, void *value) { int rv; - LoggerFactory::getLogger()->debug( "==========hashtable_put before"); - rv = SemUtil::dec(hashtable->mutex); +LoggerFactory::getLogger()->debug( "==========hashtable_put before 1"); + rv = svsem_wait(hashtable->mutex); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } +LoggerFactory::getLogger()->debug( "==========hashtable_put before 2"); // 璁剧疆璇讳紭鍏堢骇楂� while (hashtable->readcnt > 0) { - rv = SemUtil::set(hashtable->cond, 0); + rv = svsem_set(hashtable->cond, 0); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } //绛夊緟鍐欓�氱煡 - rv = SemUtil::dec(hashtable->cond); +LoggerFactory::getLogger()->debug( "==========hashtable_put before 3"); + rv = svsem_wait(hashtable->cond); +LoggerFactory::getLogger()->debug( "==========hashtable_put before 4"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } - rv = SemUtil::dec(hashtable->mutex); + rv = svsem_wait(hashtable->mutex); +LoggerFactory::getLogger()->debug( "==========hashtable_put before 5"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } //鑾峰彇璇诲啓閿� - rv = SemUtil::dec(hashtable->wlock); + rv = svsem_wait(hashtable->wlock); +LoggerFactory::getLogger()->debug( "==========hashtable_put before 6"); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } @@ -307,7 +317,7 @@ _hashtable_put(hashtable, key, value); //閲婃斁璇诲啓閿� - rv = SemUtil::inc(hashtable->wlock); + rv = svsem_post(hashtable->wlock); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_put\n"); } @@ -335,21 +345,26 @@ void hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) { int rv; - rv = SemUtil::dec(hashtable->mutex); + + + LoggerFactory::getLogger()->debug("===hashtable_foreach before 1\n"); + + + rv = svsem_wait(hashtable->mutex); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } hashtable->readcnt++; if (hashtable->readcnt == 1) { //鑾峰彇璇诲啓閿� - rv = SemUtil::dec(hashtable->wlock); + rv = svsem_wait(hashtable->wlock); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } // ================== @@ -358,26 +373,26 @@ // ================== - rv = SemUtil::dec(hashtable->mutex); + rv = svsem_wait(hashtable->mutex); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } hashtable->readcnt--; if(hashtable->readcnt == 0) { //閲婃斁璇诲啓閿� - rv = SemUtil::inc(hashtable->wlock); + rv = svsem_post(hashtable->wlock); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } //閫氱煡鍐� - rv = SemUtil::set(hashtable->cond, 1); + rv = svsem_set(hashtable->cond, 1); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } } - rv = SemUtil::inc(hashtable->mutex); + rv = svsem_post(hashtable->mutex); if(rv != 0) { - LoggerFactory::getLogger()->error(rv, "hashtable_foreach\n"); + LoggerFactory::getLogger()->error(rv, "hashtable_foreach"); } } @@ -404,7 +419,7 @@ int hashtable_alloc_key(hashtable_t *hashtable) { int rv; int key = START_KEY; - rv = SemUtil::dec(hashtable->wlock); + rv = svsem_wait(hashtable->wlock); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_alloc_key\n"); } @@ -415,7 +430,7 @@ // 鍗犵敤key _hashtable_put(hashtable, key, (void *)1); - rv = SemUtil::inc(hashtable->wlock); + rv = svsem_post(hashtable->wlock); if(rv != 0) { LoggerFactory::getLogger()->error(rv, "hashtable_alloc_key\n"); } -- Gitblit v1.8.0