From 7545e170846486744bd34f13ca358b9d25413ff5 Mon Sep 17 00:00:00 2001
From: mutouyun <orz@orzz.org>
Date: Sun, 20 Sep 2020 12:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/msg_que/main.cpp              | 14 +++++++-------
 include/libipc/ipc.h               |  8 ++++----
 src/libipc/platform/waiter_linux.h |  1 -
 src/libipc/platform/waiter_win.h   |  1 -
 test/test_ipc.cpp                  |  4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/demo/msg_que/main.cpp b/demo/msg_que/main.cpp
index 7c4a8c5..365ad51 100644
--- a/demo/msg_que/main.cpp
+++ b/demo/msg_que/main.cpp
@@ -1,19 +1,19 @@
 #include <iostream>
 #include <string>
-#include <thread>
-#include <regex>
-#include <atomic>
 
 #include "libipc/ipc.h"
 
 namespace {
 
-constexpr char const name__[] = "ipc-msg-que";
-constexpr char const quit__[] = "q";
-constexpr char const id__  [] = "c";
+constexpr char const name__[]   = "ipc-msg-que";
+constexpr char const mode_s__[] = "s";
+constexpr char const mode_r__[] = "r";
+
+using msg_que_t = ipc::chan<ipc::relat::single, ipc::relat::single, ipc::trans::unicast>;
 
 } // namespace
 
-int main() {
+int main(int argc, char ** argv) {
+    if (argc < 2) return 0;
     return 0;
 }
diff --git a/include/libipc/ipc.h b/include/libipc/ipc.h
index 4f7dcd3..37f3c7e 100755
--- a/include/libipc/ipc.h
+++ b/include/libipc/ipc.h
@@ -140,8 +140,8 @@ public:
     }
 };
 
-template <typename Flag>
-using chan = chan_wrapper<Flag>;
+template <relat Rp, relat Rc, trans Ts>
+using chan = chan_wrapper<ipc::wr<Rp, Rc, Ts>>;
 
 /*
  * class route
@@ -154,7 +154,7 @@ using chan = chan_wrapper<Flag>;
  * (one producer/writer to multi consumers/readers)
 */
 
-using route = chan<ipc::wr<relat::single, relat::multi, trans::broadcast>>;
+using route = chan<relat::single, relat::multi, trans::broadcast>;
 
 /*
  * class channel
@@ -164,6 +164,6 @@ using route = chan<ipc::wr<relat::single, relat::multi, trans::broadcast>>;
  * would receive your sent messages.
 */
 
-using channel = chan<ipc::wr<relat::multi, relat::multi, trans::broadcast>>;
+using channel = chan<relat::multi, relat::multi, trans::broadcast>;
 
 } // namespace ipc
diff --git a/src/libipc/platform/waiter_linux.h b/src/libipc/platform/waiter_linux.h
index 58a6363..25bed4f 100755
--- a/src/libipc/platform/waiter_linux.h
+++ b/src/libipc/platform/waiter_linux.h
@@ -16,7 +16,6 @@
 #include "libipc/waiter_helper.h"
 
 #include "libipc/utility/log.h"
-#include "libipc/utility/scope_guard.h"
 #include "libipc/platform/detail.h"
 #include "libipc/memory/resource.h"
 
diff --git a/src/libipc/platform/waiter_win.h b/src/libipc/platform/waiter_win.h
index 05e318f..4f3d080 100755
--- a/src/libipc/platform/waiter_win.h
+++ b/src/libipc/platform/waiter_win.h
@@ -13,7 +13,6 @@
 #include "libipc/waiter_helper.h"
 
 #include "libipc/utility/log.h"
-#include "libipc/utility/scope_guard.h"
 #include "libipc/platform/to_tchar.h"
 #include "libipc/platform/get_sa.h"
 #include "libipc/platform/detail.h"
diff --git a/test/test_ipc.cpp b/test/test_ipc.cpp
index 6221802..faae13c 100755
--- a/test/test_ipc.cpp
+++ b/test/test_ipc.cpp
@@ -52,7 +52,7 @@ public:
 
 template <relat Rp, relat Rc, trans Ts>
 void test_basic(char const * name) {
-    using que_t = chan<wr<Rp, Rc, Ts>>;
+    using que_t = chan<Rp, Rc, Ts>;
     rand_buf test1, test2;
 
     que_t que1 { name };
@@ -69,7 +69,7 @@ void test_basic(char const * name) {
 
 template <relat Rp, relat Rc, trans Ts>
 void test_sr(char const * name, int size, int s_cnt, int r_cnt) {
-    using que_t = chan<wr<Rp, Rc, Ts>>;
+    using que_t = chan<Rp, Rc, Ts>;
 
     ipc_ut::sender().start(static_cast<std::size_t>(s_cnt));
     ipc_ut::reader().start(static_cast<std::size_t>(r_cnt));