diff --git a/src/command_network.cc b/src/command_network.cc index 1421211a..a5100168 100644 --- a/src/command_network.cc +++ b/src/command_network.cc @@ -251,9 +251,6 @@ initialize_command_network() { CMD2_ANY ("network.http.max_host_connections", [http_stack](auto, auto) { return http_stack->max_host_connections(); }); CMD2_ANY_VALUE_V ("network.http.max_host_connections.set", [http_stack](auto, auto& value) { return http_stack->set_max_host_connections(value); }); CMD2_ANY ("network.http.max_total_connections", [http_stack](auto, auto) { return http_stack->max_total_connections(); }); - - CMD2_ANY_VALUE_V ("network.http.max_total_connections.set", [http_stack](auto, auto& value) { return http_stack->set_max_total_connections(value); }); - CMD2_ANY ("network.http.proxy_address", [http_stack](auto, auto) { return http_stack->http_proxy(); }); CMD2_ANY_STRING_V("network.http.proxy_address.set", [http_stack](auto, auto& str) { return http_stack->set_http_proxy(str); }); CMD2_ANY ("network.http.ssl_verify_host", [http_stack](auto, auto) { return http_stack->ssl_verify_host(); }); @@ -286,9 +283,6 @@ initialize_command_network() { CMD2_ANY ("network.open_files", [file_manager](auto, auto) { return file_manager->open_files(); }); CMD2_ANY ("network.max_open_files", [file_manager](auto, auto) { return file_manager->max_open_files(); }); - - CMD2_ANY_VALUE_V ("network.max_open_files.set", [file_manager](auto, auto& value) { return file_manager->set_max_open_files(value); }); - CMD2_ANY ("network.total_handshakes", [](auto, auto) { return torrent::runtime::total_handshakes(); }); CMD2_ANY_STRING ("network.scgi.open_port", std::bind(&apply_scgi, std::placeholders::_2, 1)); diff --git a/src/main.cc b/src/main.cc index d844a972..18f976c8 100644 --- a/src/main.cc +++ b/src/main.cc @@ -112,8 +112,16 @@ main(int argc, char** argv) { // 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. + // + // This means only main-thread can fork and wait for child processes. + + SignalHandler::set_block(SIGALRM); + SignalHandler::set_block(SIGPIPE); + SignalHandler::set_block(SIGCHLD); + // All signal handlers must restore errno if they return. - SignalHandler::set_ignore(SIGPIPE); 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)); @@ -156,6 +164,8 @@ main(int argc, char** argv) { scgi::ThreadScgi::create_thread(); session::ThreadSession::create_thread(); + SignalHandler::set_unblock(SIGCHLD); + // Initialize option handlers after libtorrent to ensure // torrent::ConnectionManager* are valid etc. initialize_commands(); @@ -354,6 +364,14 @@ main(int argc, char** argv) { rpc::rpc.mark_safe("network.max_open_sockets"); + CMD2_ANY_VALUE_V("network.http.max_total_connections.set", [](auto, auto) { + lt_log_print(torrent::LOG_WARN, "network.http.max_total_connections.set is deprecated, use system.sockets.http.min_alloc.set instead."); + }); + + CMD2_ANY_VALUE_V("network.max_open_files.set", [](auto, auto) { + lt_log_print(torrent::LOG_WARN, "network.max_open_files.set is deprecated, use system.sockets.files.min_alloc.set instead."); + }); + // if (rpc::call_command_value("method.use_intermediate") == 1) { // } else if (rpc::call_command_value("method.use_intermediate") == 2) { diff --git a/src/signal_handler.cc b/src/signal_handler.cc index 85df19ea..16bac789 100644 --- a/src/signal_handler.cc +++ b/src/signal_handler.cc @@ -42,6 +42,7 @@ SignalHandler::set_handler(unsigned int signum, slot_void slot) { throw std::logic_error("SignalHandler::set_handler(...) received an empty slot."); struct sigaction sa; + sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART; sa.sa_handler = &SignalHandler::caught; @@ -52,6 +53,34 @@ SignalHandler::set_handler(unsigned int signum, slot_void slot) { m_handlers[signum] = slot; } +void +SignalHandler::set_block(unsigned int signum) { + if (signum >= HIGHEST_SIGNAL) + throw std::logic_error("SignalHandler::set_block(...) received invalid signal value."); + + sigset_t mask; + + sigemptyset(&mask); + sigaddset(&mask, signum); + + if (pthread_sigmask(SIG_BLOCK, &mask, NULL) == -1) + throw std::logic_error("Could not block signal: " + std::string(std::strerror(errno))); +} + +void +SignalHandler::set_unblock(unsigned int signum) { + if (signum >= HIGHEST_SIGNAL) + throw std::logic_error("SignalHandler::set_unblock(...) received invalid signal value."); + + sigset_t mask; + + sigemptyset(&mask); + sigaddset(&mask, signum); + + if (pthread_sigmask(SIG_UNBLOCK, &mask, NULL) == -1) + throw std::logic_error("Could not unblock signal: " + std::string(std::strerror(errno))); +} + void SignalHandler::set_sigaction_handler(unsigned int signum, handler_slot slot) { if (signum >= HIGHEST_SIGNAL) diff --git a/src/signal_handler.h b/src/signal_handler.h index 278c6a29..51a3b400 100644 --- a/src/signal_handler.h +++ b/src/signal_handler.h @@ -1,37 +1,3 @@ -// rTorrent - BitTorrent client -// Copyright (C) 2005-2011, Jari Sundell -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// In addition, as a special exception, the copyright holders give -// permission to link the code of portions of this program with the -// OpenSSL library under certain conditions as described in each -// individual source file, and distribute linked combinations -// including the two. -// -// You must obey the GNU General Public License in all respects for -// all of the code used other than OpenSSL. If you modify file(s) -// with this exception, you may extend this exception to your version -// of the file(s), but you are not obligated to do so. If you do not -// wish to do so, delete this exception statement from your version. -// If you delete this exception statement from all source files in the -// program, then also delete it here. -// -// Contact: Jari Sundell - - #ifndef RTORRENT_SIGNAL_HANDLER_H #define RTORRENT_SIGNAL_HANDLER_H @@ -56,6 +22,9 @@ public: static void set_ignore(unsigned int signum); static void set_handler(unsigned int signum, slot_void slot); + static void set_block(unsigned int signum); + static void set_unblock(unsigned int signum); + static void set_sigaction_handler(unsigned int signum, handler_slot slot); static const char* as_string(unsigned int signum);