From c338820e4db43ad32c20ff429a038b06bcb980f8 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 08 四月 2021 18:13:25 +0800
Subject: [PATCH] BIG change, join center,bus; now msg is head+body.

---
 src/pubsub.h |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/pubsub.h b/src/pubsub.h
index 3c3d4ad..bd60fcd 100644
--- a/src/pubsub.h
+++ b/src/pubsub.h
@@ -33,11 +33,7 @@
 	    shm_(shm) {}
 	SocketPublish() :
 	    SocketPublish(BHomeShm()) {}
-	bool Publish(const Topic &topic, const void *data, const size_t size, const int timeout_ms);
-	bool Publish(const Topic &topic, const std::string &data, const int timeout_ms)
-	{
-		return Publish(topic, data.data(), data.size(), timeout_ms);
-	}
+	bool Publish(const std::string &proc_id, const Topic &topic, const void *data, const size_t size, const int timeout_ms);
 };
 
 // socket subscribe
@@ -52,11 +48,11 @@
 	    SocketSubscribe(BHomeShm()) {}
 	~SocketSubscribe() { Stop(); }
 
-	typedef std::function<void(const Topic &topic, const std::string &data)> TopicDataCB;
+	typedef std::function<void(const std::string &proc_id, const Topic &topic, const std::string &data)> TopicDataCB;
 	bool StartRecv(const TopicDataCB &tdcb, int nworker = 2);
 	bool Stop() { return Socket::Stop(); }
-	bool Subscribe(const std::vector<Topic> &topics, const int timeout_ms);
-	bool RecvSub(Topic &topic, std::string &data, const int timeout_ms);
+	bool Subscribe(const std::string &proc_id, const std::vector<Topic> &topics, const int timeout_ms);
+	bool RecvSub(std::string &proc_id, Topic &topic, std::string &data, const int timeout_ms);
 };
 
 #endif // end of include guard: PUBSUB_4KGRA997

--
Gitblit v1.8.0