fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-09 11:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Cleaned up rak::priority_queue.

Browse Source 
* Added download time left display, need to tweak it.

* Removed libtorrent/src/download/download_setup.cc.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@607 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-12-09 05:22:36 +00:00
parent 12ef47da3c
commit 7cc377b550
11 changed files with 102 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rak/priority_queue_default.h
+9 -56
View File
@@ -47,15 +47,17 @@ namespace rak {
class priority_item {
public:
bool is_queued() const { return m_time != timer(); }
bool is_queued() const { return m_time != timer(); }
void call() { m_slot(); }
void set_slot(function<void> s) { m_slot = s; }
void call() { m_slot(); }
void set_slot(function<void> s) { m_slot = s; }
const timer& time() const { return m_time; }
void clear_time() { m_time = timer(); }
const timer& time() const { return m_time; }
priority_item* prepare(const timer& t);
priority_item* clear() { m_time = timer(); return this; }
bool compare(const timer& t) const { return m_time > t; }
private:
timer m_time;
@@ -72,62 +74,13 @@ priority_item::prepare(const timer& t) {
}
struct priority_compare {
bool operator () (const priority_item* p1, const priority_item* p2) const {
bool operator () (const priority_item* const p1, const priority_item* const p2) const {
return p1->time() > p2->time();
}
};
struct priority_erase {
void operator () (priority_item* p1) const {
p1->clear_time();
}
};
typedef std::equal_to<priority_item*> priority_equal;
typedef priority_queue<priority_item*, priority_compare, priority_equal, priority_erase> priority_queue_default;
template <typename Queue, typename Compare>
class queue_pop_iterator
: public std::iterator<std::forward_iterator_tag, void, void, void, void> {
public:
typedef Queue container_type;
queue_pop_iterator() : m_queue(NULL) {}
queue_pop_iterator(Queue* q, Compare c) : m_queue(q), m_compare(c) {}
queue_pop_iterator& operator ++ () { m_queue->pop(); return *this; }
queue_pop_iterator& operator ++ (int) { m_queue->pop(); return *this; }
typename container_type::const_reference operator * () { return m_queue->top(); }
bool operator != (const queue_pop_iterator& itr) { return !m_queue->empty() && m_compare(m_queue->top()); }
bool operator == (const queue_pop_iterator& itr) { return m_queue->empty() || !m_compare(m_queue->top()); }
private:
Queue* m_queue;
Compare m_compare;
};
struct priority_ready {
priority_ready() {}
priority_ready(timer t) : m_timer(t) {}
bool operator () (const priority_item* p1) const {
return p1->time() <= m_timer;
}
timer m_timer;
};
inline queue_pop_iterator<priority_queue_default, priority_ready>
queue_popper(priority_queue_default& queue, priority_ready comp) {
return queue_pop_iterator<priority_queue_default, priority_ready>(&queue, comp);
}
inline queue_pop_iterator<priority_queue_default, priority_ready>
queue_popper() {
return queue_pop_iterator<priority_queue_default, priority_ready>();
}
typedef priority_queue<priority_item*, priority_compare, priority_equal> priority_queue_default;
}