* Moved Timer to rak/timer.h.

* Added position affinity to ChunkSelector, still needs more work to
make it move forward without needing to finish all pieces.


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

Makefile.am

@@ -8,6 +8,7 @@ EXTRA_DIST= \
 	rak/error_number.h \
 	rak/functional.h \
 	rak/string_manip.h \
+	rak/timer.h \
 	rak/unordered_vector.h \
 	scripts/checks.m4 \
 	scripts/common.m4

rak/algorithm.h

@@ -38,6 +38,7 @@
 #define RAK_ALGORITHM_H
 
 #include <algorithm>
+#include <functional>
 
 namespace rak {
 
@@ -90,8 +91,7 @@ advance_bidirectional(_InputIter __first, _InputIter __middle1, _InputIter __las
 }
 
 template <typename _Value>
-struct
+struct compare_base : public std::binary_function<_Value, _Value, bool> {
-compare_base : public std::binary_function<_Value, _Value, bool> {
   bool operator () (const _Value& complete, const _Value& base) const {
     return !complete.compare(0, base.size(), base);
   }

rak/timer.h

@@ -1,4 +1,4 @@
-// rTorrent - BitTorrent client
+// libTorrent - BitTorrent library
 // Copyright (C) 2005, Jari Sundell
 //
 // This program is free software; you can redistribute it and/or modify
@@ -34,63 +34,56 @@
 //           Skomakerveien 33
 //           3185 Skoppum, NORWAY
 
-#ifndef RTORRENT_UTILS_TIMER_H
+#ifndef RAK_TIMER_H
-#define RTORRENT_UTILS_TIMER_H
+#define RAK_TIMER_H
 
 #include <inttypes.h>
 #include <sys/time.h>
 
-namespace utils {
+namespace rak {
 
 // Don't convert negative Timer to timeval and then back to Timer, that will bork.
-class Timer {
+class timer {
  public:
-  Timer() : m_time(0) {}
+  timer() : m_time(0) {}
-  Timer(int64_t usec) : m_time(usec) {}
+  timer(int64_t usec) : m_time(usec) {}
-  Timer(timeval tv) : m_time((int64_t)(uint32_t)tv.tv_sec * 1000000 + (int64_t)(uint32_t)tv.tv_usec % 1000000) {}
+  timer(timeval tv) : m_time((int64_t)(uint32_t)tv.tv_sec * 1000000 + (int64_t)(uint32_t)tv.tv_usec % 1000000) {}
 
   int32_t             seconds() const                    { return m_time / 1000000; }
   int64_t             usec() const                       { return m_time; }
 
-  Timer               round_seconds() const              { return (m_time / 1000000) * 1000000; }
+  timer               round_seconds() const              { return (m_time / 1000000) * 1000000; }
 
   timeval             tval() const                       { return (timeval) { m_time / 1000000, m_time % 1000000}; }
 
-  static Timer        current();
+  static timer        current();
 
-  // Cached time, updated in the beginning of torrent::work call.
+  bool                operator <  (const timer& t) const { return m_time < t.m_time; }
-  // Don't use outside socket_base read/write/except or Service::service.
+  bool                operator >  (const timer& t) const { return m_time > t.m_time; }
-  static Timer        cache()                            { return Timer(m_cache); }
+  bool                operator <= (const timer& t) const { return m_time <= t.m_time; }
+  bool                operator >= (const timer& t) const { return m_time >= t.m_time; }
+  bool                operator == (const timer& t) const { return m_time == t.m_time; }
+  bool                operator != (const timer& t) const { return m_time != t.m_time; }
 
-  static void         update()                           { m_cache = Timer::current().usec(); }
+  timer               operator - (const timer& t) const  { return timer(m_time - t.m_time); }
+  timer               operator + (const timer& t) const  { return timer(m_time + t.m_time); }
 
-  bool                operator <  (const Timer& t) const { return m_time < t.m_time; }
+  timer               operator -= (int64_t t)            { m_time -= t; return *this; }
-  bool                operator >  (const Timer& t) const { return m_time > t.m_time; }
+  timer               operator -= (const timer& t)       { m_time -= t.m_time; return *this; }
-  bool                operator <= (const Timer& t) const { return m_time <= t.m_time; }
-  bool                operator >= (const Timer& t) const { return m_time >= t.m_time; }
 
-  Timer               operator - (const Timer& t) const  { return Timer(m_time - t.m_time); }
+  timer               operator += (int64_t t)            { m_time += t; return *this; }
-  Timer               operator + (const Timer& t) const  { return Timer(m_time + t.m_time); }
+  timer               operator += (const timer& t)       { m_time += t.m_time; return *this; }
-
-  Timer               operator -= (int64_t t)            { m_time -= t; return *this; }
-  Timer               operator -= (const Timer& t)       { m_time -= t.m_time; return *this; }
-
-  Timer               operator += (int64_t t)            { m_time += t; return *this; }
-  Timer               operator += (const Timer& t)       { m_time += t.m_time; return *this; }
 
  private:
   int64_t             m_time;
-
-  // Instantiated in torrent.cc
-  static int64_t      m_cache;
 };
 
-inline Timer
+inline timer
-Timer::current() {
+timer::current() {
   timeval t;
   gettimeofday(&t, 0);
   
-  return Timer(t);
+  return timer(t);
 }
 
 }

src/Makefile.am

@@ -17,6 +17,8 @@ rtorrent_LDADD = \
 rtorrent_SOURCES = \
 	control.cc \
 	control.h \
+	globals.cc \
+	globals.h \
 	main.cc \
 	option_file.cc \
 	option_file.h \

src/control.cc

@@ -59,7 +59,7 @@ Control::Control() :
 
   m_inputStdin->slot_pressed(sigc::mem_fun(m_input, &input::Manager::pressed));
 
-  m_taskShutdown.set_iterator(utils::taskScheduler.end());
+  m_taskShutdown.set_iterator(taskScheduler.end());
   m_taskShutdown.set_slot(sigc::mem_fun(*this, &Control::receive_shutdown));
 }
 
@@ -90,7 +90,7 @@ Control::initialize() {
 
 void
 Control::cleanup() {
-  utils::taskScheduler.erase(&m_taskShutdown);
+  taskScheduler.erase(&m_taskShutdown);
 
   m_inputStdin->remove(m_core->get_poll_manager()->get_torrent_poll());
 
@@ -113,8 +113,8 @@ Control::receive_shutdown() {
     m_core->shutdown(false);
     m_shutdownReceived = true;
 
-    if (!utils::taskScheduler.is_scheduled(&m_taskShutdown))
+    if (!taskScheduler.is_scheduled(&m_taskShutdown))
-      utils::taskScheduler.insert(&m_taskShutdown, utils::Timer::cache() + 5 * 1000000);
+      taskScheduler.insert(&m_taskShutdown, cachedTime + 5 * 1000000);
 
   } else {
     m_core->shutdown(true);

src/control.h

@@ -39,7 +39,7 @@
 
 #include <torrent/torrent.h>
 
-#include "utils/task.h"
+#include "globals.h"
 
 namespace ui {
   class Root;

src/core/download_factory.cc

@@ -41,9 +41,9 @@
 #include <stdexcept>
 #include <torrent/bencode.h>
 
-#include "utils/task.h"
 #include "curl_get.h"
 #include "http_queue.h"
+#include "globals.h"
 #include "manager.h"
 
 #include "download_factory.h"
@@ -60,16 +60,16 @@ DownloadFactory::DownloadFactory(const std::string& uri, Manager* m) :
   m_session(false),
   m_start(false) {
 
-  m_taskLoad.set_iterator(utils::taskScheduler.end());
+  m_taskLoad.set_iterator(taskScheduler.end());
   m_taskLoad.set_slot(sigc::mem_fun(*this, &DownloadFactory::receive_load));
 
-  m_taskCommit.set_iterator(utils::taskScheduler.end());
+  m_taskCommit.set_iterator(taskScheduler.end());
   m_taskCommit.set_slot(sigc::mem_fun(*this, &DownloadFactory::receive_commit));
 }  
 
 DownloadFactory::~DownloadFactory() {
-  utils::taskScheduler.erase(&m_taskLoad);
+  taskScheduler.erase(&m_taskLoad);
-  utils::taskScheduler.erase(&m_taskCommit);
+  taskScheduler.erase(&m_taskCommit);
 
   delete m_stream;
   m_stream = NULL;
@@ -77,12 +77,12 @@ DownloadFactory::~DownloadFactory() {
 
 void
 DownloadFactory::load() {
-  utils::taskScheduler.insert(&m_taskLoad, utils::Timer::cache());
+  taskScheduler.insert(&m_taskLoad, cachedTime);
 }
 
 void
 DownloadFactory::commit() {
-  utils::taskScheduler.insert(&m_taskCommit, utils::Timer::cache());
+  taskScheduler.insert(&m_taskCommit, cachedTime);
 }
 
 void

src/core/log.cc

@@ -37,15 +37,16 @@
 #include "config.h"
 
 #include <algorithm>
+#include <rak/functional.h>
 
+#include "globals.h"
 #include "log.h"
-#include "rak/functional.h"
 
 namespace core {
 
 void
 Log::push_front(const std::string& msg) {
-  Base::push_front(Type(utils::Timer::cache(), msg));
+  Base::push_front(Type(cachedTime, msg));
 
   if (size() > 50)
     Base::pop_back();
@@ -54,8 +55,8 @@ Log::push_front(const std::string& msg) {
 }
 
 Log::iterator
-Log::find_older(utils::Timer t) {
+Log::find_older(rak::timer t) {
-  return std::find_if(begin(), end(), rak::on(rak::mem_ptr_ref(&Type::first), std::bind2nd(std::less_equal<utils::Timer>(), t)));
+  return std::find_if(begin(), end(), rak::on(rak::mem_ptr_ref(&Type::first), std::bind2nd(std::less_equal<rak::timer>(), t)));
 }
 
 }

src/core/log.h

@@ -41,13 +41,13 @@
 #include <string>
 #include <sigc++/signal.h>
 
-#include "utils/timer.h"
+#include <rak/timer.h>
 
 namespace core {
 
-class Log : private std::deque<std::pair<utils::Timer, std::string> > {
+class Log : private std::deque<std::pair<rak::timer, std::string> > {
 public:
-  typedef std::pair<utils::Timer, std::string> Type;
+  typedef std::pair<rak::timer, std::string> Type;
   typedef std::deque<Type>                     Base;
   typedef sigc::signal0<void>                  Signal;
 
@@ -66,7 +66,7 @@ public:
 
   void      push_front(const std::string& msg);
 
-  iterator  find_older(utils::Timer t);
+  iterator  find_older(rak::timer t);
 
   Signal&   signal_update() { return m_signalUpdate; }
 

src/core/poll_manager.h

@@ -38,11 +38,11 @@
 #define RTORRENT_CORE_POLL_MANAGER_H
 
 #include <sys/select.h>
+#include <rak/timer.h>
 #include <sigc++/signal.h>
 #include <torrent/poll.h>
 
 #include "curl_stack.h"
-#include "utils/timer.h"
 
 namespace core {
 
@@ -61,7 +61,7 @@ public:
   CurlStack*          get_http_stack()             { return &m_httpStack; }
   torrent::Poll*      get_torrent_poll()           { return m_poll; }
 
-  virtual void        poll(utils::Timer timeout) = 0;
+  virtual void        poll(rak::timer timeout) = 0;
 
   // Use a signal, connect checking for input and updating the display.
   Signal&             signal_interrupted()         { return m_signalInterrupted; }

src/core/poll_manager_epoll.cc

@@ -61,11 +61,11 @@ PollManagerEPoll::~PollManagerEPoll() {
 }
 
 void
-PollManagerEPoll::poll(utils::Timer timeout) {
+PollManagerEPoll::poll(rak::timer timeout) {
   // Add 1ms to ensure we don't idle loop due to the lack of
   // resolution.
   torrent::perform();
-  timeout = std::min(timeout, utils::Timer(torrent::next_timeout()));
+  timeout = std::min(timeout, rak::timer(torrent::next_timeout()));
 
   if (m_httpStack.is_busy()) {
     // When we're using libcurl we need to use select, but as this is
@@ -99,7 +99,7 @@ PollManagerEPoll::poll(utils::Timer timeout) {
     }
 
     // Clear the timeout since we've already used it in the select call.
-    timeout = utils::Timer();
+    timeout = rak::timer();
   }
 
   // Yes, below is how much code really *should* have been in this

src/core/poll_manager_epoll.h

@@ -52,7 +52,7 @@ public:
 
   torrent::Poll*      get_torrent_poll();
 
-  void                poll(utils::Timer timeout);
+  void                poll(rak::timer timeout);
 
 private:
   PollManagerEPoll(torrent::Poll* p) : PollManager(p) {}

src/core/poll_manager_select.cc

@@ -61,9 +61,9 @@ PollManagerSelect::~PollManagerSelect() {
 }
 
 void
-PollManagerSelect::poll(utils::Timer timeout) {
+PollManagerSelect::poll(rak::timer timeout) {
   torrent::perform();
-  timeout = std::min(timeout, utils::Timer(torrent::next_timeout()));
+  timeout = std::min(timeout, rak::timer(torrent::next_timeout()));
 
 #if defined USE_VARIABLE_FDSET
   std::memset(m_readSet, 0, m_setSize);

src/core/poll_manager_select.h

@@ -50,7 +50,7 @@ public:
   static PollManagerSelect* create(int maxOpenSockets);
   ~PollManagerSelect();
 
-  void                poll(utils::Timer timeout);
+  void                poll(rak::timer timeout);
 
 private:
   PollManagerSelect(torrent::Poll* p) : PollManager(p) {}

src/display/manager.cc

@@ -38,10 +38,10 @@
 
 #include <stdexcept>
 #include <algorithm>
-
+#include <rak/functional.h>
-#include "rak/functional.h"
 
 #include "canvas.h"
+#include "globals.h"
 #include "manager.h"
 #include "window.h"
 
@@ -98,7 +98,7 @@ void
 Manager::do_update() {
   Canvas::refresh_std();
 
-  utils::displayScheduler.execute(utils::Timer::cache());
+  displayScheduler.execute(cachedTime);
   std::for_each(begin(), end(), rak::if_then(std::mem_fun(&Window::is_active), std::mem_fun(&Window::refresh)));
 
   Canvas::do_update();

src/display/utils.cc

@@ -43,7 +43,7 @@
 #include <torrent/tracker.h>
 
 #include "core/download.h"
-#include "utils/timer.h"
+#include <rak/timer.h>
 
 #include "utils.h"
 

src/display/window.cc

@@ -50,12 +50,12 @@ Window::Window(Canvas* c, bool d, int h) :
   m_dynamic(d),
   m_minHeight(h) {
 
-  m_taskUpdate.set_iterator(utils::displayScheduler.end());
+  m_taskUpdate.set_iterator(displayScheduler.end());
   m_taskUpdate.set_slot(sigc::mem_fun(*this, &Window::redraw));
 }
 
 Window::~Window() {
-  utils::displayScheduler.erase(&m_taskUpdate);
+  displayScheduler.erase(&m_taskUpdate);
   delete m_canvas;
 }
 
@@ -64,7 +64,7 @@ Window::set_active(bool a) {
   if (a)
     mark_dirty();
   else
-    utils::displayScheduler.erase(&m_taskUpdate);
+    displayScheduler.erase(&m_taskUpdate);
 
   m_active = a;
 }

src/display/window.h

@@ -37,11 +37,11 @@
 #ifndef RTORRENT_WINDOW_BASE_H
 #define RTORRENT_WINDOW_BASE_H
 
+#include <rak/timer.h>
 #include <sigc++/slot.h>
 
 #include "canvas.h"
-#include "utils/task.h"
+#include "globals.h"
-#include "utils/timer.h"
 
 namespace display {
 
@@ -57,9 +57,9 @@ public:
 
   bool                is_active()                          { return m_active; }
   bool                is_dynamic()                         { return m_dynamic; }
-  bool                is_dirty()                           { return utils::displayScheduler.is_scheduled(&m_taskUpdate); }
+  bool                is_dirty()                           { return displayScheduler.is_scheduled(&m_taskUpdate); }
 
-  //utils::Timer        get_next_draw()                      { return m_nextDraw; }
+  //utils::rak::timer   get_next_draw()                      { return m_nextDraw; }
 
   int                 get_min_height()                     { return m_minHeight; }
 
@@ -92,8 +92,8 @@ protected:
 
 inline void
 Window::mark_dirty() {
-  utils::displayScheduler.erase(&m_taskUpdate);
+  displayScheduler.erase(&m_taskUpdate);
-  utils::displayScheduler.insert(&m_taskUpdate, utils::Timer::cache());
+  displayScheduler.insert(&m_taskUpdate, cachedTime);
 }
 
 }

src/display/window_download_list.cc

@@ -36,10 +36,12 @@
 
 #include "config.h"
 
+#include <rak/algorithm.h>
+
 #include "core/download.h"
-#include "rak/algorithm.h"
 
 #include "canvas.h"
+#include "globals.h"
 #include "utils.h"
 #include "window_download_list.h"
 
@@ -58,7 +60,7 @@ WindowDownloadList::~WindowDownloadList() {
 
 void
 WindowDownloadList::redraw() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   m_canvas->erase();
 

src/display/window_download_statusbar.cc

@@ -39,6 +39,7 @@
 #include <torrent/rate.h>
 
 #include "canvas.h"
+#include "globals.h"
 #include "utils.h"
 #include "window_download_statusbar.h"
 
@@ -53,7 +54,7 @@ WindowDownloadStatusbar::WindowDownloadStatusbar(core::Download* d) :
 
 void
 WindowDownloadStatusbar::redraw() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   m_canvas->erase();
 

src/display/window_file_list.cc

@@ -37,10 +37,10 @@
 #include "config.h"
 
 #include <stdexcept>
+#include <rak/algorithm.h>
 #include <torrent/path.h>
 
 #include "core/download.h"
-#include "rak/algorithm.h"
 
 #include "window_file_list.h"
 
@@ -54,7 +54,7 @@ WindowFileList::WindowFileList(core::Download* d, unsigned int* focus) :
 
 void
 WindowFileList::redraw() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 10 * 1000000).round_seconds());
+  displayScheduler.insert(&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() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&m_taskUpdate, (cachedTime + 1000000).round_seconds());
 
   cleanup_list();
 
@@ -95,7 +95,7 @@ WindowHttpQueue::redraw() {
 void
 WindowHttpQueue::cleanup_list() {
   for (Container::iterator itr = m_container.begin(); itr != m_container.end();)
-    if (itr->m_http == NULL && itr->m_timer < utils::Timer::cache())
+    if (itr->m_http == NULL && itr->m_timer < cachedTime)
       itr = m_container.erase(itr);
     else
       ++itr;
@@ -147,7 +147,7 @@ WindowHttpQueue::receive_erase(core::CurlGet* h) {
     throw std::logic_error("WindowHttpQueue::receive_erase(...) tried to remove an object we don't have");
 
   itr->m_http = NULL;
-  itr->m_timer = utils::Timer::cache() + 10000000;
+  itr->m_timer = cachedTime + 10000000;
 
   mark_dirty();
 }

src/display/window_http_queue.h

@@ -63,7 +63,7 @@ private:
 
     core::CurlGet* m_http;
     std::string    m_name;
-    utils::Timer          m_timer;
+    rak::timer     m_timer;
   };
 
   typedef std::list<Node> Container;

src/display/window_log.cc

@@ -60,7 +60,7 @@ WindowLog::~WindowLog() {
 
 WindowLog::iterator
 WindowLog::find_older() {
-  return m_log->find_older(utils::Timer::cache() - 60*1000000);
+  return m_log->find_older(cachedTime - 60*1000000);
 }
 
 void

src/display/window_log_complete.cc

@@ -58,7 +58,7 @@ WindowLogComplete::~WindowLogComplete() {
 
 WindowLogComplete::iterator
 WindowLogComplete::find_older() {
-  return m_log->find_older(utils::Timer::cache() - 60*1000000);
+  return m_log->find_older(cachedTime - 60*1000000);
 }
 
 void

src/display/window_peer_info.cc

@@ -57,7 +57,7 @@ WindowPeerInfo::WindowPeerInfo(core::Download* d, PList* l, PList::iterator* f)
 
 void
 WindowPeerInfo::redraw() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&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() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&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() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&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() {
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  displayScheduler.insert(&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.
-  utils::displayScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 10 * 1000000).round_seconds());
+  displayScheduler.insert(&m_taskUpdate, (cachedTime + 10 * 1000000).round_seconds());
   m_canvas->erase();
 
   int pos = 0;

src/globals.cc

@@ -34,16 +34,10 @@
 //           Skomakerveien 33
 //           3185 Skoppum, NORWAY
 
-#ifndef RTORRENT_UTILS_TASK_H
+#include "config.h"
-#define RTORRENT_UTILS_TASK_H
 
-#include "task_scheduler.h"
+#include "globals.h"
 
-namespace utils {
+utils::TaskScheduler taskScheduler;
-  
+utils::TaskScheduler displayScheduler;
-extern TaskScheduler taskScheduler;
+rak::timer           cachedTime;
-extern TaskScheduler displayScheduler;
-  
-}
-
-#endif

src/globals.h

@@ -0,0 +1,48 @@
+// rTorrent - BitTorrent library
+// Copyright (C) 2005, 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 TORRENT_GLOBALS_H
+#define TORRENT_GLOBALS_H
+
+#include <rak/timer.h>
+
+#include "utils/task_scheduler.h"
+
+extern utils::TaskScheduler taskScheduler;
+extern utils::TaskScheduler displayScheduler;
+extern rak::timer           cachedTime;
+
+#endif

src/main.cc

@@ -62,29 +62,21 @@
 #include "display/manager.h"
 #include "input/bindings.h"
 
-#include "utils/task.h"
-#include "utils/timer.h"
 #include "utils/directory.h"
 
 #include "control.h"
+#include "globals.h"
 #include "signal_handler.h"
 #include "option_file.h"
 #include "option_handler.h"
 #include "option_handler_rules.h"
 #include "option_parser.h"
 
-int64_t utils::Timer::m_cache;
-
 uint32_t countTicks = 0;
 
 void do_panic(int signum);
 void print_help();
 
-namespace utils {
-  TaskScheduler taskScheduler;
-  TaskScheduler displayScheduler;
-}
-
 bool
 is_resized() {
   static int x = 0;
@@ -185,13 +177,13 @@ load_arg_torrents(Control* c, char** first, char** last) {
 
 int
 main(int argc, char** argv) {
-  utils::Timer::update();
+  cachedTime = rak::timer::current();
 
   OptionHandler optionHandler;
   Control       uiControl;
 
-  srandom(utils::Timer::cache().usec());
+  srandom(cachedTime.usec());
-  srand48(utils::Timer::cache().usec());
+  srand48(cachedTime.usec());
 
   initialize_option_handler(&uiControl, &optionHandler);
 
@@ -223,19 +215,19 @@ main(int argc, char** argv) {
     while (!uiControl.is_shutdown_completed()) {
       countTicks++;
 
-      utils::Timer::update();
+      cachedTime = rak::timer::current();
-      utils::taskScheduler.execute(utils::Timer::cache());
+      taskScheduler.execute(cachedTime);
 
       // This needs to be called every second or so. Currently done by
       // the throttle task in libtorrent.
-      if (!utils::displayScheduler.empty() &&
+      if (!displayScheduler.empty() &&
-	  utils::displayScheduler.get_next_timeout() <= utils::Timer::cache())
+	  displayScheduler.get_next_timeout() <= cachedTime)
 	uiControl.display()->do_update();
 
       // Do shutdown check before poll, not after.
-      uiControl.core()->get_poll_manager()->poll(!utils::taskScheduler.empty() ?
+      uiControl.core()->get_poll_manager()->poll(!taskScheduler.empty() ?
-						    utils::taskScheduler.get_next_timeout() - utils::Timer::cache() :
+						 taskScheduler.get_next_timeout() - cachedTime :
-						    60 * 1000000);
+						 60 * 1000000);
     }
 
     uiControl.cleanup();
@@ -288,7 +280,7 @@ do_panic(int signum) {
 void
 receive_tracker_dump(std::istream* s) {
   std::stringstream filename;
-  filename << "./tracker_dump." << utils::Timer::current().seconds();
+  filename << "./tracker_dump." << rak::timer::current().seconds();
 
   std::fstream out(filename.str().c_str(), std::ios::out | std::ios::trunc);
 

src/ui/download_list.cc

@@ -85,7 +85,7 @@ DownloadList::DownloadList(Control* c) :
   m_uiArray[DISPLAY_LOG]           = new ElementLogComplete(&m_control->core()->get_log_complete());
   m_windowLog                      = new WLog(&m_control->core()->get_log_important());
 
-  m_taskUpdate.set_iterator(utils::taskScheduler.end());
+  m_taskUpdate.set_iterator(taskScheduler.end());
   m_taskUpdate.set_slot(sigc::mem_fun(*this, &DownloadList::task_update)),
 
   setup_keys();
@@ -112,7 +112,7 @@ DownloadList::activate() {
   if (is_active())
     throw std::logic_error("ui::Download::activate() called on an already activated object");
 
-  utils::taskScheduler.insert(&m_taskUpdate, utils::Timer::cache() + 1000000);
+  taskScheduler.insert(&m_taskUpdate, cachedTime + 1000000);
 
   m_windowTextInput->set_active(false);
 
@@ -139,7 +139,7 @@ DownloadList::disable() {
 
   disable_display();
 
-  utils::taskScheduler.erase(&m_taskUpdate);
+  taskScheduler.erase(&m_taskUpdate);
 
   m_control->display()->erase(m_window);
   m_control->display()->erase(m_windowTitle);
@@ -304,7 +304,7 @@ void
 DownloadList::task_update() {
   m_windowLog->receive_update();
 
-  utils::taskScheduler.insert(&m_taskUpdate, (utils::Timer::cache() + 1000000).round_seconds());
+  taskScheduler.insert(&m_taskUpdate, (cachedTime + 1000000).round_seconds());
 }
 
 void

src/ui/download_list.h

@@ -41,9 +41,10 @@
 
 #include "core/download_list.h"
 #include "display/manager.h"
-#include "utils/task.h"
 #include "utils/list_focus.h"
 
+#include "globals.h"
+
 class Control;
 
 namespace input {

src/utils/Makefile.am

@@ -8,10 +8,8 @@ libsub_utils_a_SOURCES = \
 	list_focus.h \
 	parse.cc \
 	parse.h \
-	task.h \
 	task_item.h \
 	task_scheduler.cc \
-	task_scheduler.h \
+	task_scheduler.h
-	timer.h
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)

src/utils/task_item.h

@@ -38,18 +38,17 @@
 #define RTORRENT_UTILS_TASK_ITEM_H
 
 #include <list>
+#include <rak/timer.h>
 #include <sigc++/slot.h>
 
-#include "utils/timer.h"
-
 namespace utils {
 
 // The user is responsible for removing TaskItem from the TaskScheduler.
 
 class TaskItem {
 public:
-  typedef sigc::slot<void>                                  Slot;
+  typedef sigc::slot<void>                                       Slot;
-  typedef std::list<std::pair<Timer, TaskItem*> >::iterator iterator;
+  typedef std::list<std::pair<rak::timer, TaskItem*> >::iterator iterator;
 
   TaskItem(Slot s = Slot()) : m_slot(s) {}
 
@@ -60,7 +59,7 @@ public:
   const iterator      get_iterator() const          { return m_iterator; }
   void                set_iterator(iterator itr)    { m_iterator = itr; }
 
-  const Timer&        get_time() const              { return m_iterator->first; }
+  const rak::timer&   get_time() const              { return m_iterator->first; }
 
 private:
   TaskItem(const TaskItem& t);

src/utils/task_scheduler.cc

@@ -44,7 +44,7 @@
 namespace utils {
 
 void
-TaskScheduler::insert(TaskItem* task, Timer time) {
+TaskScheduler::insert(TaskItem* task, rak::timer time) {
   if (is_scheduled(task))
     throw std::logic_error("TaskScheduler::insert(...) tried to insert an already inserted or invalid TaskItem");
 
@@ -74,7 +74,7 @@ TaskScheduler::erase(TaskItem* task) {
 }
 
 void
-TaskScheduler::execute(Timer time) {
+TaskScheduler::execute(rak::timer time) {
   m_entry = std::find_if(begin(), end(), rak::less(time, rak::mem_ptr_ref(&value_type::first)));
 
   // Since we are always using the front rather than a splice of the

src/utils/task_scheduler.h

@@ -41,9 +41,9 @@
 
 namespace utils {
 
-class TaskScheduler : private std::list<std::pair<Timer, TaskItem*> > {
+class TaskScheduler : private std::list<std::pair<rak::timer, TaskItem*> > {
 public:
-  typedef std::list<std::pair<Timer, TaskItem*> > Base;
+  typedef std::list<std::pair<rak::timer, TaskItem*> > Base;
 
   using Base::value_type;
   using Base::reference;
@@ -60,14 +60,14 @@ public:
 
   TaskScheduler() : m_entry(begin()) {}
 
-  void                insert(TaskItem* task, Timer time);
+  void                insert(TaskItem* task, rak::timer time);
   void                erase(TaskItem* task);
 
-  void                execute(Timer time);
+  void                execute(rak::timer time);
 
   bool                is_scheduled(const TaskItem* task) const { return task->get_iterator() != end(); }
 
-  Timer               get_next_timeout() const                 { return begin()->first; }
+  rak::timer          get_next_timeout() const                 { return begin()->first; }
 
 private:
   iterator            m_entry;