header refactored

loong520 · Jun 19, 2015 · cec6a21 · cec6a21
1 parent a7beab1
commit cec6a21
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -23,27 +23,14 @@ MacOSX上使用kqueue
 
 [http://www.oschina.net/p/c11-handy](http://www.oschina.net/p/c11-handy)
 
-###支持半同步半异步处理
-
-异步管理网络I/O，同步处理请求，可以简化服务器处理逻辑的编写，示例参见examples/hsha.cc
-
-###openssl支持
-
-异步连接管理，支持openssl连接
-
-###protobuf支持
-
-使用protobuf的消息encode/decode示例在protobuf下
-
 ###简洁
 
 10行代码能够编写一个完整的服务器
 
 ###代码示例--echo-server
 
 ```c
-#include <handy/conn.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;
@@ -62,6 +49,30 @@ int main(int argc, const char* argv[]) {
 }
 ```
 
+###支持半同步半异步处理
+
+异步管理网络I/O，同步处理请求，可以简化服务器处理逻辑的编写，示例参见examples/hsha.cc
+
+###openssl支持
+
+异步连接管理，支持openssl连接
+
+###protobuf支持
+
+使用protobuf的消息encode/decode示例在protobuf下
+
+###支持半同步半异步处理
+
+异步管理网络I/O，同步处理请求，可以简化服务器处理逻辑的编写，示例参见examples/hsha.cc
+
+###openssl支持
+
+异步连接管理，支持openssl连接
+
+###protobuf支持
+
+使用protobuf的消息encode/decode示例在protobuf下
+
 ###安装与使用
 
 ```

diff --git a/examples/chat.cc b/examples/chat.cc
@@ -1,7 +1,4 @@
-#include <handy/conn.h>
-#include <handy/logging.h>
-#include <handy/daemon.h>
-#include <handy/codec.h>
+#include <handy/handy.h>
 #include <map>
 
 using namespace std;

diff --git a/examples/codec-cli.cc b/examples/codec-cli.cc
@@ -1,7 +1,4 @@
-#include <handy/conn.h>
-#include <handy/logging.h>
-#include <handy/daemon.h>
-#include <handy/codec.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/codec-svr.cc b/examples/codec-svr.cc
@@ -1,5 +1,4 @@
-#include <handy/conn.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/daemon.cc b/examples/daemon.cc
@@ -1,6 +1,4 @@
-#include <handy/conn.h>
-#include <handy/conf.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/echo.cc b/examples/echo.cc
@@ -1,5 +1,4 @@
-#include <handy/conn.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/hsha.cc b/examples/hsha.cc
@@ -1,5 +1,4 @@
-#include <handy/conn.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/http-echo.cc b/examples/http-echo.cc
@@ -1,5 +1,4 @@
-#include <handy/http.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/stat.cc b/examples/stat.cc
@@ -1,5 +1,4 @@
-#include <handy/http.h>
-#include <handy/daemon.h>
+#include <handy/handy.h>
 #include <handy/stat-svr.h>
 
 using namespace std;

diff --git a/examples/write-on-empty.cc b/examples/write-on-empty.cc
@@ -1,6 +1,4 @@
-#include <handy/conn.h>
-#include <handy/daemon.h>
-#include <thread>
+#include <handy/handy.h>
 
 using namespace std;
 using namespace handy;

diff --git a/handy/conn.h b/handy/conn.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "handy.h"
+#include "event_base.h"
 
 namespace handy {
 

diff --git a/handy/handy.cc → handy/event_base.cc b/handy/handy.cc → handy/event_base.cc
@@ -1,4 +1,4 @@
-#include "handy.h"
+#include "event_base.h"
 #include "logging.h"
 #include "util.h"
 #include <map>

diff --git a/handy/handy.h → handy/event_base.h b/handy/handy.h → handy/event_base.h
diff --git a/handy/poller.cc b/handy/poller.cc
@@ -1,4 +1,4 @@
-#include "handy.h"
+#include "event_base.h"
 #include "logging.h"
 #include "util.h"
 #include <map>

diff --git a/handy/stat-svr.h b/handy/stat-svr.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "slice.h"
-#include "handy.h"
+#include "event_base.h"
 #include "http.h"
 #include <map>
 #include <functional>