fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-19 15:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thread-safe improvements to dht/tracker code and reorganized thread objects.

Browse Source
This commit is contained in:
Jari Sundell
2025-03-13 14:15:12 +01:00
committed by GitHub
parent 47af28aecd
commit f33fc331ce
6 changed files with 23 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/curl_socket.cc
+5 -4
View File
@@ -1,11 +1,13 @@
#include "config.h" #include "config.h"
#include <cassert>
#include <curl/curl.h> #include <curl/curl.h>
#include <curl/multi.h> #include <curl/multi.h>
#include <torrent/poll.h> #include <torrent/poll.h>
#include <torrent/exceptions.h> #include <torrent/exceptions.h>
#include <torrent/utils/thread_base.h> #include <torrent/utils/thread.h>
#include "control.h" #include "control.h"
@@ -15,7 +17,7 @@
namespace core { namespace core {
int int
CurlSocket::receive_socket(void* easy_handle, curl_socket_t fd, int what, void* userp, void* socketp) { CurlSocket::receive_socket([[maybe_unused]] void* easy_handle, curl_socket_t fd, int what, void* userp, void* socketp) {
CurlStack* stack = (CurlStack*)userp; CurlStack* stack = (CurlStack*)userp;
CurlSocket* socket = (CurlSocket*)socketp; CurlSocket* socket = (CurlSocket*)socketp;
@@ -58,8 +60,7 @@ CurlSocket::receive_socket(void* easy_handle, curl_socket_t fd, int what, void*
} }
CurlSocket::~CurlSocket() { CurlSocket::~CurlSocket() {
if (m_fileDesc != -1) assert(m_fileDesc == -1 && "CurlSocket::~CurlSocket() m_fileDesc != -1.");
throw torrent::internal_error("CurlSocket::~CurlSocket() m_fileDesc != -1.");
} }
void void
src/display/window_log.cc
+4 -38
View File
@@ -1,44 +1,8 @@
// 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 <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#include "config.h" #include "config.h"
#include <ctime> #include <ctime>
#include <torrent/torrent.h> #include <torrent/torrent.h>
#include <torrent/utils/thread_base.h> #include <torrent/utils/thread.h>
#include "canvas.h" #include "canvas.h"
#include "utils.h" #include "utils.h"
@@ -54,7 +18,9 @@ WindowLog::WindowLog(torrent::log_buffer* l) :
unsigned int signal_index = torrent::main_thread()->signal_bitfield()->add_signal(std::bind(&WindowLog::receive_update, this)); unsigned int signal_index = torrent::main_thread()->signal_bitfield()->add_signal(std::bind(&WindowLog::receive_update, this));
m_log->lock_and_set_update_slot(std::bind(&torrent::thread_base::send_event_signal, torrent::main_thread(), signal_index, false)); m_log->lock_and_set_update_slot([signal_index]() {
torrent::main_thread()->send_event_signal(signal_index, false);
});
} }
WindowLog::~WindowLog() { WindowLog::~WindowLog() {
src/main.cc
+2 -2
View File
@@ -182,7 +182,7 @@ main(int argc, char** argv) {
// platforms that do not properly pass signals to the target // platforms that do not properly pass signals to the target
// threads. Use '--enable-interrupt-socket' when configuring // threads. Use '--enable-interrupt-socket' when configuring
// LibTorrent to enable this workaround. // LibTorrent to enable this workaround.
if (torrent::thread_base::should_handle_sigusr1()) if (torrent::utils::Thread::should_handle_sigusr1())
SignalHandler::set_handler(SIGUSR1, std::bind(&do_nothing)); SignalHandler::set_handler(SIGUSR1, std::bind(&do_nothing));
torrent::log_add_group_output(torrent::LOG_NOTICE, "important"); torrent::log_add_group_output(torrent::LOG_NOTICE, "important");
@@ -457,7 +457,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: "); rpc::commands.call_catch("event.system.startup_done", rpc::make_target(), "startup_done", "System startup_done event action failed: ");
torrent::thread_base::event_loop(torrent::main_thread()); torrent::utils::Thread::event_loop(torrent::main_thread());
control->core()->download_list()->session_save(); control->core()->download_list()->session_save();
control->cleanup(); control->cleanup();
src/rpc/scgi.cc
+4 -38
View File
@@ -1,39 +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 <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#include "config.h" #include "config.h"
#include "rpc/scgi_task.h" #include "rpc/scgi_task.h"
@@ -168,7 +132,8 @@ SCgi::event_error() {
bool bool
SCgi::receive_call(SCgiTask* task, const char* buffer, uint32_t length) { SCgi::receive_call(SCgiTask* task, const char* buffer, uint32_t length) {
bool result = false; bool result = false;
torrent::thread_base::acquire_global_lock();
torrent::utils::Thread::acquire_global_lock();
torrent::main_thread()->interrupt(); torrent::main_thread()->interrupt();
switch (task->content_type()) { switch (task->content_type()) {
@@ -178,8 +143,9 @@ SCgi::receive_call(SCgiTask* task, const char* buffer, uint32_t length) {
case rpc::SCgiTask::ContentType::XML: case rpc::SCgiTask::ContentType::XML:
result = rpc.process(RpcManager::RPCType::XML, buffer, length, [task](const char* b, uint32_t l) { return task->receive_write(b, l); }); result = rpc.process(RpcManager::RPCType::XML, buffer, length, [task](const char* b, uint32_t l) { return task->receive_write(b, l); });
break; break;
} }
torrent::thread_base::release_global_lock(); torrent::utils::Thread::release_global_lock();
return result; return result;
} }
src/thread_base.h
+2 -38
View File
@@ -1,46 +1,10 @@
// libTorrent - BitTorrent library
// 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 <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#ifndef RTORRENT_UTILS_THREAD_BASE_H #ifndef RTORRENT_UTILS_THREAD_BASE_H
#define RTORRENT_UTILS_THREAD_BASE_H #define RTORRENT_UTILS_THREAD_BASE_H
#include <memory> #include <memory>
#include <pthread.h> #include <pthread.h>
#include <sys/types.h> #include <sys/types.h>
#include <torrent/utils/thread_base.h> #include <torrent/utils/thread.h>
#include "rak/priority_queue_default.h" #include "rak/priority_queue_default.h"
#include "core/poll_manager.h" #include "core/poll_manager.h"
@@ -49,7 +13,7 @@
class thread_queue_hack; class thread_queue_hack;
class ThreadBase : public torrent::thread_base { class ThreadBase : public torrent::utils::Thread {
public: public:
typedef rak::priority_queue_default priority_queue; typedef rak::priority_queue_default priority_queue;
typedef void (*thread_base_func)(ThreadBase*); typedef void (*thread_base_func)(ThreadBase*);
src/ui/element_log_complete.cc
+5 -39
View File
@@ -1,44 +1,8 @@
// 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 <jaris@ifi.uio.no>
//
// Skomakerveien 33
// 3185 Skoppum, NORWAY
#include "config.h" #include "config.h"
#include <torrent/exceptions.h> #include <torrent/exceptions.h>
#include <torrent/torrent.h> #include <torrent/torrent.h>
#include <torrent/utils/thread_base.h> #include <torrent/utils/thread.h>
#include "display/frame.h" #include "display/frame.h"
#include "display/manager.h" #include "display/manager.h"
@@ -56,11 +20,13 @@ ElementLogComplete::ElementLogComplete(torrent::log_buffer* 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()->signal_bitfield()->add_signal(std::bind(&ElementLogComplete::received_update, this));
m_log->lock_and_set_update_slot(std::bind(&torrent::thread_base::send_event_signal, torrent::main_thread(), signal_index, false)); m_log->lock_and_set_update_slot([signal_index]() {
torrent::main_thread()->send_event_signal(signal_index, false);
});
} }
void void
ElementLogComplete::activate(display::Frame* frame, bool focus) { ElementLogComplete::activate(display::Frame* frame, [[maybe_unused]] bool focus) {
if (is_active()) if (is_active())
throw torrent::internal_error("ui::ElementLogComplete::activate(...) is_active()."); throw torrent::internal_error("ui::ElementLogComplete::activate(...) is_active().");