no message

Author: 朱胜

CMakeLists.txt

@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(coroutine CXX)
+PROJECT(coroutine CXX C)
 
 set(SRC_ROOT ${PROJECT_SOURCE_DIR}/src)
 
@@ -9,12 +9,17 @@ include(halo)
 add_definitions(-D_XOPEN_SOURCE=1)
 add_definitions(-DGTEST_HAS_PTHREAD=1)
 
-add_pkg(libuv uv)
+#add_pkg(libuv uv)
 
 add_incs(src)
 add_objs(couv src/couv/*.cpp src/log/*.cpp)
+set(LIB_OBJS ${LIB_OBJS} ${couv_OBJS})
 
-build_exe(hello src/examples/hello.cpp ${couv_OBJS})
-build_exe(lock src/examples/lock.cpp ${couv_OBJS})
-build_exe(sem src/examples/sem.cpp ${couv_OBJS})
-build_exe(echo src/examples/echo.cpp ${couv_OBJS})
+add_subdirectory(${PROJECT_SOURCE_DIR}/deps/libuv-v1.6.1)
+
+message("objs ${LIB_OBJS}")
+
+build_exe(hello src/examples/hello.cpp)
+build_exe(lock src/examples/lock.cpp)
+build_exe(sem src/examples/sem.cpp)
+build_exe(echo src/examples/echo.cpp)

cmake/halo.cmake

@@ -71,7 +71,7 @@ macro(add_cxx_flags)
 
     if(${tools_len} EQUAL 0 OR ${is_tool_match} GREATER -1)
     	if(${build_len} EQUAL 0)
-    		message("list(APPEND CMAKE_CXX_FLAGS ${flags})")
+    		#message("list(APPEND CMAKE_CXX_FLAGS ${flags})")
     		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags}")
     	else()
     		foreach(b ${build})
@@ -99,31 +99,28 @@ endmacro()
 ##################################################
 ### add_objs base src/base/*.cpp
 macro(add_objs name expr)
+	include_directories(${LIB_INCS})
     file(GLOB ${name}_SRCS ${expr} ${ARGN})
     add_library(${name} OBJECT ${${name}_SRCS})
-    set(${name}_OBJS $<TARGET_OBJECTS:${name}>) 
+    set(${name}_OBJS $<TARGET_OBJECTS:${name}>)
 endmacro()
 
 ##################################################
 ### add_incs
 macro(add_incs)
-	list(APPEND LIB_INCS ${ARGN})
+	set(LIB_INCS ${LIB_INCS} ${ARGN})
 endmacro()
 
 ##################################################
 ### add_libs
 macro(add_libs)
-	list(APPEND LIB_LIBS ${ARGN})
+	set(LIB_LIBS ${LIB_LIBS} ${ARGN})
 endmacro()
 
 ##################################################
 ### add_static_libs
-macro(add_libs)
-	list(APPEND LIB_LIBS ${ARGN})
-endmacro()
-
 macro(add_static_libs)
-	list(APPEND LIB_STATIC ${ARGN})
+	set(LIB_STATIC ${LIB_STATIC} ${ARGN})
 endmacro()
 
 # pthread
@@ -150,7 +147,7 @@ endmacro()
 
 macro(build_exe exe)
 	begin_build(${exe})
-	add_executable(${exe} ${ARGN})
+	add_executable(${exe} ${ARGN} ${LIB_OBJS})
 	end_build(${exe})
 endmacro()
 ##################################################
@@ -193,15 +190,18 @@ set(LIB_STATIC c m z rt dl)
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-sign-compare -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
 # c++11
 add_flags(-std=c++11 -std=c++0x)
 add_flags(-Wno-unused-const-variable)
 add_flags(-Wno-unused-but-set-variable)
 add_flags(-Wno-unused-private-field)
-add_flags(-Wno-deprecated-declarations)
 add_flags(-Wno-unused-function)
+add_flags(-Wno-deprecated-declarations)
+add_flags(-Wno-sign-compare)
+add_flags(-Wno-deprecated)
+add_flags(-Wno-unused-parameter)
 
 add_cxx_flags(Clang -stdlib=libc++)
 

deps/libuv-v1.6.1/CMakeLists.txt

@@ -0,0 +1,36 @@
+add_incs(${CMAKE_CURRENT_SOURCE_DIR}/include)
+add_objs(uv
+  src/fs-poll.c
+  src/inet.c
+  src/threadpool.c
+  src/uv-common.c
+  src/version.c
+  src/unix/async.c
+  src/unix/core.c
+  src/unix/dl.c
+  src/unix/fs.c
+  src/unix/getaddrinfo.c
+  src/unix/getnameinfo.c
+  src/unix/loop-watcher.c
+  src/unix/loop.c
+  src/unix/pipe.c
+  src/unix/poll.c
+  src/unix/process.c
+  src/unix/signal.c
+  src/unix/stream.c
+  src/unix/tcp.c
+  src/unix/thread.c
+  src/unix/timer.c
+  src/unix/tty.c
+  src/unix/udp.c
+  src/unix/darwin.c
+  src/unix/darwin-proctitle.c
+  src/unix/fsevents.c
+  src/unix/kqueue.c
+  src/unix/proctitle.c
+)
+
+message("libuv ${uv_OBJS}}")
+
+set(LIB_INCS ${LIB_INCS} ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
+set(LIB_OBJS ${LIB_OBJS} ${uv_OBJS} PARENT_SCOPE)

src/couv/channel.h

@@ -38,8 +38,8 @@ class channel
         if(m_closed)
             return;
 
-        m_sem.signal();
         m_queue.push_back(t);
+        m_sem.signal();
     }
 
     void receive(T& t) {

src/couv/scheduler.cpp

@@ -15,11 +15,13 @@ namespace couv
 //scheduler_t* current_scheduler = &local_scheduler;
 scheduler_t* current_scheduler = nullptr;
 
-scheduler_t::scheduler_t()
+scheduler_t::scheduler_t(bool install)
 {
     m_root = std::make_shared<coroutine_base>();
     m_current = m_root;
-    current_scheduler = this;
+    if(install) {
+        current_scheduler = this;
+    }
 }
 
 scheduler_t::~scheduler_t()

src/couv/scheduler.h

@@ -23,6 +23,8 @@
 
 #define resume couv::current_scheduler->resume
 
+#define go (*couv::current_scheduler)<<[&]
+
 namespace couv
 {
 
@@ -32,7 +34,7 @@ namespace couv
 class scheduler_t: public delegate_t
 {
 public:
-    scheduler_t();
+    scheduler_t(bool install=true);
     virtual ~scheduler_t();
     virtual void run();
 
@@ -45,6 +47,11 @@ class scheduler_t: public delegate_t
 
     void set_current(coroutine_ptr r) { m_current = r; }
     coroutine_ptr current(){ return m_current; }
+    
+    scheduler_t& operator<<(coroutine_base::func_type&& f){
+        add(std::move(f));
+        return *this;
+    }
 
 protected:
     void resume_coroutine(coroutine_ptr r);