From 117f6c47c9b6f870f860cb22018a8401fc2151cf Mon Sep 17 00:00:00 2001
From: matyhtf <mikan.tenny@gmail.com>
Date: Tue, 12 May 2020 12:25:14 +0800
Subject: [PATCH] Optimize directory structure

---
 config.m4                           | 8 ++++----
 src/{network => core}/timer.cc      | 0
 src/{core => network}/socket.cc     | 0
 src/{network => os}/process_pool.cc | 0
 src/{network => os}/thread_pool.cc  | 0
 tools/constant-generator.php        | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{network => core}/timer.cc (100%)
 rename src/{core => network}/socket.cc (100%)
 rename src/{network => os}/process_pool.cc (100%)
 rename src/{network => os}/thread_pool.cc (100%)
 mode change 100644 => 100755 tools/constant-generator.php

diff --git a/config.m4 b/config.m4
index c5386b2f892..47101f5d59c 100644
--- a/config.m4
+++ b/config.m4
@@ -414,8 +414,8 @@ if test "$PHP_SWOOLE" != "no"; then
         src/core/heap.cc \
         src/core/log.cc \
         src/core/ring_queue.cc \
-        src/core/socket.cc \
         src/core/string.cc \
+        src/core/timer.cc \
         src/coroutine/base.cc \
         src/coroutine/channel.cc \
         src/coroutine/context.cc \
@@ -441,15 +441,15 @@ if test "$PHP_SWOOLE" != "no"; then
         src/memory/table.cc \
         src/network/client.cc \
         src/network/dns.cc \
-        src/network/process_pool.cc \
+        src/network/socket.cc \
         src/network/stream.cc \
-        src/network/thread_pool.cc \
-        src/network/timer.cc \
         src/os/async_thread.cc \
         src/os/base.cc \
         src/os/msg_queue.cc \
+        src/os/process_pool.cc \
         src/os/sendfile.cc \
         src/os/signal.cc \
+        src/os/thread_pool.cc \
         src/os/timer.cc \
         src/os/wait.cc \
         src/pipe/base.cc \
diff --git a/src/network/timer.cc b/src/core/timer.cc
similarity index 100%
rename from src/network/timer.cc
rename to src/core/timer.cc
diff --git a/src/core/socket.cc b/src/network/socket.cc
similarity index 100%
rename from src/core/socket.cc
rename to src/network/socket.cc
diff --git a/src/network/process_pool.cc b/src/os/process_pool.cc
similarity index 100%
rename from src/network/process_pool.cc
rename to src/os/process_pool.cc
diff --git a/src/network/thread_pool.cc b/src/os/thread_pool.cc
similarity index 100%
rename from src/network/thread_pool.cc
rename to src/os/thread_pool.cc
diff --git a/tools/constant-generator.php b/tools/constant-generator.php
old mode 100644
new mode 100755