channel refactor

Author: matyhtf

core-tests/src/coroutine/channel.cpp

@@ -1,5 +1,8 @@
 #include "tests.h"
-#include "channel.h"
+
+#include "coroutine_channel.h"
+
+using swoole::coroutine::Channel;
 
 using namespace swoole;
 using namespace std;

include/channel.h include/coroutine_channel.h

@@ -10,8 +10,8 @@
 #include <list>
 #include <queue>
 
-namespace swoole
-{
+namespace swoole { namespace coroutine {
+//-------------------------------------------------------------------------------
 class Channel
 {
 public:
@@ -124,4 +124,5 @@ class Channel
         return co;
     }
 };
-};
+//-------------------------------------------------------------------------------
+}}

src/coroutine/channel.cc

@@ -14,7 +14,9 @@
   +----------------------------------------------------------------------+
 */
 
-#include "channel.h"
+#include "coroutine_channel.h"
+
+using swoole::coroutine::Channel;
 
 #include <unordered_map>
 

swoole_channel_coro.cc

@@ -17,13 +17,11 @@
  +----------------------------------------------------------------------+
  */
 
-#include "php_swoole.h"
+#include "php_swoole_cxx.h"
 
-#ifdef SW_COROUTINE
-#include "swoole_coroutine.h"
-#include "channel.h"
+#include "coroutine_channel.h"
 
-using namespace swoole;
+using swoole::coroutine::Channel;
 
 static zend_class_entry *swoole_channel_coro_ce;
 static zend_object_handlers swoole_channel_coro_handlers;
@@ -257,4 +255,3 @@ static PHP_METHOD(swoole_channel_coro, stats)
     add_assoc_long_ex(return_value, ZEND_STRL("queue_num"), chan->length());
 }
 
-#endif