fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-08 07:09:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SCGI threading and added missing header.

Browse Source
This commit is contained in:
Jari Sundell
2025-03-31 18:26:07 +02:00
committed by GitHub
parent 2a998df4f1
commit 2ab7460cbc
9 changed files with 135 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_local.cc
+5 -3
View File
@@ -220,9 +220,11 @@ initialize_command_local() {
CMD2_VAR_LIST ("file.prioritize_toc.first"); CMD2_VAR_LIST ("file.prioritize_toc.first");
CMD2_VAR_LIST ("file.prioritize_toc.last"); CMD2_VAR_LIST ("file.prioritize_toc.last");
CMD2_ANY ("system.files.advise_random", std::bind(&FM_t::advise_random, fileManager)); CMD2_ANY ("system.files.advise_random", std::bind(&FM_t::advise_random, fileManager));
CMD2_ANY_VALUE_V ("system.files.advise_random.set", std::bind(&FM_t::set_advise_random, fileManager, std::placeholders::_2)); CMD2_ANY_VALUE_V ("system.files.advise_random.set", std::bind(&FM_t::set_advise_random, fileManager, std::placeholders::_2));
CMD2_VAR_BOOL ("system.files.session.fdatasync", true); // CMD2_ANY ("system.files.advise_random.hashing", std::bind(&FM_t::advise_random_hashing, fileManager));
// CMD2_ANY_VALUE_V ("system.files.advise_random.hashing.set", std::bind(&FM_t::set_advise_random_hashing, fileManager, std::placeholders::_2));
CMD2_VAR_BOOL ("system.files.session.fdatasync", true);
CMD2_ANY ("system.files.opened_counter", std::bind(&FM_t::files_opened_counter, fileManager)); CMD2_ANY ("system.files.opened_counter", std::bind(&FM_t::files_opened_counter, fileManager));
CMD2_ANY ("system.files.closed_counter", std::bind(&FM_t::files_closed_counter, fileManager)); CMD2_ANY ("system.files.closed_counter", std::bind(&FM_t::files_closed_counter, fileManager));
src/rpc/command_map.cc
-36
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 <torrent/exceptions.h> #include <torrent/exceptions.h>
src/rpc/parse_commands.cc
+8 -44
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 <algorithm> #include <algorithm>
@@ -43,8 +7,8 @@
#include <rak/path.h> #include <rak/path.h>
#include <torrent/exceptions.h> #include <torrent/exceptions.h>
#include "parse.h" #include "rpc/parse.h"
#include "parse_commands.h" #include "rpc/parse_commands.h"
#include "rpc/rpc_manager.h" #include "rpc/rpc_manager.h"
namespace rpc { namespace rpc {
@@ -128,12 +92,12 @@ parse_command(target_type target, const char* first, const char* last) {
if (first == last || *first == '#') if (first == last || *first == '#')
return std::make_pair(torrent::Object(), first); return std::make_pair(torrent::Object(), first);
char key[128]; char key[128];
first = parse_command_name(first, last, key, key + 128); first = parse_command_name(first, last, key, key + 128);
first = std::find_if(first, last, [&](char c) { return !command_map_is_space(c); }); first = std::find_if(first, last, [&](char c) { return !command_map_is_space(c); });
if (first == last || *first != '=') if (first == last || *first != '=')
throw torrent::input_error("Could not find '=' in command '" + std::string(key) + "'."); throw torrent::input_error("Could not find '=' in command '" + std::string(key) + "'.");
@@ -144,7 +108,7 @@ parse_command(target_type target, const char* first, const char* last) {
// the whitespace at the end. This ensures us that the caller // the whitespace at the end. This ensures us that the caller
// doesn't need to do this nor check for junk at the end. // doesn't need to do this nor check for junk at the end.
first = std::find_if(first, last, [&](char c) { return !command_map_is_space(c); }); first = std::find_if(first, last, [&](char c) { return !command_map_is_space(c); });
if (first != last) { if (first != last) {
if (!command_map_is_newline(*first)) if (!command_map_is_newline(*first))
throw torrent::input_error("Junk at end of input."); throw torrent::input_error("Junk at end of input.");
@@ -189,7 +153,7 @@ parse_command_file(const std::string& path) {
while (file.good() while (file.good()
&& !file.getline(buffer + getCount, 4096 - getCount).fail()) { && !file.getline(buffer + getCount, 4096 - getCount).fail()) {
if (file.gcount() == 0) if (file.gcount() == 0)
throw torrent::internal_error("parse_command_file(...) file.gcount() == 0."); throw torrent::internal_error("parse_command_file(...) file.gcount() == 0.");
int lineLength = file.gcount() - 1; int lineLength = file.gcount() - 1;
@@ -198,7 +162,7 @@ parse_command_file(const std::string& path) {
// that the last would also be included in option line. // that the last would also be included in option line.
if (file.eof() && file.get() != '\n') if (file.eof() && file.get() != '\n')
lineLength++; lineLength++;
int escaped = parse_count_escaped(buffer + getCount, buffer + getCount + lineLength); int escaped = parse_count_escaped(buffer + getCount, buffer + getCount + lineLength);
lineNumber++; lineNumber++;
@@ -206,7 +170,7 @@ parse_command_file(const std::string& path) {
if (getCount == 4096 - 1) if (getCount == 4096 - 1)
throw torrent::input_error("Exceeded max line length."); throw torrent::input_error("Exceeded max line length.");
if (escaped & 0x1) { if (escaped & 0x1) {
// Remove the escape characters and continue reading. // Remove the escape characters and continue reading.
getCount -= escaped; getCount -= escaped;
src/rpc/rpc_manager.cc
+3
View File
@@ -100,8 +100,10 @@ bool
RpcManager::process(RPCType type, const char* in_buffer, uint32_t length, slot_response_callback callback) { RpcManager::process(RPCType type, const char* in_buffer, uint32_t length, slot_response_callback callback) {
switch (type) { switch (type) {
case RPCType::XML: case RPCType::XML:
// TODO: 'network.rpc.use_xmlrpc' should be a bool in RpcManager, not a command variable.
if (m_xmlrpc.is_valid() && rpc::call_command_value("network.rpc.use_xmlrpc")) { if (m_xmlrpc.is_valid() && rpc::call_command_value("network.rpc.use_xmlrpc")) {
return m_xmlrpc.process(in_buffer, length, callback); return m_xmlrpc.process(in_buffer, length, callback);
} else { } else {
const std::string response = "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>XML-RPC not supported</string></value></member></struct></fault></methodResponse>"; const std::string response = "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>XML-RPC not supported</string></value></member></struct></fault></methodResponse>";
return callback(response.c_str(), response.size()); return callback(response.c_str(), response.size());
@@ -111,6 +113,7 @@ RpcManager::process(RPCType type, const char* in_buffer, uint32_t length, slot_r
case RPCType::JSON: case RPCType::JSON:
if (rpc::call_command_value("network.rpc.use_jsonrpc")) { if (rpc::call_command_value("network.rpc.use_jsonrpc")) {
return m_jsonrpc.process(in_buffer, length, callback); return m_jsonrpc.process(in_buffer, length, callback);
} else { } else {
const std::string response = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32601,\"message\":\"JSON-RPC not supported\"},\"id\":null}"; const std::string response = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32601,\"message\":\"JSON-RPC not supported\"},\"id\":null}";
return callback(response.c_str(), response.size()); return callback(response.c_str(), response.size());
src/rpc/scgi.cc
+4 -27
View File
@@ -1,6 +1,5 @@
#include "config.h" #include "config.h"
#include "rpc/scgi_task.h"
#include <rak/error_number.h> #include <rak/error_number.h>
#include <rak/socket_address.h> #include <rak/socket_address.h>
#include <sys/un.h> #include <sys/un.h>
@@ -9,12 +8,12 @@
#include <torrent/torrent.h> #include <torrent/torrent.h>
#include <torrent/exceptions.h> #include <torrent/exceptions.h>
#include "utils/socket_fd.h"
#include "control.h" #include "control.h"
#include "globals.h" #include "globals.h"
#include "scgi.h" #include "rpc/scgi_task.h"
#include "parse_commands.h" #include "utils/socket_fd.h"
#include "rpc/scgi.h"
namespace rpc { namespace rpc {
@@ -110,7 +109,6 @@ SCgi::event_read() {
SCgiTask* task = std::find_if(m_task, m_task + max_tasks, std::mem_fn(&SCgiTask::is_available)); SCgiTask* task = std::find_if(m_task, m_task + max_tasks, std::mem_fn(&SCgiTask::is_available));
if (task == m_task + max_tasks) { if (task == m_task + max_tasks) {
// Ergh... just closing for now.
fd.close(); fd.close();
continue; continue;
} }
@@ -129,25 +127,4 @@ SCgi::event_error() {
throw torrent::internal_error("SCGI listener port received an error event."); throw torrent::internal_error("SCGI listener port received an error event.");
} }
bool
SCgi::receive_call(SCgiTask* task, const char* buffer, uint32_t length) {
bool result = false;
torrent::utils::Thread::acquire_global_lock();
torrent::main_thread()->interrupt();
switch (task->content_type()) {
case rpc::SCgiTask::ContentType::JSON:
result = rpc.process(RpcManager::RPCType::JSON, buffer, length, [task](const char* b, uint32_t l) { return task->receive_write(b, l); });
break;
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); });
break;
}
torrent::utils::Thread::release_global_lock();
return result;
}
} }
src/rpc/scgi.h
+4 -45
View File
@@ -1,46 +1,11 @@
// 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
#ifndef RTORRENT_RPC_SCGI_H #ifndef RTORRENT_RPC_SCGI_H
#define RTORRENT_RPC_SCGI_H #define RTORRENT_RPC_SCGI_H
#include <functional> #include <functional>
#include <torrent/event.h> #include <torrent/event.h>
#include "scgi_task.h" #include "rpc/scgi_task.h"
#include "utils/socket_fd.h"
namespace utils { namespace utils {
class SocketFd; class SocketFd;
@@ -48,17 +13,14 @@ namespace utils {
namespace rpc { namespace rpc {
class lt_cacheline_aligned SCgi : public torrent::Event { class SCgi : public torrent::Event {
public: public:
typedef std::function<bool (const char*, uint32_t)> slot_write;
static const int max_tasks = 100; static const int max_tasks = 100;
// Global lock:
SCgi() : m_logFd(-1) {} SCgi() : m_logFd(-1) {}
virtual ~SCgi(); virtual ~SCgi();
const char* type_name() const { return "scgi"; } virtual const char* type_name() const { return "scgi"; }
void open_port(void* sa, unsigned int length, bool dontRoute); void open_port(void* sa, unsigned int length, bool dontRoute);
void open_named(const std::string& filename); void open_named(const std::string& filename);
@@ -71,13 +33,10 @@ public:
int log_fd() const { return m_logFd; } int log_fd() const { return m_logFd; }
void set_log_fd(int fd) { m_logFd = fd; } void set_log_fd(int fd) { m_logFd = fd; }
// Thread local:
virtual void event_read(); virtual void event_read();
virtual void event_write(); virtual void event_write();
virtual void event_error(); virtual void event_error();
bool receive_call(SCgiTask* task, const char* buffer, uint32_t length);
utils::SocketFd& get_fd() { return *reinterpret_cast<utils::SocketFd*>(&m_fileDesc); } utils::SocketFd& get_fd() { return *reinterpret_cast<utils::SocketFd*>(&m_fileDesc); }
private: private:
src/rpc/scgi_task.cc
+97 -59
View File
@@ -8,26 +8,22 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <torrent/exceptions.h> #include <torrent/exceptions.h>
#include <torrent/poll.h> #include <torrent/poll.h>
#include <torrent/torrent.h>
#include <torrent/utils/log.h> #include <torrent/utils/log.h>
#include <torrent/utils/thread.h>
#include "utils/socket_fd.h"
#include "control.h" #include "control.h"
#include "globals.h" #include "globals.h"
#include "scgi.h" #include "scgi.h"
#include "rpc/parse_commands.h"
// Test: #include "utils/socket_fd.h"
// #include "core/manager.h"
// #include <rak/timer.h>
// static rak::timer scgiTimer;
namespace rpc { namespace rpc {
// If bufferSize is zero then memcpy won't do anything. // If bufferSize is zero then memcpy won't do anything.
inline void inline void
SCgiTask::realloc_buffer(uint32_t size, const char* buffer, uint32_t bufferSize) { SCgiTask::realloc_buffer(uint32_t size, const char* buffer, uint32_t bufferSize) {
char* tmp = rak::cacheline_allocator<char>::alloc_size(size); char* tmp = new char[size];
std::memcpy(tmp, buffer, bufferSize); std::memcpy(tmp, buffer, bufferSize);
::free(m_buffer); ::free(m_buffer);
@@ -36,17 +32,16 @@ SCgiTask::realloc_buffer(uint32_t size, const char* buffer, uint32_t bufferSize)
void void
SCgiTask::open(SCgi* parent, int fd) { SCgiTask::open(SCgi* parent, int fd) {
m_parent = parent; m_parent = parent;
m_fileDesc = fd; m_fileDesc = fd;
m_buffer = rak::cacheline_allocator<char>::alloc_size((m_bufferSize = default_buffer_size) + 1); m_buffer = new char[default_buffer_size + 1];
m_position = m_buffer; m_buffer_size = default_buffer_size;
m_body = NULL; m_position = m_buffer;
m_body = NULL;
worker_thread->poll()->open(this); torrent::thread_self->poll()->open(this);
worker_thread->poll()->insert_read(this); torrent::thread_self->poll()->insert_read(this);
worker_thread->poll()->insert_error(this); torrent::thread_self->poll()->insert_error(this);
// scgiTimer = rak::timer::current();
} }
void void
@@ -54,26 +49,26 @@ SCgiTask::close() {
if (!get_fd().is_valid()) if (!get_fd().is_valid())
return; return;
worker_thread->poll()->remove_read(this); torrent::main_thread()->cancel_callback_and_wait(this);
worker_thread->poll()->remove_write(this); torrent::thread_self->cancel_callback(this);
worker_thread->poll()->remove_error(this);
worker_thread->poll()->close(this); torrent::thread_self->poll()->remove_read(this);
torrent::thread_self->poll()->remove_write(this);
torrent::thread_self->poll()->remove_error(this);
torrent::thread_self->poll()->close(this);
get_fd().close(); get_fd().close();
get_fd().clear(); get_fd().clear();
::free(m_buffer); auto lock = std::lock_guard<std::mutex>(m_result_mutex);
m_buffer = NULL;
// Test delete[] m_buffer;
// char buffer[512]; m_buffer = NULL;
// sprintf(buffer, "SCgi system call processed: %i", (int)(rak::timer::current() - scgiTimer).usec());
// control->core()->push_log(std::string(buffer));
} }
void void
SCgiTask::event_read() { SCgiTask::event_read() {
int bytes = ::recv(m_fileDesc, m_position, m_bufferSize - (m_position - m_buffer), 0); int bytes = ::recv(m_fileDesc, m_position, m_buffer_size - (m_position - m_buffer), 0);
if (bytes <= 0) { if (bytes <= 0) {
if (bytes == 0 || !rak::error_number::current().is_blocked_momentary()) if (bytes == 0 || !rak::error_number::current().is_blocked_momentary())
@@ -119,17 +114,21 @@ SCgiTask::event_read() {
while (current < header_end) { while (current < header_end) {
char* key = current; char* key = current;
char* key_end = static_cast<char*>(std::memchr(current, '\0', header_end - current)); char* key_end = static_cast<char*>(std::memchr(current, '\0', header_end - current));
if (!key_end) if (!key_end)
goto event_read_failed; goto event_read_failed;
current = key_end + 1; current = key_end + 1;
if (current >= header_end) if (current >= header_end)
goto event_read_failed; goto event_read_failed;
char* value = current; char* value = current;
char* value_end = static_cast<char*>(std::memchr(current, '\0', header_end - current)); char* value_end = static_cast<char*>(std::memchr(current, '\0', header_end - current));
if (!value_end) if (!value_end)
goto event_read_failed; goto event_read_failed;
current = value_end + 1; current = value_end + 1;
if (strcmp(key, "CONTENT_LENGTH") == 0) { if (strcmp(key, "CONTENT_LENGTH") == 0) {
@@ -164,45 +163,41 @@ SCgiTask::event_read() {
goto event_read_failed; goto event_read_failed;
} }
if ((unsigned int)(content_length + header_size) < m_bufferSize) { if ((unsigned int)(content_length + header_size) < m_buffer_size) {
m_bufferSize = content_length + header_size; m_buffer_size = content_length + header_size;
} else if ((unsigned int)content_length <= default_buffer_size) { } else if ((unsigned int)content_length <= default_buffer_size) {
m_bufferSize = content_length; m_buffer_size = content_length;
std::memmove(m_buffer, m_body, std::distance(m_body, m_position)); std::memmove(m_buffer, m_body, std::distance(m_body, m_position));
m_position = m_buffer + std::distance(m_body, m_position); m_position = m_buffer + std::distance(m_body, m_position);
m_body = m_buffer; m_body = m_buffer;
} else { } else {
realloc_buffer((m_bufferSize = content_length) + 1, m_body, std::distance(m_body, m_position)); realloc_buffer((m_buffer_size = content_length) + 1, m_body, std::distance(m_body, m_position));
m_position = m_buffer + std::distance(m_body, m_position); m_position = m_buffer + std::distance(m_body, m_position);
m_body = m_buffer; m_body = m_buffer;
} }
} }
if ((unsigned int)std::distance(m_buffer, m_position) != m_bufferSize) if ((unsigned int)std::distance(m_buffer, m_position) != m_buffer_size)
return; return;
worker_thread->poll()->remove_read(this); torrent::thread_self->poll()->remove_read(this);
worker_thread->poll()->insert_write(this);
if (m_parent->log_fd() >= 0) { if (m_parent->log_fd() >= 0) {
int __UNUSED result; int __UNUSED result;
// Clean up logging, this is just plain ugly... // Clean up logging, this is just plain ugly...
// write(m_logFd, "\n---\n", sizeof("\n---\n")); // write(m_logFd, "\n---\n", sizeof("\n---\n"));
result = write(m_parent->log_fd(), m_buffer, m_bufferSize); result = write(m_parent->log_fd(), m_buffer, m_buffer_size);
result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n")); result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n"));
} }
lt_log_print_dump(torrent::LOG_RPC_DUMP, m_body, m_bufferSize - std::distance(m_buffer, m_body), "scgi", "RPC read.", 0); lt_log_print_dump(torrent::LOG_RPC_DUMP, m_body, m_buffer_size - std::distance(m_buffer, m_body), "scgi", "RPC read.", 0);
// Close if the call failed, else stay open to write back data.
if (!m_parent->receive_call(this, m_body, m_bufferSize - std::distance(m_buffer, m_body)))
close();
receive_call(m_body, m_buffer_size - std::distance(m_buffer, m_body));
return; return;
event_read_failed: event_read_failed:
@@ -215,9 +210,9 @@ SCgiTask::event_write() {
// Apple and Solaris do not support MSG_NOSIGNAL, // Apple and Solaris do not support MSG_NOSIGNAL,
// so disable this fix until we find a better solution // so disable this fix until we find a better solution
#if defined(__APPLE__) || defined(__sun__) #if defined(__APPLE__) || defined(__sun__)
int bytes = ::send(m_fileDesc, m_position, m_bufferSize, 0); int bytes = ::send(m_fileDesc, m_position, m_buffer_size, 0);
#else #else
int bytes = ::send(m_fileDesc, m_position, m_bufferSize, MSG_NOSIGNAL); int bytes = ::send(m_fileDesc, m_position, m_buffer_size, MSG_NOSIGNAL);
#endif #endif
if (bytes == -1) { if (bytes == -1) {
@@ -228,9 +223,9 @@ SCgiTask::event_write() {
} }
m_position += bytes; m_position += bytes;
m_bufferSize -= bytes; m_buffer_size -= bytes;
if (bytes == 0 || m_bufferSize == 0) if (bytes == 0 || m_buffer_size == 0)
return close(); return close();
} }
@@ -239,13 +234,61 @@ SCgiTask::event_error() {
close(); close();
} }
bool 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 result_callback = [this, scgi_thread](const char* b, uint32_t l) {
receive_write(b, l);
scgi_thread->callback(this, [this]() {
// Only need to lock once here as a memory barrier.
m_result_mutex.lock();
m_result_mutex.unlock();
torrent::thread_self->poll()->insert_write(this);
});
};
auto lock = std::lock_guard<std::mutex>(m_result_mutex);
switch (content_type()) {
case rpc::SCgiTask::ContentType::JSON:
torrent::main_thread()->callback(this, [buffer, length, result_callback]() {
rpc.process(RpcManager::RPCType::JSON, buffer, length,
[result_callback](const char* b, uint32_t l) {
result_callback(b, l);
return true;
});
});
break;
case rpc::SCgiTask::ContentType::XML:
torrent::main_thread()->callback(this, [buffer, length, result_callback]() {
rpc.process(RpcManager::RPCType::XML, buffer, length,
[result_callback](const char* b, uint32_t l) {
result_callback(b, l);
return true;
});
});
break;
default:
throw torrent::internal_error("SCgiTask::receive_call(...) received bad input.");
}
}
void
SCgiTask::receive_write(const char* buffer, uint32_t length) { SCgiTask::receive_write(const char* buffer, uint32_t length) {
if (buffer == NULL || length > (100 << 20)) if (buffer == NULL || length > (100 << 20))
throw torrent::internal_error("SCgiTask::receive_write(...) received bad input."); throw torrent::internal_error("SCgiTask::receive_write(...) received bad input.");
auto lock = std::lock_guard<std::mutex>(m_result_mutex);
// Need to cast due to a bug in MacOSX gcc-4.0.1. // Need to cast due to a bug in MacOSX gcc-4.0.1.
if (length + 256 > std::max(m_bufferSize, (unsigned int)default_buffer_size)) if (length + 256 > std::max(m_buffer_size, (unsigned int)default_buffer_size))
realloc_buffer(length + 256, NULL, 0); realloc_buffer(length + 256, NULL, 0);
const auto header = m_content_type == ContentType::JSON const auto header = m_content_type == ContentType::JSON
@@ -253,25 +296,20 @@ SCgiTask::receive_write(const char* buffer, uint32_t length) {
: "Status: 200 OK\r\nContent-Type: text/xml\r\nContent-Length: %i\r\n\r\n"; : "Status: 200 OK\r\nContent-Type: text/xml\r\nContent-Length: %i\r\n\r\n";
// Who ever bothers to check the return value? // Who ever bothers to check the return value?
int headerSize = sprintf(m_buffer, header, length); int headerSize = snprintf(m_buffer, m_buffer_size, header, length);
m_position = m_buffer; m_position = m_buffer;
m_bufferSize = length + headerSize; m_buffer_size = length + headerSize;
std::memcpy(m_buffer + headerSize, buffer, length); std::memcpy(m_buffer + headerSize, buffer, length);
if (m_parent->log_fd() >= 0) { if (m_parent->log_fd() >= 0) {
int __UNUSED result; int result [[maybe_unused]];
// Clean up logging, this is just plain ugly... result = write(m_parent->log_fd(), m_buffer, m_buffer_size);
// write(m_logFd, "\n---\n", sizeof("\n---\n"));
result = write(m_parent->log_fd(), m_buffer, m_bufferSize);
result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n")); result = write(m_parent->log_fd(), "\n---\n", sizeof("\n---\n"));
} }
lt_log_print_dump(torrent::LOG_RPC_DUMP, m_buffer, m_bufferSize, "scgi", "RPC write.", 0); lt_log_print_dump(torrent::LOG_RPC_DUMP, m_buffer, m_buffer_size, "scgi", "RPC write.", 0);
event_write();
return true;
} }
} // namespace rpc } // namespace rpc
src/rpc/scgi_task.h
+12 -43
View File
@@ -1,42 +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
#ifndef RTORRENT_RPC_SCGI_TASK_H #ifndef RTORRENT_RPC_SCGI_TASK_H
#define RTORRENT_RPC_SCGI_TASK_H #define RTORRENT_RPC_SCGI_TASK_H
#include <memory>
#include <mutex>
#include <torrent/event.h> #include <torrent/event.h>
namespace utils { namespace utils {
@@ -69,20 +35,23 @@ public:
virtual void event_write(); virtual void event_write();
virtual void event_error(); virtual void event_error();
bool receive_write(const char* buffer, uint32_t length); utils::SocketFd& get_fd() { return *reinterpret_cast<utils::SocketFd*>(&m_fileDesc); }
utils::SocketFd& get_fd() { return *reinterpret_cast<utils::SocketFd*>(&m_fileDesc); }
private: private:
inline void realloc_buffer(uint32_t size, const char* buffer, uint32_t bufferSize); inline void realloc_buffer(uint32_t size, const char* buffer, uint32_t bufferSize);
void receive_call(const char* buffer, uint32_t length);
void receive_write(const char* buffer, uint32_t length);
SCgi* m_parent; SCgi* m_parent;
char* m_buffer; std::mutex m_result_mutex;
char* m_position;
char* m_body;
unsigned int m_bufferSize; char* m_buffer{nullptr};
char* m_position{nullptr};
char* m_body{nullptr};
unsigned int m_buffer_size{0};
ContentType m_content_type{ XML }; ContentType m_content_type{ XML };
}; };
test/Makefile.am
+2 -1
View File
@@ -17,7 +17,8 @@ rtorrent_Test_Common = \
helpers/progress_listener.cc \ helpers/progress_listener.cc \
helpers/progress_listener.h \ helpers/progress_listener.h \
helpers/protectors.cc \ helpers/protectors.cc \
helpers/protectors.h helpers/protectors.h \
helpers/utils.h
rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \ rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
rpc/command_test.cc \ rpc/command_test.cc \