From f85c9b875b060681b51f57b15074ba1c7c9f5636 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 20 七月 2020 11:10:02 +0800
Subject: [PATCH] update

---
 queue/include/shm_queue_wrapper.h |   58 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/queue/include/shm_queue_wrapper.h b/queue/include/shm_queue_wrapper.h
index 1ceac9d..33ed54f 100644
--- a/queue/include/shm_queue_wrapper.h
+++ b/queue/include/shm_queue_wrapper.h
@@ -12,63 +12,87 @@
 
  
 
+//绉婚櫎涓嶅寘鍚湪keys涓殑闃熷垪
+void shm_remove_queues_exclue(void *keys, int length);
 /**
- * 鍒濆鍖�
+ * 鍒涘缓闃熷垪
  * @ shmqueue 
- * @ key 鏍囪瘑鍏变韩闃熷垪鐨勫敮涓�key
+ * @ key 鏍囪瘑鍏变韩闃熷垪鐨勫敮涓�鏍囪瘑, key鏄竴涓寚閽堥噷闈㈠瓨鍌ㄤ簡key鐨勫�硷紝 濡傛灉key鐨勫�间负-1绯荤粺浼氳嚜鍔ㄥ垎閰嶄竴涓猭ey鍊煎苟鎶婅key鐨勫�艰祴缁檏ey鎸囬拡銆傚鏋渒ey鐨勫�间笉浼氱┖浼氭鏌ユ槸鍚︽湁閲嶅缁戝畾鐨勬儏鍐�, 鏈夐噸澶嶅氨鎶ラ敊娌℃湁灏卞垱寤洪槦鍒楀苟缁戝畾key.
  * @ queue_size 闃熷垪澶у皬
- * @ ele_size 闃熷垪涓厓绱犲ぇ灏�
  */
-void* shmqueue_init(int key, int queue_size, int ele_size);
+void* shmqueue_create( int * key, int queue_size);
+
+/**
+ * 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼�傚鏋滄病鏈夊搴旀寚瀹歬ey鐨勯槦鍒楁彁绀洪敊璇苟閫�鍑�
+ */
+void* shmqueue_attach(int key) ;
+
 /**
  * 閿�姣�
 */
-void shmqueue_destroy(void *shmqueue);
+void shmqueue_drop(void * _shmqueue);
+
 /**
  * 闃熷垪鍏冪礌鐨勪釜鏁�
  */
-uint32_t shmqueue_size(void *shmqueue);
+int shmqueue_size(void * _shmqueue) ;
+
 /**
  * 鏄惁宸叉弧
+ * @return 1鏄紝 0鍚�
  */
-int shmqueue_full(void *shmqueue);
+int shmqueue_full(void * _shmqueue);
 
 /**
  * 鏄惁涓虹┖
+ * @return 1鏄紝 0鍚�
  */
-int shmqueue_empty(void *shmqueue);
+int shmqueue_empty(void * _shmqueue) ;
 
 /**
- * 鍏ラ槦, 闃熷垪婊℃椂绛夊緟
+ * 鍏ラ槦, 闃熷垪婊℃椂绛夊緟.
+ * @return 1 鍏ラ槦鎴愬姛, 0 鍏ラ槦澶辫触
  */
-int shmqueue_push(void *shmqueue, void *src_ele);
+int shmqueue_push(void * _shmqueue, void *src, int size);
 
 /**
- * 鍏ラ槦, 闃熷垪婊℃椂绔嬪嵆杩斿洖
+ * 鍏ラ槦, 闃熷垪婊℃椂绔嬪嵆杩斿洖.
+ * @return 1 鍏ラ槦鎴愬姛, 0 鍏ラ槦澶辫触
  */
-int shmqueue_push_nowait(void *shmqueue, void *src_ele);
+int shmqueue_push_nowait(void * _shmqueue, void *src, int size) ;
 
 /**
  * 鍏ラ槦, 鎸囧畾鏃堕棿鍐呭叆闃熶笉鎴愬姛灏辫繑鍥�
+ * @sec 绉�
+ * @nsec 绾崇
+ * @return 1 鍏ラ槦鎴愬姛, 0 鍏ラ槦澶辫触
  */
-int shmqueue_push_timeout(void *shmqueue, void *src_ele, struct timespec * timeout);
+int shmqueue_push_timeout(void * _shmqueue, void *src, int size,  int sec, int nsec) ;
 
 /**
  * 鍑洪槦, 闃熷垪绌烘椂绛夊緟
+ * @return 1 鍑洪槦鎴愬姛锛� 0鍑洪槦澶辫触
  */
-int shmqueue_pop(void *shmqueue, void *dest_ele);
+int shmqueue_pop(void * _shmqueue, void **dest, int *size);
 
 /**
  * 鍑洪槦, 闃熷垪绌烘椂绔嬪嵆杩斿洖
+ * @return 1 鍑洪槦鎴愬姛锛� 0鍑洪槦澶辫触
  */
-int shmqueue_pop_nowait(void *shmqueue, void *dest_ele);
+int shmqueue_pop_nowait(void * _shmqueue, void **dest, int *size) ;
 
 /**
  * 鍑洪槦, 鎸囧畾鏃堕棿鍐呭嚭闃熶笉鎴愬姛灏辫繑鍥�
+ * @sec绉�
+ * @nsec绾崇
+ * @return 1 鍑洪槦鎴愬姛锛� 0鍑洪槦澶辫触
  */
-int shmqueue_pop_timeout(void *shmqueue, void *dest_ele, struct timespec * timeout);
+int shmqueue_pop_timeout(void * _shmqueue, void **dest, int *size, int sec, int nsec);
 
-
+/**
+ * 閲婃斁鍑洪槦鍒嗛厤鐨勫唴瀛�
+ */
+void shmqueue_free(void *ptr);
 
 #ifdef __cplusplus
 }

--
Gitblit v1.8.0