From 51be606cae24b3f6de088ec59f69c378ceec0908 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:03:14 +0800
Subject: [PATCH] udpate
---
/dev/null | 0
test/lambda.c | 19 +++++++++
test/Makefile | 2
src/queue/include/hashtable.h | 11 ++++-
Makefile | 3 +
src/queue/hashtable.c | 61 ++++++++++++++++++++++++------
test/test.c | 7 ++-
demo/dgram_mod_bus | 0
8 files changed, 85 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 18a1a54..b4fa973 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-DIRS = src test_socket demo
+DIRS = src test_socket demo test
TAR_NAME = shm_queue.tar.gz
+
all:
for i in $(DIRS); do \
(cd $$i && echo "making $$i" && $(MAKE) ) || exit 1; \
diff --git a/demo/dgram_mod_bus b/demo/dgram_mod_bus
new file mode 100755
index 0000000..c2e1159
--- /dev/null
+++ b/demo/dgram_mod_bus
Binary files differ
diff --git a/demo/dgram_mod_req_rep b/demo/dgram_mod_req_rep
deleted file mode 100755
index ed8fe41..0000000
--- a/demo/dgram_mod_req_rep
+++ /dev/null
Binary files differ
diff --git a/demo/dgram_mod_survey b/demo/dgram_mod_survey
deleted file mode 100755
index 00bf41d..0000000
--- a/demo/dgram_mod_survey
+++ /dev/null
Binary files differ
diff --git a/src/libshm_queue.a b/src/libshm_queue.a
deleted file mode 100644
index 1e2bd99..0000000
--- a/src/libshm_queue.a
+++ /dev/null
Binary files differ
diff --git a/src/queue/hashtable.c b/src/queue/hashtable.c
index 1fa6266..eaa3ca6 100755
--- a/src/queue/hashtable.c
+++ b/src/queue/hashtable.c
@@ -3,6 +3,7 @@
#include "mm.h"
#include "sem_util.h"
#include <set>
+#include <functional>
typedef struct tailq_entry_t
{
@@ -32,7 +33,7 @@
}
-void *_hashtable_get(hashtable_t *hashtable, int key)
+static inline void *_hashtable_get(hashtable_t *hashtable, int key)
{
size_t code = hashcode(key);
tailq_entry_t *item;
@@ -54,7 +55,7 @@
}
-void * _hashtable_put(hashtable_t *hashtable, int key, void *value)
+static inline void * _hashtable_put(hashtable_t *hashtable, int key, void *value)
{
size_t code = hashcode(key);
void *oldvalue;
@@ -187,8 +188,11 @@
SemUtil::dec(hashtable->wlock);
}
SemUtil::inc(hashtable->mutex);
+ // ================
void * res = _hashtable_get(hashtable, key);
+
+ // ==================
SemUtil::dec(hashtable->mutex);
hashtable->readcnt--;
@@ -204,6 +208,7 @@
void hashtable_put(hashtable_t *hashtable, int key, void *value) {
SemUtil::dec(hashtable->mutex);
+ // 璁剧疆璇讳紭鍏堢骇楂�
while (hashtable->readcnt > 0)
{
SemUtil::set(hashtable->cond, 0);
@@ -218,6 +223,7 @@
//鑾峰彇璇诲啓閿�
SemUtil::dec(hashtable->wlock);
+
_hashtable_put(hashtable, key, value);
//閲婃斁璇诲啓閿�
SemUtil::inc(hashtable->wlock);
@@ -225,7 +231,7 @@
-void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb) {
+static inline void _hashtable_foreach(hashtable_t *hashtable, std::function<void(int, void *)> cb) {
tailq_entry_t *item;
for (int i = 0; i < MAPSIZE; i++) {
tailq_header_t *my_tailq_head = hashtable->array[i] ;
@@ -240,18 +246,35 @@
}
}
-int hashtable_alloc_key(hashtable_t *hashtable) {
- int key = START_KEY;
- SemUtil::dec(hashtable->wlock);
- while(_hashtable_get(hashtable, key) != NULL) {
- key++;
- }
+void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb) {
+ SemUtil::dec(hashtable->mutex);
+ hashtable->readcnt++;
+ if (hashtable->readcnt == 1) {
+ //鑾峰彇璇诲啓閿�
+ SemUtil::dec(hashtable->wlock);
+ }
+ SemUtil::inc(hashtable->mutex);
- _hashtable_put(hashtable, key, (void *)1);
- SemUtil::inc(hashtable->wlock);
- return key;
+ // ==================
+
+ _hashtable_foreach(hashtable, cb);
+
+ // ==================
+
+ SemUtil::dec(hashtable->mutex);
+ hashtable->readcnt--;
+ if(hashtable->readcnt == 0) {
+ //閲婃斁璇诲啓閿�
+ SemUtil::inc(hashtable->wlock);
+ //閫氱煡鍐�
+ SemUtil::set(hashtable->cond, 1);
+ }
+ SemUtil::inc(hashtable->mutex);
+
}
+
+
std::set<int> * hashtable_keyset(hashtable_t *hashtable) {
std::set<int> *keyset = new std::set<int>;
@@ -271,3 +294,17 @@
}
+int hashtable_alloc_key(hashtable_t *hashtable) {
+ int key = START_KEY;
+ SemUtil::dec(hashtable->wlock);
+
+ while(_hashtable_get(hashtable, key) != NULL) {
+ key++;
+ }
+
+ _hashtable_put(hashtable, key, (void *)1);
+ SemUtil::inc(hashtable->wlock);
+ return key;
+}
+
+
diff --git a/src/queue/include/hashtable.h b/src/queue/include/hashtable.h
index 726a5bc..c1fba98 100755
--- a/src/queue/include/hashtable.h
+++ b/src/queue/include/hashtable.h
@@ -23,10 +23,17 @@
void *hashtable_remove(hashtable_t *hashtable, int key);
void hashtable_removeall(hashtable_t *hashtable);
-
+/**
+ * 閬嶅巻hash_table
+ * @demo
+ * hashtable_foreach(&hashtable, [&](int key, void * value){
+ * printf("%d, %p\n", key, value);
+ * });
+ *
+*/
void hashtable_foreach(hashtable_t *hashtable, hashtable_foreach_cb cb);
-void hashtable_printall(hashtable_t *hashtable);
+// void hashtable_printall(hashtable_t *hashtable);
int hashtable_alloc_key(hashtable_t *hashtable);
diff --git a/test/Makefile b/test/Makefile
index 4bcb663..ffc7b16 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,7 @@
include $(ROOT)/Make.defines.$(PLATFORM)
-PROGS = protocle_parse strtok test_set test_vector
+PROGS = protocle_parse strtok test_set test_vector lambda test
build: $(PROGS)
diff --git a/test/lambda.c b/test/lambda.c
new file mode 100644
index 0000000..b8c2fd4
--- /dev/null
+++ b/test/lambda.c
@@ -0,0 +1,19 @@
+#include "usg_common.h"
+#include "usg_typedef.h"
+#include "hashtable.h"
+#include "shm_mm.h"
+
+int main() {
+ shm_init(512);
+ hashtable_t hashtable;
+
+ hashtable_init(&hashtable);
+ for(int i = 0; i < 10; i++) {
+ hashtable_put(&hashtable, i, (void *)(i));
+ }
+
+ hashtable_foreach(&hashtable, [&](int key, void * value){
+ printf("%d, %p\n", key, value);
+ });
+ shm_destroy();
+}
\ No newline at end of file
diff --git a/test/protocle_parse b/test/protocle_parse
deleted file mode 100755
index e18682e..0000000
--- a/test/protocle_parse
+++ /dev/null
Binary files differ
diff --git a/test/strtok b/test/strtok
deleted file mode 100755
index df7f33e..0000000
--- a/test/strtok
+++ /dev/null
Binary files differ
diff --git a/test/test b/test/test
deleted file mode 100755
index 1c5c801..0000000
--- a/test/test
+++ /dev/null
Binary files differ
diff --git a/test/test.c b/test/test.c
index 744ac72..0aaa68e 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,12 +1,15 @@
#include "usg_common.h"
#include "usg_typedef.h"
-void test(char *src, int size) {
+int test(char *src, int size) {
+ int i = strlen(src);
char dest[size];
strncpy(dest, src, size);
puts(dest);
+ return i;
}
int main() {
char *str = "hello";
- test(str, strlen(str));
+ int r = test(str, strlen(str));
+ printf("%d\n", r);
}
\ No newline at end of file
diff --git a/test/test_set b/test/test_set
deleted file mode 100755
index c8b6db0..0000000
--- a/test/test_set
+++ /dev/null
Binary files differ
diff --git a/test/test_vector b/test/test_vector
deleted file mode 100755
index c308410..0000000
--- a/test/test_vector
+++ /dev/null
Binary files differ
diff --git a/test_socket/dgram_mod_bus b/test_socket/dgram_mod_bus
deleted file mode 100755
index b5eccd6..0000000
--- a/test_socket/dgram_mod_bus
+++ /dev/null
Binary files differ
diff --git a/test_socket/dgram_mod_req_rep b/test_socket/dgram_mod_req_rep
deleted file mode 100755
index 29f0599..0000000
--- a/test_socket/dgram_mod_req_rep
+++ /dev/null
Binary files differ
diff --git a/test_socket/dgram_mod_survey b/test_socket/dgram_mod_survey
deleted file mode 100755
index 48db086..0000000
--- a/test_socket/dgram_mod_survey
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0