From 9243710ca372de26823c2225c7b46b072458c671 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 28 五月 2021 17:18:33 +0800
Subject: [PATCH] tcp proxy requests, need more test.

---
 src/shm_msg_queue.h |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/shm_msg_queue.h b/src/shm_msg_queue.h
index eead739..6d922aa 100644
--- a/src/shm_msg_queue.h
+++ b/src/shm_msg_queue.h
@@ -18,6 +18,7 @@
 #ifndef SHM_MSG_QUEUE_D847TQXH
 #define SHM_MSG_QUEUE_D847TQXH
 
+#include "defs.h"
 #include "msg.h"
 #include "shm_queue.h"
 
@@ -26,7 +27,7 @@
 
 #define BH_USE_ATOMIC_Q
 
-class ShmMsgQueue : public StaticDataRef<std::atomic<uint64_t>, ShmMsgQueue>
+class ShmMsgQueue
 {
 public:
 	typedef int64_t RawData;
@@ -44,8 +45,6 @@
 	typedef Shmq::Data Queue;
 	typedef Shmq::ShmType ShmType;
 	typedef uint64_t MQId;
-
-	static MQId NewId();
 
 	ShmMsgQueue(ShmType &segment, const MQId id, const int len);
 	ShmMsgQueue(ShmType &segment, const bool create_or_else_find, const MQId id, const int len);
@@ -75,8 +74,8 @@
 	bool Recv(MsgI &msg, const int timeout_ms) { return Recv(msg.OffsetRef(), timeout_ms); }
 	bool TryRecv(MsgI &msg) { return TryRecv(msg.OffsetRef()); }
 	static Queue *Find(ShmType &shm, const MQId remote);
-	static bool TrySend(ShmType &shm, const MQId remote, const RawData val);
-	bool TrySend(const MQId remote, const RawData val) { return TrySend(shm(), remote, val); }
+	static bool TrySend(ShmType &shm, const MQInfo &remote, const RawData val);
+	bool TrySend(const MQInfo &remote, const RawData val) { return TrySend(shm(), remote, val); }
 
 private:
 #ifndef BH_USE_ATOMIC_Q

--
Gitblit v1.8.0