Various pool_event_* and thread API cleanups.

src/command_download.cc

@@ -307,7 +307,7 @@ apply_d_add_peer(core::Download* download, const std::string& arg) {
   if (port < 1 || port > 65535)
     throw torrent::input_error("Invalid port number.");
 
-  assert(std::this_thread::get_id() == torrent::main_thread()->thread_id());
+  assert(std::this_thread::get_id() == torrent::main_thread::thread()->thread_id());
 
   // Currently discarding SOCK_STREAM.
   torrent::this_thread::resolver()->resolve_preferred(NULL, host, AF_UNSPEC, AF_INET, [download, port](torrent::c_sa_shared_ptr sa, int err) {

src/command_local.cc

@@ -279,7 +279,7 @@ initialize_command_local() {
 
   CMD2_ANY         ("pieces.stats.total_size",         std::bind(&apply_pieces_stats_total_size));
 
-  CMD2_ANY         ("pieces.hash.queue_size",          std::bind(&torrent::hash_queue_size));
+  CMD2_ANY         ("pieces.hash.queue_size",          std::bind(&torrent::main_thread::hash_queue_size));
   CMD2_VAR_BOOL    ("pieces.hash.on_completion",       true);
 
   CMD2_VAR_STRING  ("directory.default",       "./");

src/command_tracker.cc

@@ -45,7 +45,7 @@ apply_dht_add_node(const std::string& arg) {
   if (port < 1 || port > 65535)
     throw torrent::input_error("Invalid port number.");
 
-  assert(std::this_thread::get_id() == torrent::main_thread()->thread_id());
+  assert(std::this_thread::get_id() == torrent::main_thread::thread()->thread_id());
 
   // Currently discarding SOCK_STREAM.
   torrent::this_thread::resolver()->resolve_specific(nullptr, host, PF_INET, [port](torrent::c_sa_shared_ptr sa, int err) {

src/display/window_log.cc

@@ -16,10 +16,10 @@ WindowLog::WindowLog(torrent::log_buffer* l) :
 
   m_task_update.slot() = std::bind(&WindowLog::receive_update, this);
 
-  unsigned int signal_index = torrent::main_thread()->signal_bitfield()->add_signal(std::bind(&WindowLog::receive_update, this));
+  unsigned int signal_index = torrent::main_thread::thread()->signal_bitfield()->add_signal(std::bind(&WindowLog::receive_update, this));
 
   m_log->lock_and_set_update_slot([signal_index]() {
-    torrent::main_thread()->send_event_signal(signal_index, false);
+    torrent::main_thread::thread()->send_event_signal(signal_index, false);
   });
 }
 

src/main.cc

@@ -446,7 +446,7 @@ main(int argc, char** argv) {
 
     rpc::commands.call_catch("event.system.startup_done", rpc::make_target(), "startup_done", "System startup_done event action failed: ");
 
-    torrent::main_thread()->event_loop();
+    torrent::utils::Thread::self()->event_loop();
 
     control->core()->download_list()->session_save();
     control->cleanup();

src/rpc/scgi_task.cc

@@ -41,8 +41,8 @@ SCgiTask::close() {
   if (!get_fd().is_valid())
     return;
 
-  torrent::main_thread()->cancel_callback_and_wait(this);
-  torrent::thread_self()->cancel_callback(this);
+  torrent::main_thread::thread()->cancel_callback_and_wait(this);
+  torrent::utils::Thread::self()->cancel_callback(this);
 
   torrent::this_thread::poll()->remove_and_close(this);
 
@@ -261,7 +261,7 @@ void
 SCgiTask::receive_call(const char* buffer, uint32_t length) {
   // TODO: Rewrite RpcManager.process to pass the result buffer instead of having to copy it.
 
-  auto scgi_thread = torrent::thread_self();
+  auto scgi_thread = torrent::utils::Thread::self();
 
   auto result_callback = [this, scgi_thread](const char* b, uint32_t l) {
       receive_write(b, l);
@@ -279,7 +279,7 @@ SCgiTask::receive_call(const char* buffer, uint32_t length) {
 
   switch (content_type()) {
   case rpc::SCgiTask::ContentType::JSON:
-    torrent::main_thread()->callback_interrupt_pollling(this, [buffer, length, result_callback]() {
+    torrent::main_thread::thread()->callback_interrupt_pollling(this, [buffer, length, result_callback]() {
         rpc.process(RpcManager::RPCType::JSON, buffer, length,
                     [result_callback](const char* b, uint32_t l) {
                       result_callback(b, l);
@@ -289,7 +289,7 @@ SCgiTask::receive_call(const char* buffer, uint32_t length) {
     break;
 
   case rpc::SCgiTask::ContentType::XML:
-    torrent::main_thread()->callback_interrupt_pollling(this, [buffer, length, result_callback]() {
+    torrent::main_thread::thread()->callback_interrupt_pollling(this, [buffer, length, result_callback]() {
         rpc.process(RpcManager::RPCType::XML, buffer, length,
                     [result_callback](const char* b, uint32_t l) {
                       result_callback(b, l);

src/ui/element_log_complete.cc

@@ -18,10 +18,10 @@ ElementLogComplete::ElementLogComplete(torrent::log_buffer* l) :
   m_window(NULL),
   m_log(l) {
 
-  unsigned int signal_index = torrent::main_thread()->signal_bitfield()->add_signal(std::bind(&ElementLogComplete::received_update, this));
+  unsigned int signal_index = torrent::main_thread::thread()->signal_bitfield()->add_signal(std::bind(&ElementLogComplete::received_update, this));
 
   m_log->lock_and_set_update_slot([signal_index]() {
-    torrent::main_thread()->send_event_signal(signal_index, false);
+    torrent::main_thread::thread()->send_event_signal(signal_index, false);
   });
 }