Moved around some of the new classes in core.

core/SCsub

@@ -10,7 +10,8 @@ env.add_source_files(env.core_sources, "./net/*.cpp")
 env.add_source_files(env.core_sources, "./net/resolvers/*.cpp")
 env.add_source_files(env.core_sources, "./net/connections/*.cpp")
 env.add_source_files(env.core_sources, "./loops/*.cpp")
-env.add_source_files(env.core_sources, "./loops/poller/*.cpp")
+env.add_source_files(env.core_sources, "./polling/poller/*.cpp")
+env.add_source_files(env.core_sources, "./polling/*.cpp")
 env.add_source_files(env.core_sources, "./containers/*.cpp")
 env.add_source_files(env.core_sources, "./log/*.cpp")
 env.add_source_files(env.core_sources, "./os/*.cpp")

core/loops/event_loop.cpp

@@ -32,8 +32,8 @@
 #include "event_loop.h"
 #include "core/log/logger.h"
 
-#include "channel.h"
+#include "core/net/channel.h"
-#include "poller.h"
+#include "core/polling/poller.h"
 
 #include "timer_queue.h"
 

core/loops/timer.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <atomic>
 #include <chrono>
 #include <functional>

core/loops/timer_queue.cpp

@@ -30,7 +30,7 @@
 
 #include "event_loop.h"
 
-#include "channel.h"
+#include "core/net/channel.h"
 #include "timer_queue.h"
 #ifdef __linux__
 #include <sys/timerfd.h>

core/loops/timer_queue.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "timer.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <atomic>
 #include <memory>
 #include <queue>

core/net/acceptor.h

@@ -33,7 +33,7 @@
 #include "channel.h"
 #include "core/net/inet_address.h"
 #include "core/net/socket.h"
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 #include <functional>
 
 // Inherit from socket?

core/net/channel.cpp

@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "channel.h"
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 
 #ifdef _WIN32
 #include "Wepoll.h"

core/net/connections/tcp_connection_impl.cpp

@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "tcp_connection_impl.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #include "core/net/socket.h"
 #ifdef __linux__
 #include <sys/sendfile.h>

core/net/connector.cpp

@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "connector.h"
-#include "core/loops/channel.h"
+#include "channel.h"
 #include "core/net/socket.h"
 
 Connector::Connector(EventLoop *loop, const InetAddress &addr, bool retry) :

core/net/resolvers/ares_resolver.cpp

@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ares_resolver.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #include <ares.h>
 #ifdef _WIN32
 #include <winsock2.h>

core/net/tcp_connection.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/containers/msg_buffer.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include "core/loops/event_loop.h"
 #include "core/net/inet_address.h"
 #include <functional>

core/net/tcp_server.cpp

@@ -30,7 +30,7 @@
 
 #include "core/net/tcp_server.h"
 #include "core/log/logger.h"
-#include "core/loops/acceptor.h"
+#include "core/net/acceptor.h"
 #include "core/net/connections/tcp_connection_impl.h"
 #include <functional>
 #include <vector>

core/net/tcp_server.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/log/logger.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include "core/loops/event_loop_thread_pool.h"
 #include "core/loops/timing_wheel.h"
 #include "core/net/inet_address.h"

core/polling/poller.cpp

@@ -28,7 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "core/loops/poller.h"
+#include "poller.h"
+
 #ifdef __linux__
 #include "poller/epoll_poller.h"
 #elif defined _WIN32

core/polling/poller.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 
 #include <map>
 #include <memory>

core/polling/poller/epoll_poller.cpp

@@ -30,7 +30,7 @@
 
 #include "epoll_poller.h"
 #include "core/log/logger.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 
 #ifdef __linux__
 #include <assert.h>

core/polling/poller/epoll_poller.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/loops/event_loop.h"
-#include "core/loops/poller.h"
+#include "core/polling/poller.h"
 
 #if defined __linux__ || defined _WIN32
 #include <map>

core/polling/poller/kqueue.cpp

@@ -31,7 +31,7 @@
 
 #include "kqueue.h"
 
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #ifdef USE_KQUEUE
 #include "core/log/logger.h"
 #include <poll.h>

core/polling/poller/kqueue.h

@@ -30,7 +30,7 @@
 
 #pragma once
 #include "core/loops/event_loop.h"
-#include "core/loops/poller.h"
+#include "core/polling/poller.h"
 
 #if (defined(__unix__) && !defined(__linux__)) || \
 		(defined(__APPLE__) && defined(__MACH__))

web_backends/drogon/drogon/lib/src/HttpServer.h

@@ -16,7 +16,7 @@
 
 #include "impl_forwards.h"
 #include "core/net/tcp_server.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <trantor/utils/NonCopyable.h>
 #include <functional>
 #include <string>

web_backends/drogon/drogon/lib/src/ListenerManager.h

@@ -16,7 +16,7 @@
 
 #include "impl_forwards.h"
 #include "core/loops/event_loop_thread_pool.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
 #include <string>