fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-13 05:32:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up configure.ac and fixed it to properly handles CXXFLAGS.

Browse Source 
Ignore SIGPIPE.

Fixed(?) bug in hash queue code when a queued torrent got
deleted. Also reorganized core::Manager to catch all
torrent::local_error's.

Fixed display bug in display::FileList which hid the last element.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@441 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-05-26 03:25:55 +00:00
parent 528646cc02
commit a2248f584f
12 changed files with 214 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/hash_queue.cc
+21 -10
View File
@@ -34,12 +34,10 @@ namespace core {
void
HashQueue::insert(Download* d, Slot s) {
if (d->get_download().is_hash_checking())
if (d->get_download().is_hash_checking() ||
find(d) != end())
return;
if (std::find_if(begin(), end(), rak::equal(d, std::mem_fun(&HashQueueNode::get_download))) != end())
throw std::logic_error("core::HashQueue::insert(...) received a Download that is already queued");
if (d->get_download().is_hash_checked()) {
s();
return;
@@ -47,21 +45,23 @@ HashQueue::insert(Download* d, Slot s) {
iterator itr = Base::insert(end(), new HashQueueNode(d, s));
(*itr)->set_connection(d->get_download().signal_hash_done(sigc::bind(sigc::mem_fun(*this, &HashQueue::receive_hash_done), itr)));
(*itr)->set_connection(d->get_download().signal_hash_done(sigc::bind(sigc::mem_fun(*this, &HashQueue::receive_hash_done),
(*itr)->get_download())));
fill_queue();
}
void
HashQueue::remove(Download* d) {
iterator itr = std::find_if(begin(), end(), rak::equal(d, std::mem_fun(&HashQueueNode::get_download)));
iterator itr = find(d);
if (itr == end())
return;
if ((*itr)->get_download()->get_download().is_hash_checking())
// What do we do if we're already checking?
;
// We don't do anything if we're already checking, just disconnect.
// if ((*itr)->get_download()->get_download().is_hash_checking()) {
// // What do we do if we're already checking?
// }
delete *itr;
Base::erase(itr);
@@ -69,13 +69,24 @@ HashQueue::remove(Download* d) {
fill_queue();
}
HashQueue::iterator
HashQueue::find(Download* d) {
return std::find_if(begin(), end(), rak::equal(d, std::mem_fun(&HashQueueNode::get_download)));
}
void
HashQueue::receive_hash_done(Base::iterator itr) {
HashQueue::receive_hash_done(Download* d) {
iterator itr = find(d);
if (itr == end())
return;
Slot s = (*itr)->get_slot();
delete *itr;
Base::erase(itr);
// Can we call this before the delete?
s();
fill_queue();
}