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

Removed priority_queue and rak/timer.

Browse Source
This commit is contained in:
Jari Sundell
2025-05-02 11:03:51 +02:00
committed by GitHub
parent 6f8c1246dc
commit 85e74b5542
65 changed files with 384 additions and 1933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/command_scheduler.cc
+11 -46
View File
@@ -1,50 +1,15 @@
// 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 "rpc/command_scheduler.h"
#include <algorithm>
#include <cstdlib>
#include <time.h>
#include <rak/string_manip.h>
#include <torrent/exceptions.h>
#include "command_scheduler.h"
#include "command_scheduler_item.h"
#include "parse_commands.h"
#include "rpc/command_scheduler_item.h"
#include "rpc/parse_commands.h"
namespace rpc {
@@ -104,14 +69,14 @@ CommandScheduler::call_item(value_type item) {
}
// Still schedule if we caught a torrrent::input_error?
rak::timer next = item->next_time_scheduled();
auto next = item->next_time_scheduled();
if (next == rak::timer()) {
if (next == std::chrono::microseconds(0)) {
// Remove from scheduler?
return;
}
if (next <= cachedTime)
if (next <= torrent::this_thread::cached_time())
throw torrent::internal_error("CommandScheduler::call_item(...) tried to schedule a zero interval item.");
item->enable(next);
@@ -133,7 +98,7 @@ CommandScheduler::parse(const std::string& key,
item->command() = command;
item->set_interval(interval);
item->enable((cachedTime + rak::timer::from_seconds(absolute)).round_seconds());
item->enable(torrent::utils::ceil_seconds(torrent::this_thread::cached_time() + std::chrono::seconds(absolute)));
}
uint32_t
@@ -149,7 +114,7 @@ CommandScheduler::parse_absolute(const char* str) {
return result.second;
case 2:
t = cachedTime.tval().tv_sec;
t = torrent::this_thread::cached_seconds().count();
if (localtime_r(&t, &local) == NULL)
throw torrent::input_error("Could not convert unix time to local time.");
@@ -157,7 +122,7 @@ CommandScheduler::parse_absolute(const char* str) {
return (result.second + 3600 - 60 * local.tm_min - local.tm_sec) % 3600;
case 3:
t = cachedTime.tval().tv_sec;
t = torrent::this_thread::cached_seconds().count();
if (localtime_r(&t, &local) == NULL)
throw torrent::input_error("Could not convert unix time to local time.");
@@ -176,7 +141,7 @@ CommandScheduler::parse_interval(const char* str) {
if (result.first == 0)
throw torrent::input_error("Could not parse interval.");
return result.second;
}
src/rpc/command_scheduler.h
+2 -37
View File
@@ -1,45 +1,10 @@
// 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_COMMAND_SCHEDULER_H
#define RTORRENT_COMMAND_SCHEDULER_H
#include <cstdint>
#include <vector>
#include <functional>
#include <string>
#include <vector>
namespace torrent {
class Object;
src/rpc/command_scheduler_item.cc
+18 -53
View File
@@ -1,55 +1,19 @@
// 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 <torrent/exceptions.h>
#include "rpc/command_scheduler_item.h"
#include "command_scheduler_item.h"
#include <torrent/exceptions.h>
namespace rpc {
CommandSchedulerItem::~CommandSchedulerItem() {
priority_queue_erase(&taskScheduler, &m_task);
torrent::this_thread::scheduler()->erase(&m_task);
}
void
CommandSchedulerItem::enable(rak::timer t) {
if (t == rak::timer())
throw torrent::internal_error("CommandSchedulerItem::enable() t == rak::timer().");
CommandSchedulerItem::enable(std::chrono::microseconds t) {
if (t == std::chrono::microseconds())
throw torrent::internal_error("CommandSchedulerItem::enable() t == 0.");
if (is_queued())
disable();
@@ -57,30 +21,31 @@ CommandSchedulerItem::enable(rak::timer t) {
// 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);
m_time_scheduled = t;
torrent::this_thread::scheduler()->wait_until(&m_task, t);
}
void
CommandSchedulerItem::disable() {
m_timeScheduled = rak::timer();
priority_queue_erase(&taskScheduler, &m_task);
m_time_scheduled = std::chrono::microseconds();
torrent::this_thread::scheduler()->erase(&m_task);
}
rak::timer
std::chrono::microseconds
CommandSchedulerItem::next_time_scheduled() const {
if (m_interval == 0)
return rak::timer();
return std::chrono::microseconds();
if (m_timeScheduled == rak::timer())
throw torrent::internal_error("CommandSchedulerItem::next_time_scheduled() m_timeScheduled == rak::timer().");
if (m_time_scheduled == std::chrono::microseconds())
throw torrent::internal_error("CommandSchedulerItem::next_time_scheduled() m_time_scheduled == 0.");
rak::timer next = m_timeScheduled;
auto next = m_time_scheduled;
// This should be done in a non-looping manner.
do {
next += rak::timer::from_seconds(m_interval);
} while (next <= cachedTime.round_seconds());
next += std::chrono::seconds(m_interval);
} while (next <= torrent::utils::ceil_seconds(torrent::this_thread::cached_time()));
return next;
}
src/rpc/command_scheduler_item.h
+9 -45
View File
@@ -1,47 +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_COMMAND_SCHEDULER_ITEM_H
#define RTORRENT_COMMAND_SCHEDULER_ITEM_H
#include "globals.h"
#include <functional>
#include <torrent/object.h>
#include <torrent/utils/scheduler.h>
namespace rpc {
@@ -52,9 +16,9 @@ public:
CommandSchedulerItem(const std::string& key) : m_key(key), m_interval(0) {}
~CommandSchedulerItem();
bool is_queued() const { return m_task.is_queued(); }
bool is_queued() const { return m_task.is_scheduled(); }
void enable(rak::timer t);
void enable(std::chrono::microseconds t);
void disable();
const std::string& key() const { return m_key; }
@@ -64,8 +28,8 @@ public:
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;
std::chrono::microseconds time_scheduled() const { return m_time_scheduled; }
std::chrono::microseconds next_time_scheduled() const;
slot_void& slot() { return m_task.slot(); }
@@ -75,11 +39,11 @@ private:
std::string m_key;
torrent::Object m_command;
uint32_t m_interval;
rak::timer m_timeScheduled;
rak::priority_item m_task;
uint32_t m_interval;
std::chrono::microseconds m_time_scheduled;
torrent::utils::SchedulerEntry m_task;
// Flags for various things.
};