From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 20 七月 2021 20:20:44 +0800
Subject: [PATCH] 调整Request C.BHFree的位置
---
utest/util.h | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/utest/util.h b/utest/util.h
index 28b636e..53f747f 100644
--- a/utest/util.h
+++ b/utest/util.h
@@ -20,8 +20,8 @@
#define UTIL_W8A0OA5U
#include "bh_util.h"
+#include "shm.h"
#include "topic_node.h"
-#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/noncopyable.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/timer/timer.hpp>
@@ -33,10 +33,17 @@
#include <thread>
#include <vector>
-using namespace boost::posix_time;
-inline ptime Now() { return second_clock::universal_time(); };
-
using namespace std::chrono_literals;
+using namespace std::chrono;
+
+template <class D>
+inline void Sleep(D d, bool print = true)
+{
+ if (print) {
+ printf("sleep for %ld ms\n", std::chrono::duration_cast<std::chrono::milliseconds>(d).count());
+ }
+ std::this_thread::sleep_for(d);
+}
typedef std::function<void(void)> FuncVV;
@@ -56,7 +63,7 @@
public:
~ThreadManager() { WaitAll(); }
template <class T, class... P>
- void Launch(T t, P... p) { threads_.emplace_back(t, p...); }
+ void Launch(T &&t, P &&...p) { threads_.emplace_back(std::forward<decltype(t)>(t), std::forward<decltype(p)>(p)...); }
void WaitAll()
{
for (auto &t : threads_) {
@@ -114,14 +121,16 @@
TopicNode(shm), id_(id) { Init(); }
void Init()
{
- MsgRegister reg;
- reg.mutable_proc()->set_proc_id(id_);
+ ProcInfo proc;
+ proc.set_proc_id(id_);
MsgCommonReply reply_body;
- if (!Register(reg, reply_body, 1000)) {
+ if (!Register(proc, reply_body, 1000)) {
printf("node %s register failed\n", id_.c_str());
}
}
};
+bhome_shm::SharedMemory &TestShm();
+
#endif // end of include guard: UTIL_W8A0OA5U
--
Gitblit v1.8.0