change header file pos.

base/Any.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_BASE_CANY
 #define HEADER_BASE_CANY
 
-#include <algorithm>
 #include <typeinfo>
+#include <algorithm>
 
 namespace base {
     class CAny {

base/Buffer.h

@@ -1,9 +1,9 @@
 #ifndef HEADER_BASE_BUFFER
 #define HEADER_BASE_BUFFER
 
+#include <mutex>
 #include <memory>
 #include <vector>
-#include <mutex>
 
 namespace base {
 

base/Config.cpp

@@ -1,7 +1,8 @@
-#include "Config.h"
-#include "Log.h"
 #include <fstream>
 
+#include "Log.h"
+#include "Config.h"
+
 using namespace base;
 
 void CConfig::SetFilePath(const std::string& path) {

base/Config.h

@@ -1,9 +1,9 @@
 #ifndef HEADER_BASE_CONFIG
 #define HEADER_BASE_CONFIG
 
-#include <string>
 #include <map>
 #include <mutex>
+#include <string>
 
 namespace base {
 

base/Log.h

@@ -4,10 +4,10 @@
 #include <fstream>
 #include <stdarg.h>
 
-#include "RunnableAloneTaskList.h"
-#include "MemoryPool.h"
-#include "TimeTool.h"
 #include "Single.h"
+#include "TimeTool.h"
+#include "MemoryPool.h"
+#include "RunnableAloneTaskList.h"
 
 namespace base {
 

base/LoopBuffer.cpp

@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <iostream>
+#include <algorithm>
 
 #include "LoopBuffer.h"
 #include "MemoryPool.h"

base/LoopBuffer.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_BASE_LOOPBUFFER
 #define HEADER_BASE_LOOPBUFFER
 
-#include <memory>
 #include <mutex>
+#include <memory>
 
 namespace base {
 

base/MemoryPool.h

@@ -2,13 +2,13 @@
 #define HEADER_BASE_MMEMORYPOOL
 
 #include <new>
-#include <functional>
-#include <thread>
-#include <mutex>
-#include <vector>
 #include <map>
+#include <mutex>
+#include <thread>
+#include <vector>
 #include <cstring>        //for memset
 #include <stdexcept>      //for logic_error
+#include <functional>
 
 #include "BlockMemoryPool.h"
 

base/PoolSharedPtr.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_BASE_CPOOLSHAREDPTR
 #define HEADER_BASE_CPOOLSHAREDPTR
 #include <atomic>
-#include <functional>
 #include <stddef.h>
+#include <functional>
 
 #include "MemoryPool.h"
 

base/Runnable.h

@@ -3,8 +3,8 @@
 
 #include <thread>     // about thread
 #include <atomic>     // for atomic_bool
-#include <functional> // for bind
 #include <memory>     // for shared_ptr
+#include <functional> // for bind
 
 namespace base {
     class CRunnable

base/RunnableAloneTaskListWithPost.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_BASE_RUNNABLEALONETASKLISTWITHPOST
 #define HEADER_BASE_RUNNABLEALONETASKLISTWITHPOST
 
-#include <mutex>
 #include <map>
+#include <mutex>
 
 #include "Runnable.h"
 #include "TaskQueue.h"

base/RunnableShareTaskList.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_BASE_RUNNABLESHARETASKLIST
 #define HEADER_BASE_RUNNABLESHARETASKLIST
 
-#include <mutex>
 #include <map>
+#include <mutex>
 
 #include "TaskQueue.h"
 

base/Single.h

@@ -1,5 +1,6 @@
 #ifndef HEADER_BASE_SINGLE
 #define HEADER_BASE_SINGLE
+
 #include <mutex>
 
 namespace base {

base/TimeTool.h

@@ -2,6 +2,7 @@
 #define HEADER_BASE_TIMETOOL
 
 #include <mutex>
+
 namespace base {
 
     class CMemoryPool;

include/CppNet.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_INCLUDE_CPPNET
 #define HEADER_INCLUDE_CPPNET
 
-#include "CppDefine.h"
 #include "Socket.h"
+#include "CppDefine.h"
 
 namespace cppnet {
 

net/AcceptSocket.h

@@ -3,9 +3,10 @@
 #include <string>
 #include <memory>
 #include <functional>
+
 #include "Buffer.h"
-#include "PoolSharedPtr.h"
 #include "SocketBase.h"
+#include "PoolSharedPtr.h"
 
 namespace cppnet {
     class CAcceptEventHandler;

net/CNConfig.h

@@ -1,8 +1,8 @@
 #ifndef HEADER_NET_CNCONFIGE
 #define HEADER_NET_CNCONFIGE
 
-#include "Type.h"
 #include "Log.h"
+#include "Type.h"
 
 namespace cppnet {
 

net/CppNet.cpp

@@ -1,12 +1,12 @@
-#include "CppNet.h"
-#include "PoolSharedPtr.h"
-#include "EventHandler.h"
-#include "MemoryPool.h"
-#include "Timer.h"
-#include "CppNetImpl.h"
 #include "Log.h"
+#include "Timer.h"
+#include "CppNet.h"
 #include "CNConfig.h"
+#include "MemoryPool.h"
+#include "CppNetImpl.h"
 #include "NetManager.h"
+#include "EventHandler.h"
+#include "PoolSharedPtr.h"
 
 int32_t cppnet::Init(int32_t thread_num) {
     if (__open_log) {

net/CppNetImpl.cpp

@@ -3,15 +3,16 @@
 #include <sys/socket.h>
 #endif
 
-#include "CppNetImpl.h"
-#include "EventActions.h"
-#include "OSInfo.h"
 #include "Log.h"
+#include "OSInfo.h"
 #include "Runnable.h"
-#include "SocketImpl.h"
 #include "CNConfig.h"
 #include "NetHandle.h"
+#include "SocketImpl.h"
+#include "CppNetImpl.h"
+#include "EventActions.h"
 #include "CallBackHandle.h"
+
 #ifdef __linux__
 #include "CEpoll.h"
 #include "LinuxFunc.h"

net/CppNetImpl.h

@@ -1,16 +1,16 @@
 #ifndef HEADER_NET_CPPNETIMPL
 #define HEADER_NET_CPPNETIMPL
 
-#include <unordered_map>
-#include <thread>
 #include <mutex>
 #include <string>
+#include <thread>
+#include <unordered_map>
 
-#include "PoolSharedPtr.h"
-#include "EventHandler.h"
-#include "MemoryPool.h"
 #include "Timer.h"
 #include "CppDefine.h"
+#include "MemoryPool.h"
+#include "EventHandler.h"
+#include "PoolSharedPtr.h"
 
 namespace cppnet {
 

net/EventHandler.h

@@ -3,10 +3,11 @@
 
 #include <memory>
 #include <atomic>
-#include "PoolSharedPtr.h"
-#include "AcceptSocket.h"
-#include "SocketImpl.h"
+
 #include "CppDefine.h"
+#include "SocketImpl.h"
+#include "AcceptSocket.h"
+#include "PoolSharedPtr.h"
 
 #define INVALID_TIMER   -1
 

net/NetHandle.h

@@ -1,6 +1,8 @@
 #ifndef HEADER_NET_NETHANDLE
 #define HEADER_NET_NETHANDLE
 
+#include <utility>
+#include <cstdint>
 #include "Type.h"
 
 namespace cppnet {

net/NetManager.cpp

@@ -1,6 +1,6 @@
+#include "NetHandle.h"
 #include "NetManager.h"
 #include "CppNetImpl.h"
-#include "NetHandle.h"
 
 using namespace cppnet;
 

net/NetManager.h

@@ -1,8 +1,9 @@
 #ifndef HEADER_NET_CPPNETMANAGER
 #define HEADER_NET_CPPNETMANAGER
 
-#include <unordered_map>
 #include <memory>
+#include <unordered_map>
+
 #include "Single.h"
 #include "CppDefine.h"
 #include "PoolSharedPtr.h"

net/OSInfo.cpp

@@ -1,10 +1,9 @@
-#include "OSInfo.h"
-
 #ifdef __linux__
 #include <unistd.h>
 #else 
 #include <sysinfoapi.h>
 #endif
+#include "OSInfo.h"
 
 uint32_t cppnet::GetCpuNum() {
     unsigned count = 1;

net/SocketImpl.h

@@ -3,12 +3,12 @@
 
 #include <string>
 #include <memory>
-#include <functional>
 #include <atomic>
+#include <functional>
 
-#include "PoolSharedPtr.h"
-#include "SocketBase.h"
 #include "Socket.h"
+#include "SocketBase.h"
+#include "PoolSharedPtr.h"
 
 namespace cppnet {
     class CEventHandler;

net/Timer.cpp

@@ -1,6 +1,6 @@
+#include "Log.h"
 #include "Timer.h"
 #include "EventHandler.h"
-#include "Log.h"
 
 using namespace cppnet;
 

net/Timer.h

@@ -4,10 +4,10 @@
 #include <map>
 #include <vector>
 
-#include "TimeTool.h"
-#include "Single.h"
-#include "EventHandler.h"
 #include "Buffer.h"
+#include "Single.h"
+#include "TimeTool.h"
+#include "EventHandler.h"
 #include "PoolSharedPtr.h"
 
 namespace cppnet {

net/linux/AcceptSocket.cpp

@@ -1,18 +1,18 @@
 #ifdef __linux__
+#include <unistd.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/epoll.h>
 #include <arpa/inet.h>
-#include <unistd.h>
+#include <sys/socket.h>
 
-#include "EventHandler.h"
-#include "Buffer.h"
 #include "Log.h"
-#include "EventActions.h"
-#include "AcceptSocket.h"
 #include "Socket.h"
+#include "Buffer.h"
 #include "LinuxFunc.h"
 #include "CppNetImpl.h"
+#include "EventHandler.h"
+#include "EventActions.h"
+#include "AcceptSocket.h"
 #include "CallBackHandle.h"
 
 using namespace cppnet;

net/linux/CEpoll.cpp

@@ -1,17 +1,18 @@
 #ifdef __linux__
 #include <unistd.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
 #include <signal.h>
 #include <sys/poll.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+
+#include "Log.h"
+#include "Timer.h"
 #include "CEpoll.h"
 #include "OSInfo.h"
-#include "Log.h"
-#include "EventHandler.h"
 #include "Buffer.h"
 #include "Socket.h"
-#include "Timer.h"
 #include "LinuxFunc.h"
+#include "EventHandler.h"
 
 using namespace cppnet;
  

net/linux/CEpoll.h

@@ -2,6 +2,7 @@
 
 #ifndef HEADER_NET_LINUX_CEPOOL
 #define HEADER_NET_LINUX_CEPOOL
+
 #include <sys/epoll.h>
 #include "EventActions.h"
 

net/linux/LinuxFunc.cpp

@@ -1,7 +1,8 @@
 #ifdef __linux__
-#include <sys/socket.h>
 #include <fcntl.h>
+#include <sys/socket.h>
 #include <sys/resource.h>
+
 #include "LinuxFunc.h"
 
 #ifndef SO_REUSEPORT

net/linux/SocketBase.cpp

@@ -1,10 +1,12 @@
 #ifdef __linux__
-#include <sys/socket.h>
 #include <unistd.h>
-#include "SocketBase.h"
-#include "EventActions.h"
-#include "MemoryPool.h"
+#include <sys/socket.h>
+
 #include "CNConfig.h"
+#include "SocketBase.h"
+#include "MemoryPool.h"
+#include "EventActions.h"
+
 
 using namespace cppnet;
 

net/linux/SocketImpl.cpp

@@ -1,18 +1,18 @@
 #ifdef __linux__
-#include <sys/epoll.h>
-#include <sys/socket.h>
 #include <unistd.h>
 #include <sys/uio.h>
+#include <sys/epoll.h>
+#include <sys/socket.h>
 
-#include "EventHandler.h"
-#include "Buffer.h"
 #include "Log.h"
-#include "EventActions.h"
-#include "SocketImpl.h"
+#include "Buffer.h"
 #include "Runnable.h"
+#include "CNConfig.h"
 #include "LinuxFunc.h"
 #include "CppNetImpl.h"
-#include "CNConfig.h"
+#include "SocketImpl.h"
+#include "EventHandler.h"
+#include "EventActions.h"
 #include "CallBackHandle.h"
 
 using namespace cppnet;

net/win/AcceptSocket.cpp

@@ -1,12 +1,12 @@
 #ifndef __linux__
-#include "EventHandler.h"
-#include "Buffer.h"
-#include "WinExpendFunc.h"
 #include "Log.h"
 #include "IOCP.h"
+#include "Buffer.h"
+#include "CppNetImpl.h"
+#include "EventHandler.h"
 #include "EventActions.h"
 #include "AcceptSocket.h"
-#include "CppNetImpl.h"
+#include "WinExpendFunc.h"
 #include "CallBackHandle.h"
 
 using namespace cppnet;

net/win/IOCP.cpp

@@ -1,12 +1,12 @@
 #ifndef __linux__
-#include "IOCP.h"
 #include "Log.h"
-#include "OSInfo.h"
-#include "EventHandler.h"
-#include "Buffer.h"
-#include "WinExpendFunc.h"
+#include "IOCP.h"
 #include "Timer.h"
+#include "Buffer.h"
+#include "OSInfo.h"
 #include "CppNetImpl.h"
+#include "EventHandler.h"
+#include "WinExpendFunc.h"
 
 using namespace cppnet;
 

net/win/IOCP.h

@@ -6,9 +6,9 @@
 #include <MSWSock.h>
 #pragma comment(lib,"ws2_32.lib")
 
+#include "CNConfig.h"
 #include "EventActions.h"
 #include "PoolSharedPtr.h"
-#include "CNConfig.h"
 
 namespace cppnet {
     class Cevent;

net/win/SocketBase.cpp

@@ -1,9 +1,9 @@
 #ifndef __linux__
 #include <winsock2.h>
-#include "SocketBase.h"
-#include "WinExpendFunc.h"
 #include "Log.h"
 #include "CNConfig.h"
+#include "SocketBase.h"
+#include "WinExpendFunc.h"
 
 using namespace cppnet;
 LPFN_ACCEPTEX                cppnet::__AcceptEx          = nullptr;

net/win/SocketImpl.cpp

@@ -1,12 +1,12 @@
 #ifndef __linux__
-#include "EventHandler.h"
-#include "Buffer.h"
-#include "WinExpendFunc.h"
 #include "Log.h"
 #include "IOCP.h"
-#include "EventActions.h"
+#include "Buffer.h"
 #include "SocketImpl.h"
 #include "CppNetImpl.h"
+#include "EventActions.h"
+#include "EventHandler.h"
+#include "WinExpendFunc.h"
 #include "CallBackHandle.h"
 
 using namespace cppnet;

test/echo/EchoClient.cpp

@@ -1,9 +1,11 @@
-#include <iostream>
 #include <string>
+#include <iostream>
 #include <algorithm> // for std::find
+
 #include "CppNet.h"
-#include "Runnable.h"
 #include "Socket.h"
+#include "Runnable.h"
+
 using namespace cppnet;
 
 int index = 0;

test/echo/EchoServer.cpp

@@ -1,8 +1,10 @@
-#include <iostream>
 #include <string>
-#include <string.h> // for strlen
 #include <thread>
+#include <string.h> // for strlen
+#include <iostream>
+
 #include "CppNet.h"
+
 using namespace cppnet;
 
 static const int __buf_len = 2048;

test/http/HttpResponse.cpp

@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <string>
+#include <stdio.h>
 #include "HttpResponse.h"
 
 std::string CHttpResponse::GetSendBuffer() const {

test/http/HttpServer.cpp

@@ -1,7 +1,7 @@
 #include "HttpServer.h"
 #include "HttpRequest.h"
-#include "HttpResponse.h"
 #include "HttpContext.h"
+#include "HttpResponse.h"
 
 using namespace cppnet;
 

test/http/HttpServer.h

@@ -6,11 +6,11 @@
 #include <mutex>
 
 #include "CppNet.h"
-#include "CppDefine.h"
 #include "TimeTool.h"
+#include "CppDefine.h"
+#include "HttpContext.h"
 #include "HttpRequest.h"
 #include "HttpResponse.h"
-#include "HttpContext.h"
 
 typedef std::function<void (const CHttpRequest&, CHttpResponse&)> HttpCallback;
 

test/http/HttpServerTest.cpp

@@ -1,10 +1,10 @@
-#include <iostream>
 #include <map>
 #include <fstream>
+#include <iostream>
 
-#include "HttpResponse.h"
 #include "HttpServer.h"
 #include "HttpRequest.h"
+#include "HttpResponse.h"
 
 std::string image;
 bool benchmark = true;

test/pingpong/Client.cpp

@@ -1,14 +1,13 @@
+#include <atomic>
+#include <memory>
 #include <utility>
 #include <stdio.h>
-//#include <unistd.h>
 #include <iostream>
 #include <functional>
-#include <atomic>
 #include <unordered_map>
-#include <memory>
-#include "Runnable.h"
 
 #include "CppNet.h"
+#include "Runnable.h"
 
 #ifndef __linux__
 #include <winsock2.h>

test/rpc/AnyFunc.h

@@ -1,9 +1,9 @@
 #ifndef TEST_RPC_CANYFUNC_HEADER
 #define TEST_RPC_CANYFUNC_HEADER
 
-#include <functional>
 #include <vector>
 #include <string>
+#include <functional>
 
 #include "Any.h"
 

test/rpc/FuncThread.h

@@ -2,8 +2,8 @@
 #define TEST_RPC_CFUNCTHREAD_HEADER
 
 #include <map>
-#include "RunnableAloneTaskList.h"
 #include "CommonStruct.h"
+#include "RunnableAloneTaskList.h"
 
 class CFuncManager;
 class CInfoRouter;

test/rpc/InfoRouter.h

@@ -1,11 +1,11 @@
 #ifndef TEST_RPC_CINFOROUTER_HEADER
 #define TEST_RPC_CINFOROUTER_HEADER
 
-#include <string>
-#include <vector>
 #include <mutex>
 #include <atomic>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "TaskQueue.h"
 #include "CommonStruct.h"

test/rpc/ParsePackage.cpp

@@ -1,5 +1,5 @@
-#include "ParsePackage.h"
 #include "Any.h"
+#include "ParsePackage.h"
 
 enum PARSE_STATE {
 	PARSE_TYPE	= 1,

test/rpc/ParsePackage.h

@@ -30,12 +30,12 @@ type info:
 	vc	vector<char>
 	...
 *********************************************************/
-#include <vector>
 #include <map>
+#include <vector>
 #include <string.h> // for memset
 
-#include "CommonStruct.h"
 #include "Any.h"
+#include "CommonStruct.h"
 
 class CParsePackage
 {

test/rpc/RPCClient.cpp

@@ -1,9 +1,9 @@
+#include "Log.h"
+#include "CppNet.h"
 #include "RPCClient.h"
 #include "InfoRouter.h"
 #include "FuncThread.h"
 #include "ParsePackage.h"
-#include "CppNet.h"
-#include "Log.h"
 
 CRPCClient::CRPCClient() : _connected(false){
 }

test/rpc/RPCClient.h

@@ -1,8 +1,8 @@
 #ifndef TEST_RPC_RPCCLIENT_HEADER
 #define TEST_RPC_RPCCLIENT_HEADER
 
-#include "CppDefine.h"
 #include "Socket.h"
+#include "CppDefine.h"
 #include "CommonStruct.h"
 #include "ParsePackage.h"
 

test/rpc/RPCServer.cpp

@@ -1,10 +1,10 @@
+#include "Log.h"
+#include "CppNet.h"
 #include "RPCServer.h"
 #include "InfoRouter.h"
 #include "FuncThread.h"
-#include "ParsePackage.h"
-#include "Log.h"
-#include "CppNet.h"
 #include "CommonStruct.h"
+#include "ParsePackage.h"
 
 CRPCServer::CRPCServer() : _info_router(new CInfoRouter), _parse_package(new CParsePackage), _pool(1024, 5), _need_mutex(false){
 

test/rpc/RPCServer.h

@@ -1,12 +1,13 @@
 #ifndef TEST_RPC_RPCSERVER_HEADER
 #define TEST_RPC_RPCSERVER_HEADER
+
+#include <map>
 #include <memory>
 #include <atomic>
-#include <map>
 
+#include "CppDefine.h"
 #include "MemoryPool.h"
 #include "CommonStruct.h"
-#include "CppDefine.h"
 
 class CInfoRouter;
 class CParsePackage;

test/rpc/TestClient.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
-#include "RPCClient.h"
 #include "Any.h"
 #include "Runnable.h"
+#include "RPCClient.h"
 using namespace std;
 
 void Add1CallBack(int code, std::vector<base::CAny>& ret) {

test/rpc/TestServer.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
-#include "RPCServer.h"
 #include "Any.h"
+#include "RPCServer.h"
 
 std::vector<base::CAny> Add1(std::vector<base::CAny> param) {
     int res = base::any_cast<int>(param[0])  + base::any_cast<int>(param[1]);

test/sendfile/SendFileClient.cpp

@@ -1,11 +1,13 @@
-#include <fstream>
-#include <iostream>
 #include <string>
+#include <fstream>
 #include <string.h> // for memset
+#include <iostream>
+
+#include "md5.h"
 #include "CppNet.h"
 #include "Socket.h"
-#include "md5.h"
 #include "Common.h"
+
 using namespace cppnet;
 
 class CSendFile {

test/sendfile/SendFileServer.cpp

@@ -1,12 +1,13 @@
-#include <iostream>
-#include <string>
-#include <string.h>
 #include <map>
+#include <string>
 #include <fstream>
+#include <string.h>
+#include <iostream>
 #include <string.h> // for strlen
+
+#include "md5.h"
 #include "CppNet.h"
 #include "Common.h"
-#include "md5.h"
 
 using namespace cppnet;
 

test/simple/CppNetClient.cpp

@@ -1,8 +1,10 @@
-#include <iostream>
 #include <string>
+#include <iostream>
+
 #include "CppNet.h"
-#include "Runnable.h"
 #include "Socket.h"
+#include "Runnable.h"
+
 using namespace cppnet;
 
 int index = 0;

test/simple/CppNetServer.cpp

@@ -1,7 +1,9 @@
-#include <iostream>
 #include <string>
 #include <thread>
+#include <iostream>
+
 #include "CppNet.h"
+
 using namespace cppnet;
 
 int index = 0;