mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-08 11:12:31 +00:00
* Added "d_delete_tied" command.
* Moved CommandScheduler into src/rpc. * Fixed a bug in the "download_list" command. * Partial cleanup of the tracker list. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@924 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
+6
-2
@@ -2,14 +2,18 @@ noinst_LIBRARIES = libsub_rpc.a
|
||||
|
||||
libsub_rpc_a_SOURCES = \
|
||||
command.h \
|
||||
command_download_slot.cc \
|
||||
command_download_slot.h \
|
||||
command_map.cc \
|
||||
command_map.h \
|
||||
command_scheduler.cc \
|
||||
command_scheduler.h \
|
||||
command_scheduler_item.cc \
|
||||
command_scheduler_item.h \
|
||||
command_slot.cc \
|
||||
command_slot.h \
|
||||
command_variable.cc \
|
||||
command_variable.h \
|
||||
command_download_slot.cc \
|
||||
command_download_slot.h \
|
||||
fast_cgi.cc \
|
||||
fast_cgi.h \
|
||||
parse.cc \
|
||||
|
||||
@@ -0,0 +1,216 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2005-2006, 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 <algorithm>
|
||||
#include <cstdlib>
|
||||
#include <time.h>
|
||||
#include <rak/functional.h>
|
||||
#include <rak/string_manip.h>
|
||||
#include <torrent/exceptions.h>
|
||||
|
||||
#include "command_scheduler.h"
|
||||
#include "command_scheduler_item.h"
|
||||
#include "parse_commands.h"
|
||||
|
||||
namespace rpc {
|
||||
|
||||
CommandScheduler::~CommandScheduler() {
|
||||
std::for_each(begin(), end(), rak::call_delete<CommandSchedulerItem>());
|
||||
}
|
||||
|
||||
CommandScheduler::iterator
|
||||
CommandScheduler::find(const std::string& key) {
|
||||
return std::find_if(begin(), end(), rak::equal(key, std::mem_fun(&CommandSchedulerItem::key)));
|
||||
}
|
||||
|
||||
CommandScheduler::iterator
|
||||
CommandScheduler::insert(const std::string& key) {
|
||||
if (key.empty())
|
||||
throw torrent::input_error("Scheduler received an empty key.");
|
||||
|
||||
iterator itr = find(key);
|
||||
|
||||
if (itr == end())
|
||||
itr = base_type::insert(end(), NULL);
|
||||
else
|
||||
delete *itr;
|
||||
|
||||
*itr = new CommandSchedulerItem(key);
|
||||
(*itr)->set_slot(rak::bind_mem_fn(this, &CommandScheduler::call_item, *itr));
|
||||
|
||||
return itr;
|
||||
}
|
||||
|
||||
void
|
||||
CommandScheduler::erase(iterator itr) {
|
||||
if (itr == end())
|
||||
return;
|
||||
|
||||
delete *itr;
|
||||
base_type::erase(itr);
|
||||
}
|
||||
|
||||
void
|
||||
CommandScheduler::call_item(value_type item) {
|
||||
if (item->is_queued())
|
||||
throw torrent::internal_error("CommandScheduler::call_item(...) called but item is still queued.");
|
||||
|
||||
if (std::find(begin(), end(), item) == end())
|
||||
throw torrent::internal_error("CommandScheduler::call_item(...) called but the item isn't in the scheduler.");
|
||||
|
||||
// Remove the item before calling the command if it should be
|
||||
// removed.
|
||||
|
||||
try {
|
||||
rpc::parse_command_single_std(item->command());
|
||||
|
||||
} catch (torrent::input_error& e) {
|
||||
if (m_slotErrorMessage.is_valid())
|
||||
m_slotErrorMessage("Scheduled command failed: " + item->key() + ": " + e.what());
|
||||
}
|
||||
|
||||
// Still schedule if we caught a torrrent::input_error?
|
||||
rak::timer next = item->next_time_scheduled();
|
||||
|
||||
if (next == rak::timer()) {
|
||||
// Remove from scheduler?
|
||||
return;
|
||||
}
|
||||
|
||||
if (next <= cachedTime)
|
||||
throw torrent::internal_error("CommandScheduler::call_item(...) tried to schedule a zero interval item.");
|
||||
|
||||
item->enable(next);
|
||||
}
|
||||
|
||||
void
|
||||
CommandScheduler::parse(const std::string& key, const std::string& bufAbsolute, const std::string& bufInterval, const std::string& command) {
|
||||
// char key[21];
|
||||
// char bufAbsolute[21];
|
||||
// char bufInterval[21];
|
||||
// char command[2048];
|
||||
|
||||
// if (std::sscanf(arg.c_str(), "%20[^,],%20[^,],%20[^,],%2047[^\n]", key, bufAbsolute, bufInterval, command) != 4)
|
||||
// throw torrent::input_error("Invalid arguments to command.");
|
||||
|
||||
uint32_t absolute = parse_absolute(bufAbsolute.c_str());
|
||||
uint32_t interval = parse_interval(bufInterval.c_str());
|
||||
|
||||
CommandSchedulerItem* item = *insert(key);
|
||||
|
||||
item->set_command(command);
|
||||
item->set_interval(interval);
|
||||
|
||||
item->enable((cachedTime + rak::timer::from_seconds(absolute)).round_seconds());
|
||||
}
|
||||
|
||||
uint32_t
|
||||
CommandScheduler::parse_absolute(const char* str) {
|
||||
Time result = parse_time(str);
|
||||
time_t t;
|
||||
|
||||
// Do the local time thing.
|
||||
struct tm local;
|
||||
|
||||
switch (result.first) {
|
||||
case 1:
|
||||
return result.second;
|
||||
|
||||
case 2:
|
||||
t = cachedTime.tval().tv_sec;
|
||||
|
||||
if (localtime_r(&t, &local) == NULL)
|
||||
throw torrent::input_error("Could not convert unix time to local time.");
|
||||
|
||||
return (result.second + 3600 - 60 * local.tm_min - local.tm_sec) % 3600;
|
||||
|
||||
case 3:
|
||||
t = cachedTime.tval().tv_sec;
|
||||
|
||||
if (localtime_r(&t, &local) == NULL)
|
||||
throw torrent::input_error("Could not convert unix time to local time.");
|
||||
|
||||
return (result.second + 24 * 3600 - 3600 * local.tm_hour - 60 * local.tm_min - local.tm_sec) % (24 * 3600);
|
||||
|
||||
case 0:
|
||||
default:
|
||||
throw torrent::input_error("Could not parse interval.");
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t
|
||||
CommandScheduler::parse_interval(const char* str) {
|
||||
Time result = parse_time(str);
|
||||
|
||||
if (result.first == 0)
|
||||
throw torrent::input_error("Could not parse interval.");
|
||||
|
||||
return result.second;
|
||||
}
|
||||
|
||||
CommandScheduler::Time
|
||||
CommandScheduler::parse_time(const char* str) {
|
||||
Time result(0, 0);
|
||||
|
||||
while (true) {
|
||||
char* pos;
|
||||
result.first++;
|
||||
result.second += strtol(str, &pos, 10);
|
||||
|
||||
if (pos == str || result.second < 0)
|
||||
return Time(0, 0);
|
||||
|
||||
while (std::isspace(*pos))
|
||||
++pos;
|
||||
|
||||
if (*pos == '\0')
|
||||
return result;
|
||||
|
||||
if (*pos != ':' || result.first > 3)
|
||||
return Time(0, 0);
|
||||
|
||||
if (result.first < 3)
|
||||
result.second *= 60;
|
||||
else
|
||||
result.second *= 24;
|
||||
|
||||
str = pos + 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2005-2006, 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_COMMAND_SCHEDULER_H
|
||||
#define RTORRENT_COMMAND_SCHEDULER_H
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <inttypes.h>
|
||||
#include <rak/functional_fun.h>
|
||||
|
||||
namespace rpc {
|
||||
|
||||
class CommandSchedulerItem;
|
||||
|
||||
class CommandScheduler : public std::vector<CommandSchedulerItem*> {
|
||||
public:
|
||||
typedef rak::function1<void, const std::string&> SlotString;
|
||||
typedef std::pair<int, int> Time;
|
||||
typedef std::vector<CommandSchedulerItem*> base_type;
|
||||
|
||||
using base_type::value_type;
|
||||
using base_type::begin;
|
||||
using base_type::end;
|
||||
|
||||
CommandScheduler() {}
|
||||
~CommandScheduler();
|
||||
|
||||
void set_slot_error_message(SlotString::base_type* s) { m_slotErrorMessage.set(s); }
|
||||
|
||||
// slot_error_message or something.
|
||||
|
||||
iterator find(const std::string& key);
|
||||
|
||||
// If the key already exists then the old item is deleted. It is
|
||||
// safe to call erase on end().
|
||||
iterator insert(const std::string& key);
|
||||
void erase(iterator itr);
|
||||
void erase_str(const std::string& key) { erase(find(key)); }
|
||||
|
||||
void parse(const std::string& key, const std::string& bufAbsolute, const std::string& bufInterval, const std::string& command);
|
||||
|
||||
static uint32_t parse_absolute(const char* str);
|
||||
static uint32_t parse_interval(const char* str);
|
||||
|
||||
static Time parse_time(const char* str);
|
||||
|
||||
private:
|
||||
void call_item(value_type item);
|
||||
|
||||
SlotString m_slotErrorMessage;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,88 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2005-2006, 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 <torrent/exceptions.h>
|
||||
|
||||
#include "command_scheduler_item.h"
|
||||
|
||||
namespace rpc {
|
||||
|
||||
CommandSchedulerItem::~CommandSchedulerItem() {
|
||||
priority_queue_erase(&taskScheduler, &m_task);
|
||||
}
|
||||
|
||||
void
|
||||
CommandSchedulerItem::enable(rak::timer t) {
|
||||
if (t == rak::timer())
|
||||
throw torrent::internal_error("CommandSchedulerItem::enable() t == rak::timer().");
|
||||
|
||||
if (is_queued())
|
||||
disable();
|
||||
|
||||
// If 'first' is zero then we execute the task
|
||||
// immediately. ''interval()'' will not return zero so we never end
|
||||
// up in an infinit loop.
|
||||
m_timeScheduled = t;
|
||||
priority_queue_insert(&taskScheduler, &m_task, t);
|
||||
}
|
||||
|
||||
void
|
||||
CommandSchedulerItem::disable() {
|
||||
m_timeScheduled = rak::timer();
|
||||
priority_queue_erase(&taskScheduler, &m_task);
|
||||
}
|
||||
|
||||
rak::timer
|
||||
CommandSchedulerItem::next_time_scheduled() const {
|
||||
if (m_interval == 0)
|
||||
return rak::timer();
|
||||
|
||||
if (m_timeScheduled == rak::timer())
|
||||
throw torrent::internal_error("CommandSchedulerItem::next_time_scheduled() m_timeScheduled == rak::timer().");
|
||||
|
||||
rak::timer next = m_timeScheduled;
|
||||
|
||||
// This should be done in a non-looping manner.
|
||||
do {
|
||||
next += rak::timer::from_seconds(m_interval);
|
||||
} while (next <= cachedTime.round_seconds());
|
||||
|
||||
return next;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2005-2006, 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_COMMAND_SCHEDULER_ITEM_H
|
||||
#define RTORRENT_COMMAND_SCHEDULER_ITEM_H
|
||||
|
||||
#include "globals.h"
|
||||
|
||||
namespace rpc {
|
||||
|
||||
class CommandSchedulerItem {
|
||||
public:
|
||||
typedef rak::function0<void> Slot;
|
||||
|
||||
CommandSchedulerItem(const std::string& key) : m_key(key), m_interval(0) {}
|
||||
~CommandSchedulerItem();
|
||||
|
||||
bool is_queued() const { return m_task.is_queued(); }
|
||||
|
||||
void enable(rak::timer t);
|
||||
void disable();
|
||||
|
||||
const std::string& key() const { return m_key; }
|
||||
|
||||
const std::string& command() const { return m_command; }
|
||||
void set_command(const std::string& s) { m_command = s; }
|
||||
|
||||
// 'interval()' should in the future return some more dynamic values.
|
||||
uint32_t interval() const { return m_interval; }
|
||||
void set_interval(uint32_t v) { m_interval = v; }
|
||||
|
||||
rak::timer time_scheduled() const { return m_timeScheduled; }
|
||||
rak::timer next_time_scheduled() const;
|
||||
|
||||
void set_slot(Slot::base_type* s) { m_task.set_slot(s); }
|
||||
|
||||
private:
|
||||
CommandSchedulerItem(const CommandSchedulerItem&);
|
||||
void operator = (const CommandSchedulerItem&);
|
||||
|
||||
std::string m_key;
|
||||
std::string m_command;
|
||||
|
||||
uint32_t m_interval;
|
||||
rak::timer m_timeScheduled;
|
||||
|
||||
rak::priority_item m_task;
|
||||
|
||||
// Flags for various things.
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -85,6 +85,8 @@ inline torrent::Object call_command_d_void(const char* key, core::Download* down
|
||||
inline std::string call_command_d_string(const char* key, core::Download* download) { return commands.call_command_d(key, download, torrent::Object()).as_string(); }
|
||||
inline int64_t call_command_d_value(const char* key, core::Download* download) { return commands.call_command_d(key, download, torrent::Object()).as_value(); }
|
||||
|
||||
inline void call_command_d_v_void(const char* key, core::Download* download) { commands.call_command_d(key, download, torrent::Object()); }
|
||||
|
||||
inline void call_command_d_set_value(const char* key, core::Download* download, int64_t arg) { commands.call_command_d(key, download, torrent::Object(arg)); }
|
||||
inline void call_command_d_set_string(const char* key, core::Download* download, const std::string& arg) { commands.call_command_d(key, download, torrent::Object(arg)); }
|
||||
inline void call_command_d_set_std_string(const std::string& key, core::Download* download, const std::string& arg) { commands.call_command_d(key.c_str(), download, torrent::Object(arg)); }
|
||||
|
||||
Reference in New Issue
Block a user