Tagged release 0.16.23.

configure.ac

@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent],[0.16.22],[sundell.software@gmail.com])
+AC_INIT([rtorrent],[0.16.23],[sundell.software@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([scripts])
@@ -14,7 +14,7 @@ AX_CXX_COMPILE_STDCXX(20, noext, mandatory)
 
 PKG_PROG_PKG_CONFIG
 
-AC_DEFINE([API_VERSION], [26], [api version])
+AC_DEFINE([API_VERSION], [27], [api version])
 
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
@@ -49,7 +49,7 @@ fi
 
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 PKG_CHECK_MODULES([ZLIB], [zlib])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.22])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.23])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C

src/input/input_event.cc

@@ -11,7 +11,8 @@ namespace input {
 
 void
 InputEvent::insert() {
-  torrent::this_thread::poll()->open_and_insert_read(this);
+  torrent::this_thread::poll()->open(this);
+  torrent::this_thread::poll()->insert_read(this);
 }
 
 void

src/main.cc

@@ -112,9 +112,8 @@ main(int argc, char** argv) {
 
     torrent::log_initialize();
 
-    torrent::runtime::initialize_worker_process_and_main_thread([argc, argv]() {
-        parse_config_file(argc, argv, [](auto& path) { parse_config_file_comments("worker", path); });
-      });
+    // TODO: Create a fake thread object for initializing other processes and enabling logging.
+    torrent::initialize_main_thread();
 
     // Block SIGCHLD until all threads are created, then unblock on main-thread, to avoid SIGCHLD
     // interrupting other threads.
@@ -126,9 +125,9 @@ main(int argc, char** argv) {
     SignalHandler::set_block(SIGCHLD);
 
     // All signal handlers must restore errno if they return.
-    SignalHandler::set_handler(SIGSEGV,  []() { do_panic(SIGSEGV); });
-    SignalHandler::set_handler(SIGILL,   []() { do_panic(SIGILL); });
-    SignalHandler::set_handler(SIGFPE,   []() { do_panic(SIGFPE); });
+    SignalHandler::set_handler(SIGSEGV,  std::bind(&do_panic, SIGSEGV));
+    SignalHandler::set_handler(SIGILL,   std::bind(&do_panic, SIGILL));
+    SignalHandler::set_handler(SIGFPE,   std::bind(&do_panic, SIGFPE));
 
     // Limited list of commands with the following format:
     //
@@ -137,17 +136,19 @@ main(int argc, char** argv) {
     // # do:log.open_file=system,/usr/rakshasa/system.log
     // # do:log.add_output=system,system
     //
-    // # do-worker:log.open_file=system,/usr/rakshasa/system-worker.log
-    // # do-worker:log.add_output=system,system
-    //
-    parse_config_file(argc, argv, [](auto& path) { parse_config_file_comments("", path); });
+    parse_config_file(argc, argv, [](auto& path) {
+        if (path.empty())
+          return;
+
+        parse_config_file_comments(path);
+      });
 
     control = new Control;
 
-    SignalHandler::set_handler(SIGINT,   []() { control->receive_normal_shutdown(); });
-    SignalHandler::set_handler(SIGHUP,   []() { control->receive_normal_shutdown(); });
-    SignalHandler::set_handler(SIGTERM,  []() { control->receive_quick_shutdown(); });
-    SignalHandler::set_handler(SIGWINCH, []() { control->display()->force_redraw(); });
+    SignalHandler::set_handler(SIGINT,   std::bind(&Control::receive_normal_shutdown, control));
+    SignalHandler::set_handler(SIGHUP,   std::bind(&Control::receive_normal_shutdown, control));
+    SignalHandler::set_handler(SIGTERM,  std::bind(&Control::receive_quick_shutdown, control));
+    SignalHandler::set_handler(SIGWINCH, std::bind(&display::Manager::force_redraw, control->display()));
 
     SignalHandler::set_sigaction_handler(SIGBUS, &handle_sigbus);
 
@@ -468,8 +469,6 @@ main(int argc, char** argv) {
     control->ui()->load_input_history();
 
     torrent::net_thread::http_stack()->set_user_agent(USER_AGENT);
-
-    torrent::runtime::initialize_worker_process();
     torrent::runtime::initialize_network();
 
     // Load session torrents and perform scheduled tasks to ensure session torrents are loaded

src/option_parser.cc

@@ -108,6 +108,6 @@ OptionParser::call_int_pair(slot_int_pair slot, const std::string& arg) {
 
   if (a < 0 || b < 0)
     throw std::runtime_error("Invalid argument, \"" + arg + "\" should be positive numbers");
-
+  
   slot(a, b);
 }

src/rpc/scgi.cc

@@ -109,7 +109,8 @@ void
 SCgi::activate() {
   assert(torrent::this_thread::thread() == scgi_thread::thread());
 
-  torrent::this_thread::poll()->open_and_insert_read(this);
+  torrent::this_thread::poll()->open(this);
+  torrent::this_thread::poll()->insert_read(this);
 }
 
 // TODO: This should close the fd to avoid reuse.

src/rpc/scgi_task.cc

@@ -50,7 +50,8 @@ SCgiTask::open(SCgi* parent, int fd) {
                                  // m_trusted=false into the next reuse, given that the
                                  // UNTRUSTED_CONNECTION=0 parse branch is a no-op.
 
-  torrent::this_thread::poll()->open_and_insert_read(this);
+  torrent::this_thread::poll()->open(this);
+  torrent::this_thread::poll()->insert_read(this);
 
   torrent::this_thread::scheduler()->update_wait_for_ceil_seconds(&m_task_timeout, timeout_request);
 

src/setup.cc

@@ -108,22 +108,18 @@ config_comment_log(const std::string& command, const std::string& raw_args) {
     throw torrent::input_error("Unknown log command: " + command);
 }
 
-// Call special commands in the format "# do:command=args" or "# do-<category>:command=args" in the config file.
+// Call special commands in the format "# do:command=args" in the config file.
 void
-parse_config_file_comments(const std::string& category, const std::string& path) {
-  if (path.empty())
-    return;
-
+parse_config_file_comments(const std::string& path) {
   std::fstream file(path, std::ios::in);
 
   if (!file.is_open())
     return;
 
   std::string line;
-  std::string prefix = category.empty() ? "# do:" : "# do-" + category + ":";
 
   while (std::getline(file, line)) {
-    if (line.size() <= prefix.size() || line.compare(0, prefix.size(), prefix) != 0)
+    if (line.size() <= 5 || line.compare(0, 5, "# do:") != 0)
       continue;
 
     auto equal_pos = line.find('=');
@@ -131,8 +127,8 @@ parse_config_file_comments(const std::string& category, const std::string& path)
     if (equal_pos == std::string::npos)
       throw torrent::input_error("Invalid command in config file comment: " + line);
 
-    auto command = line.substr(prefix.size(), equal_pos - prefix.size());
-    auto args    = line.substr(equal_pos + 1);
+    std::string command = line.substr(5, equal_pos - 5);
+    std::string args    = line.substr(equal_pos + 1);
 
     if (command.empty())
       throw torrent::input_error("Invalid command in config file comment: " + line);

src/setup.h

@@ -7,7 +7,7 @@
 
 int  parse_main_options(int argc, char** argv);
 void parse_config_file(int argc, char** argv, std::function<void (const std::string&)> parse_fn);
-void parse_config_file_comments(const std::string& category, const std::string& path);
+void parse_config_file_comments(const std::string& path);
 
 void load_session_torrents(const std::string& path);
 void load_arg_torrents(char** first, char** last);