From 73c4fa813ca5dba5724b2de2102f314d52baccd6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 30 七月 2020 10:06:31 +0800
Subject: [PATCH] fix conflict
---
src/queue/shm_mm.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/queue/shm_mm.c b/src/queue/shm_mm.c
index 8b43316..c5009a9 100644
--- a/src/queue/shm_mm.c
+++ b/src/queue/shm_mm.c
@@ -1,5 +1,6 @@
#include "shm_mm.h"
#include "mem_pool.h"
+#include "hashtable.h"
void shm_init(int size) {
mem_pool_init(size);
@@ -9,4 +10,7 @@
mem_pool_destroy();
}
-
+int shm_alloc_key() {
+ hashtable_t *hashtable = mm_get_hashtable();
+ return hashtable_alloc_key(hashtable);
+}
--
Gitblit v1.8.0