Moved Poll to net namespace.

rakshasa · web-flow · commit 26be56a947ec · 2025-11-20T02:06:33.000+09:00
diff --git a/src/dht/dht_server.cc b/src/dht/dht_server.cc
@@ -14,8 +14,8 @@
 #include "torrent/object.h"
 #include "torrent/object_static_map.h"
 #include "torrent/object_stream.h"
-#include "torrent/poll.h"
 #include "torrent/net/fd.h"
+#include "torrent/net/poll.h"
 #include "torrent/net/socket_address.h"
 #include "torrent/net/network_config.h"
 #include "torrent/net/network_manager.h"
diff --git a/src/manager.cc b/src/manager.cc
@@ -10,16 +10,16 @@
 #include "protocol/handshake_manager.h"
 #include "torrent/chunk_manager.h"
 #include "torrent/connection_manager.h"
+#include "torrent/throttle.h"
 #include "torrent/data/file_manager.h"
 #include "torrent/download/choke_group.h"
 #include "torrent/download/choke_queue.h"
 #include "torrent/download/download_manager.h"
 #include "torrent/download/resource_manager.h"
-#include "torrent/peer/client_list.h"
-#include "torrent/poll.h"
-#include "torrent/throttle.h"
 #include "torrent/net/network_config.h"
 #include "torrent/net/network_manager.h"
+#include "torrent/net/poll.h"
+#include "torrent/peer/client_list.h"
 #include "utils/instrumentation.h"
 #include "utils/thread_internal.h"
 
diff --git a/src/net/curl_socket.cc b/src/net/curl_socket.cc
@@ -4,10 +4,10 @@
 
 #include <cassert>
 #include <curl/multi.h>
-#include <torrent/poll.h>
-#include <torrent/exceptions.h>
 
 #include "net/curl_stack.h"
+#include "torrent/net/poll.h"
+#include "torrent/exceptions.h"
 
 namespace torrent::net {
 
diff --git a/src/net/listen.cc b/src/net/listen.cc
@@ -5,8 +5,8 @@
 #include "manager.h"
 #include "torrent/connection_manager.h"
 #include "torrent/exceptions.h"
-#include "torrent/poll.h"
 #include "torrent/net/fd.h"
+#include "torrent/net/poll.h"
 #include "torrent/net/socket_address.h"
 #include "torrent/utils/log.h"
 
diff --git a/src/net/socket_base.cc b/src/net/socket_base.cc
@@ -5,7 +5,7 @@
 #include <cassert>
 #include <sys/socket.h>
 
-#include "torrent/poll.h"
+#include "torrent/net/poll.h"
 
 namespace torrent {
 
diff --git a/src/net/udns_resolver.cc b/src/net/udns_resolver.cc
@@ -10,8 +10,8 @@
 #include "net/udns/udns.h"
 #include "torrent/common.h"
 #include "torrent/exceptions.h"
+#include "torrent/net/poll.h"
 #include "torrent/net/socket_address.h"
-#include "torrent/poll.h"
 #include "torrent/utils/log.h"
 #include "torrent/utils/thread.h"
 
diff --git a/src/protocol/handshake.cc b/src/protocol/handshake.cc
@@ -13,11 +13,11 @@
 #include "torrent/download_info.h"
 #include "torrent/error.h"
 #include "torrent/exceptions.h"
-#include "torrent/poll.h"
 #include "torrent/throttle.h"
 #include "torrent/net/fd.h"
 #include "torrent/net/network_config.h"
 #include "torrent/net/network_manager.h"
+#include "torrent/net/poll.h"
 #include "torrent/utils/log.h"
 #include "utils/diffie_hellman.h"
 #include "utils/sha1.h"
diff --git a/src/protocol/peer_connection_base.h b/src/protocol/peer_connection_base.h
@@ -9,9 +9,9 @@
 #include "protocol/peer_chunks.h"
 #include "protocol/protocol_base.h"
 #include "protocol/request_list.h"
-#include "torrent/poll.h"
-#include "torrent/peer/peer.h"
+#include "torrent/net/poll.h"
 #include "torrent/peer/choke_status.h"
+#include "torrent/peer/peer.h"
 
 namespace torrent {
 
diff --git a/src/torrent/Makefile.am b/src/torrent/Makefile.am
@@ -48,6 +48,9 @@ libtorrent_torrent_la_SOURCES = \
 	net/network_config.h \
 	net/network_manager.cc \
 	net/network_manager.h \
+	net/poll.h \
+	net/poll_epoll.cc \
+	net/poll_kqueue.cc \
 	net/resolver.cc \
 	net/resolver.h \
 	net/socket_address.cc \
@@ -135,9 +138,6 @@ libtorrent_torrent_la_SOURCES = \
 	object_stream.h \
 	path.cc \
 	path.h \
-	poll.h \
-	poll_epoll.cc \
-	poll_kqueue.cc \
 	rate.cc \
 	rate.h \
 	throttle.cc \
@@ -179,6 +179,7 @@ libtorrent_torrent_net_include_HEADERS = \
 	net/http_stack.h \
 	net/network_config.h \
 	net/network_manager.h \
+	net/poll.h \
 	net/resolver.h \
 	net/socket_address.h \
 	net/socket_address_key.h \
@@ -237,7 +238,6 @@ libtorrent_torrent_include_HEADERS = \
 	object_static_map.h \
 	object_stream.h \
 	path.h \
-	poll.h \
 	rate.h \
 	throttle.h \
 	torrent.h
diff --git a/src/torrent/common.h b/src/torrent/common.h
@@ -68,7 +68,6 @@ class PeerConnectionBase;
 class PeerInfo;
 class PeerList;
 class Piece;
-class Poll;
 class ProtocolExtension;
 class Rate;
 class ResourceManager;
@@ -79,22 +78,29 @@ class TrackerList;
 class TransferList;
 
 namespace net {
+
 class HttpGet;
 class HttpStack;
 class NetworkConfig;
 class NetworkManager;
+class Poll;
 class Resolver;
+
 } // namespace net
 
 namespace tracker {
+
 class DhtController;
 class Tracker;
+
 } // namespace tracker
 
 namespace utils {
+
 class Scheduler;
 class SchedulerEntry;
 class Thread;
+
 } // namespace utils
 
 } // namespace torrent
@@ -132,7 +138,7 @@ void                      callback(void* target, std::function<void ()>&& fn);
 void                      cancel_callback(void* target);
 void                      cancel_callback_and_wait(void* target);
 
-Poll*                     poll() LIBTORRENT_EXPORT;
+net::Poll*                poll() LIBTORRENT_EXPORT;
 net::Resolver*            resolver() LIBTORRENT_EXPORT;
 utils::Scheduler*         scheduler() LIBTORRENT_EXPORT;
 
diff --git a/src/torrent/net/poll.h b/src/torrent/net/poll.h
@@ -1,11 +1,10 @@
 #ifndef LIBTORRENT_TORRENT_POLL_H
 #define LIBTORRENT_TORRENT_POLL_H
 
-#include <functional>
 #include <memory>
 #include <torrent/common.h>
 
-namespace torrent {
+namespace torrent::net {
 
 class PollInternal;
 
diff --git a/src/torrent/net/poll_epoll.cc b/src/torrent/net/poll_epoll.cc
@@ -2,7 +2,7 @@
 
 #ifdef USE_EPOLL
 
-#include "torrent/poll.h"
+#include "torrent/net/poll.h"
 
 #include <cassert>
 #include <cerrno>
@@ -21,7 +21,7 @@
 // #define LT_LOG_DEBUG_DATA_FD(log_fmt, ...)                                \
 //   lt_log_print(LOG_CONNECTION_FD, "epoll->%i: " log_fmt, itr->data.fd, __VA_ARGS__);
 
-namespace torrent {
+namespace torrent::net {
 
 class PollInternal {
 public:
diff --git a/src/torrent/net/poll_kqueue.cc b/src/torrent/net/poll_kqueue.cc
@@ -26,7 +26,7 @@
 // #define LT_LOG_DEBUG_IDENT(log_fmt, ...)                                \
 //   lt_log_print(LOG_CONNECTION_FD, "kqueue->%u: " log_fmt, static_cast<unsigned int>(itr->ident), __VA_ARGS__);
 
-namespace torrent {
+namespace torrent::net {
 
 class PollInternal {
 public:
diff --git a/src/torrent/torrent.cc b/src/torrent/torrent.cc
@@ -22,11 +22,11 @@
 #include "torrent/exceptions.h"
 #include "torrent/object.h"
 #include "torrent/object_stream.h"
-#include "torrent/poll.h"
 #include "torrent/throttle.h"
 #include "torrent/peer/connection_list.h"
 #include "torrent/net/http_stack.h"
 #include "torrent/net/network_manager.h"
+#include "torrent/net/poll.h"
 #include "tracker/thread_tracker.h"
 #include "utils/instrumentation.h"
 
diff --git a/src/torrent/utils/directory_events.cc b/src/torrent/utils/directory_events.cc
@@ -13,7 +13,7 @@
 #include "net/socket_fd.h"
 #include "rak/error_number.h"
 #include "torrent/exceptions.h"
-#include "torrent/poll.h"
+#include "torrent/net/poll.h"
 
 namespace torrent {
 
diff --git a/src/torrent/utils/thread.cc b/src/torrent/utils/thread.cc
@@ -8,8 +8,8 @@
 #include <unistd.h>
 
 #include "torrent/exceptions.h"
+#include "torrent/net/poll.h"
 #include "torrent/net/resolver.h"
-#include "torrent/poll.h"
 #include "torrent/utils/chrono.h"
 #include "torrent/utils/log.h"
 #include "torrent/utils/scheduler.h"
@@ -23,7 +23,7 @@ thread_local Thread* Thread::m_self{nullptr};
 
 Thread::Thread() :
     m_instrumentation_index(INSTRUMENTATION_POLLING_DO_POLL_OTHERS - INSTRUMENTATION_POLLING_DO_POLL),
-    m_poll(Poll::create()),
+    m_poll(net::Poll::create()),
     m_scheduler(new Scheduler) {
 
   std::tie(m_interrupt_sender, m_interrupt_receiver) = SignalInterrupt::create_pair();
@@ -297,7 +297,7 @@ void                      callback(void* target, std::function<void ()>&& fn) {
 void                      cancel_callback(void* target)                       { utils::ThreadInternal::cancel_callback(target); }
 void                      cancel_callback_and_wait(void* target)              { utils::ThreadInternal::cancel_callback_and_wait(target); }
 
-Poll*                     poll()                                              { return utils::ThreadInternal::poll(); }
+net::Poll*                poll()                                              { return utils::ThreadInternal::poll(); }
 net::Resolver*            resolver()                                          { return utils::ThreadInternal::resolver(); }
 utils::Scheduler*         scheduler()                                         { return utils::ThreadInternal::scheduler(); }
 
diff --git a/src/torrent/utils/thread.h b/src/torrent/utils/thread.h
@@ -91,7 +91,7 @@ class LIBTORRENT_EXPORT Thread {
   void                event_loop();
 
 protected:
-  friend class torrent::Poll;
+  friend class torrent::net::Poll;
   friend class ThreadInternal;
 
   net::Resolver*      resolver()  { return m_resolver.get(); }
@@ -123,7 +123,7 @@ class LIBTORRENT_EXPORT Thread {
 
   int                          m_instrumentation_index;
 
-  std::unique_ptr<Poll>            m_poll;
+  std::unique_ptr<net::Poll>       m_poll;
   std::unique_ptr<net::Resolver>   m_resolver;
   std::unique_ptr<Scheduler>       m_scheduler;
   class signal_bitfield            m_signal_bitfield;
diff --git a/src/utils/thread_internal.h b/src/utils/thread_internal.h
@@ -18,7 +18,7 @@ class ThreadInternal {
   static void                      cancel_callback(void* target)                       { Thread::m_self->cancel_callback(target); }
   static void                      cancel_callback_and_wait(void* target)              { Thread::m_self->cancel_callback_and_wait(target); }
 
-  static Poll*                     poll()           { return Thread::m_self->m_poll.get(); }
+  static net::Poll*                poll()           { return Thread::m_self->m_poll.get(); }
   static Scheduler*                scheduler()      { return Thread::m_self->m_scheduler.get(); }
   static net::Resolver*            resolver()       { return Thread::m_self->m_resolver.get(); }
 };
diff --git a/test/helpers/test_thread.cc b/test/helpers/test_thread.cc
@@ -6,7 +6,7 @@
 
 #include "test/helpers/mock_function.h"
 #include "torrent/exceptions.h"
-#include "torrent/poll.h"
+#include "torrent/net/poll.h"
 
 const int test_thread::test_flag_pre_stop;
 const int test_thread::test_flag_long_timeout;
diff --git a/test/helpers/test_thread.h b/test/helpers/test_thread.h
@@ -46,7 +46,7 @@ class test_thread : public torrent::utils::Thread {
   void                set_pre_stop()           { m_test_flags |= test_flag_pre_stop; }
   void                set_test_flag(int flags) { m_test_flags |= flags; }
 
-  torrent::Poll*      internal_poll() const    { return m_poll.get(); }
+  auto*               internal_poll() const    { return m_poll.get(); }
 
 private:
   test_thread();
