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

* Fixed rak::priority_queue.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@608 e378c898-3ddf-0310-93e7-cc216c733640

src/control.cc

@@ -89,7 +89,7 @@ Control::initialize() {
 
 void
 Control::cleanup() {
-  taskScheduler.erase(m_taskShutdown.clear());
+  priority_queue_erase(&taskScheduler, &m_taskShutdown);
 
   m_inputStdin->remove(m_core->get_poll_manager()->get_torrent_poll());
 
@@ -113,7 +113,7 @@ Control::receive_shutdown() {
     m_shutdownReceived = true;
 
     if (!m_taskShutdown.is_queued())
-      taskScheduler.push(m_taskShutdown.prepare(cachedTime + 5 * 1000000));
+      priority_queue_insert(&taskScheduler, &m_taskShutdown, cachedTime + 5 * 1000000);
 
   } else {
     m_core->shutdown(true);

src/core/download_factory.cc

@@ -65,8 +65,8 @@ DownloadFactory::DownloadFactory(const std::string& uri, Manager* m) :
 }  
 
 DownloadFactory::~DownloadFactory() {
-  taskScheduler.erase(m_taskLoad.clear());
-  taskScheduler.erase(m_taskCommit.clear());
+  priority_queue_erase(&taskScheduler, &m_taskLoad);
+  priority_queue_erase(&taskScheduler, &m_taskCommit);
 
   delete m_stream;
   m_stream = NULL;
@@ -74,12 +74,12 @@ DownloadFactory::~DownloadFactory() {
 
 void
 DownloadFactory::load() {
-  taskScheduler.push(m_taskLoad.prepare(cachedTime));
+  priority_queue_insert(&taskScheduler, &m_taskLoad, cachedTime);
 }
 
 void
 DownloadFactory::commit() {
-  taskScheduler.push(m_taskCommit.prepare(cachedTime));
+  priority_queue_insert(&taskScheduler, &m_taskCommit, cachedTime);
 }
 
 void

src/display/manager.cc

@@ -98,13 +98,21 @@ void
 Manager::do_update() {
   Canvas::refresh_std();
 
-  std::list<rak::priority_item*> workQueue;
+//   std::list<rak::priority_item*> workQueue;
 
-  std::copy(rak::queue_popper(displayScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), cachedTime)),
-	    rak::queue_popper(displayScheduler, 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(displayScheduler, rak::bind2nd(std::mem_fun(&rak::priority_item::compare), cachedTime)),
+// 	    rak::queue_popper(displayScheduler, 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 (!displayScheduler.empty() && displayScheduler.top()->time() <= cachedTime) {
+    rak::priority_item* v = displayScheduler.top();
+    displayScheduler.pop();
+
+    v->clear_time();
+    v->call();
+  }
 
   std::for_each(begin(), end(), rak::if_then(std::mem_fun(&Window::is_active), std::mem_fun(&Window::refresh)));
 

src/display/window.cc

@@ -54,7 +54,7 @@ Window::Window(Canvas* c, bool d, int h) :
 }
 
 Window::~Window() {
-  displayScheduler.erase(m_taskUpdate.clear());
+  priority_queue_erase(&displayScheduler, &m_taskUpdate);
   delete m_canvas;
 }
 
@@ -63,7 +63,7 @@ Window::set_active(bool a) {
   if (a)
     mark_dirty();
   else
-    displayScheduler.erase(m_taskUpdate.clear());
+    priority_queue_erase(&displayScheduler, &m_taskUpdate);
 
   m_active = a;
 }

src/display/window.h

@@ -92,8 +92,8 @@ protected:
 
 inline void
 Window::mark_dirty() {
-  displayScheduler.erase(m_taskUpdate.clear());
-  displayScheduler.push(m_taskUpdate.prepare(cachedTime));
+  priority_queue_erase(&displayScheduler, &m_taskUpdate);
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, cachedTime);
 }
 
 }

src/display/window_download_list.cc

@@ -60,7 +60,7 @@ WindowDownloadList::~WindowDownloadList() {
 
 void
 WindowDownloadList::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   m_canvas->erase();
 

src/display/window_download_statusbar.cc

@@ -54,7 +54,7 @@ WindowDownloadStatusbar::WindowDownloadStatusbar(core::Download* d) :
 
 void
 WindowDownloadStatusbar::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   m_canvas->erase();
 

src/display/window_file_list.cc

@@ -54,7 +54,7 @@ WindowFileList::WindowFileList(core::Download* d, unsigned int* focus) :
 
 void
 WindowFileList::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 10 * 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 10 * 1000000).round_seconds());
   m_canvas->erase();
 
   if (m_download->get_download().size_file_entries() == 0 ||

src/display/window_http_queue.cc

@@ -58,7 +58,7 @@ WindowHttpQueue::WindowHttpQueue(core::HttpQueue* q) :
 
 void
 WindowHttpQueue::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   cleanup_list();
 

src/display/window_peer_info.cc

@@ -57,7 +57,7 @@ WindowPeerInfo::WindowPeerInfo(core::Download* d, PList* l, PList::iterator* f)
 
 void
 WindowPeerInfo::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
   m_canvas->erase();
 
   int y = 0;

src/display/window_peer_list.cc

@@ -56,7 +56,7 @@ WindowPeerList::WindowPeerList(core::Download* d, PList* l, PList::iterator* f)
 
 void
 WindowPeerList::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
   m_canvas->erase();
 
   int x = 2;

src/display/window_statusbar.cc

@@ -56,7 +56,7 @@ WindowStatusbar::WindowStatusbar(core::Manager* c) :
 
 void
 WindowStatusbar::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   m_canvas->erase();
 

src/display/window_title.cc

@@ -48,7 +48,7 @@ WindowTitle::WindowTitle(const std::string& s) :
 
 void
 WindowTitle::redraw() {
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
   m_canvas->erase();
 
   m_canvas->print(std::max(0, (m_canvas->get_width() - (int)m_title.size()) / 2 - 4), 0,

src/display/window_tracker_list.cc

@@ -55,7 +55,7 @@ WindowTrackerList::WindowTrackerList(core::Download* d, unsigned int* focus) :
 void
 WindowTrackerList::redraw() {
   // TODO: Make this depend on tracker signal.
-  displayScheduler.push(m_taskUpdate.prepare((cachedTime + 10 * 1000000).round_seconds()));
+  priority_queue_insert(&displayScheduler, &m_taskUpdate, (cachedTime + 10 * 1000000).round_seconds());
   m_canvas->erase();
 
   int pos = 0;

src/main.cc

@@ -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.

src/ui/download_list.cc

@@ -111,7 +111,7 @@ DownloadList::activate() {
   if (is_active())
     throw std::logic_error("ui::Download::activate() called on an already activated object");
 
-  taskScheduler.push(m_taskUpdate.prepare(cachedTime + 1000000));
+  priority_queue_insert(&taskScheduler, &m_taskUpdate, cachedTime + 1000000);
 
   m_windowTextInput->set_active(false);
 
@@ -138,7 +138,7 @@ DownloadList::disable() {
 
   disable_display();
 
-  taskScheduler.erase(m_taskUpdate.clear());
+  priority_queue_erase(&taskScheduler, &m_taskUpdate);
 
   m_control->display()->erase(m_window);
   m_control->display()->erase(m_windowTitle);
@@ -303,7 +303,7 @@ void
 DownloadList::task_update() {
   m_windowLog->receive_update();
 
-  taskScheduler.push(m_taskUpdate.prepare((cachedTime + 1000000).round_seconds()));
+  priority_queue_insert(&taskScheduler, &m_taskUpdate, (cachedTime + 1000000).round_seconds());
 }
 
 void