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

* Removed ticks for downloads, use the global tick instead.

Browse Source 
* Fixed rak::priority_queue.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@608 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-12-15 22:56:03 +00:00
parent 7cc377b550
commit ca5b5e05ec
19 changed files with 145 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+27 -19
View File
@@ -181,21 +181,21 @@ load_arg_torrents(Control* c, char** first, char** last) {
int
main(int argc, char** argv) {
cachedTime = rak::timer::current();
OptionHandler optionHandler;
Control uiControl;
srandom(cachedTime.usec());
srand48(cachedTime.usec());
initialize_option_handler(&uiControl, &optionHandler);
OptionFile optionFile;
optionFile.slot_option(sigc::mem_fun(optionHandler, &OptionHandler::process));
try {
cachedTime = rak::timer::current();
OptionHandler optionHandler;
Control uiControl;
srandom(cachedTime.usec());
srand48(cachedTime.usec());
initialize_option_handler(&uiControl, &optionHandler);
OptionFile optionFile;
optionFile.slot_option(sigc::mem_fun(optionHandler, &OptionHandler::process));
SignalHandler::set_ignore(SIGPIPE);
SignalHandler::set_handler(SIGINT, sigc::mem_fun(uiControl, &Control::receive_shutdown));
SignalHandler::set_handler(SIGSEGV, sigc::bind(sigc::ptr_fun(&do_panic), SIGSEGV));
@@ -221,13 +221,21 @@ main(int argc, char** argv) {
cachedTime = rak::timer::current();
std::list<rak::priority_item*> workQueue;
// std::list<rak::priority_item*> workQueue;
std::copy(rak::queue_popper(taskScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), cachedTime)),
rak::queue_popper(taskScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), rak::timer())),
std::back_inserter(workQueue));
std::for_each(workQueue.begin(), workQueue.end(), std::mem_fun(&rak::priority_item::clear));
std::for_each(workQueue.begin(), workQueue.end(), std::mem_fun(&rak::priority_item::call));
// std::copy(rak::queue_popper(taskScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), cachedTime)),
// rak::queue_popper(taskScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), rak::timer())),
// std::back_inserter(workQueue));
// std::for_each(workQueue.begin(), workQueue.end(), std::mem_fun(&rak::priority_item::clear_time));
// std::for_each(workQueue.begin(), workQueue.end(), std::mem_fun(&rak::priority_item::call));
while (!taskScheduler.empty() && taskScheduler.top()->time() <= cachedTime) {
rak::priority_item* v = taskScheduler.top();
taskScheduler.pop();
v->clear_time();
v->call();
}
// This needs to be called every second or so. Currently done by
// the throttle task in libtorrent.