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

Fixed poll arguments.

Browse Source
This commit is contained in:
Jari Sundell
2011-12-12 02:58:16 +09:00
parent 6dfd2fe0cd
commit 4d1f5dce67
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/poll_manager_epoll.cc
+2 -2
View File
@@ -63,12 +63,12 @@ PollManagerEPoll::~PollManagerEPoll() {
void void
PollManagerEPoll::poll(rak::timer timeout) { PollManagerEPoll::poll(rak::timer timeout) {
static_cast<torrent::PollEPoll*>(m_poll)->do_poll(); static_cast<torrent::PollEPoll*>(m_poll)->do_poll(timeout.usec());
} }
void void
PollManagerEPoll::poll_simple(rak::timer timeout) { PollManagerEPoll::poll_simple(rak::timer timeout) {
static_cast<torrent::PollEPoll*>(m_poll)->do_poll(torrent::Poll::poll_worker_thread); static_cast<torrent::PollEPoll*>(m_poll)->do_poll(timeout.usec(), torrent::Poll::poll_worker_thread);
} }
} }
src/core/poll_manager_kqueue.cc
+2 -2
View File
@@ -64,12 +64,12 @@ PollManagerKQueue::~PollManagerKQueue() {
void void
PollManagerKQueue::poll(rak::timer timeout) { PollManagerKQueue::poll(rak::timer timeout) {
static_cast<torrent::PollKQueue*>(m_poll)->do_poll(); static_cast<torrent::PollKQueue*>(m_poll)->do_poll(timeout.usec());
} }
void void
PollManagerKQueue::poll_simple(rak::timer timeout) { PollManagerKQueue::poll_simple(rak::timer timeout) {
static_cast<torrent::PollKQueue*>(m_poll)->do_poll(torrent::Poll::poll_worker_thread); static_cast<torrent::PollKQueue*>(m_poll)->do_poll(timeout.usec(), torrent::Poll::poll_worker_thread);
} }
} }
src/core/poll_manager_select.cc
+4 -2
View File
@@ -73,12 +73,14 @@ PollManagerSelect::~PollManagerSelect() {
void void
PollManagerSelect::poll(rak::timer timeout) { PollManagerSelect::poll(rak::timer timeout) {
static_cast<torrent::PollSelect*>(m_poll)->do_poll(); // timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000;
static_cast<torrent::PollSelect*>(m_poll)->do_poll(timeout.usec());
} }
void void
PollManagerSelect::poll_simple(rak::timer timeout) { PollManagerSelect::poll_simple(rak::timer timeout) {
static_cast<torrent::PollSelect*>(m_poll)->do_poll(torrent::PollSelect::poll_worker_thread); static_cast<torrent::PollSelect*>(m_poll)->do_poll(timeout.usec(), torrent::PollSelect::poll_worker_thread);
} }
} }
src/main.cc
+1 -1
View File
@@ -878,7 +878,7 @@ main(int argc, char** argv) {
rak::priority_queue_perform(&taskScheduler, cachedTime); rak::priority_queue_perform(&taskScheduler, cachedTime);
// Do shutdown check before poll, not after. // Do shutdown check before poll, not after.
main_thread->poll_manager()->poll(client_next_timeout(control)); main_thread->poll()->do_poll(client_next_timeout(control).usec());
} }
control->core()->download_list()->session_save(); control->core()->download_list()->session_save();
src/thread_base.h
-1
View File
@@ -59,7 +59,6 @@ public:
ThreadBase(); ThreadBase();
virtual ~ThreadBase(); virtual ~ThreadBase();
core::PollManager* poll_manager() { return m_pollManager; }
priority_queue& task_scheduler() { return m_taskScheduler; } priority_queue& task_scheduler() { return m_taskScheduler; }
virtual void init_thread() = 0; virtual void init_thread() = 0;