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

* Saves file priorities along with fast-resume data.

Browse Source 
* Cleaned up the shutdown code, moved some unnessesary stuff out of
the main loop.

* Made a TrackerBase and an empty TrackerUdp class. The proper
Tracker* class is selected based on the url.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@492 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-07-09 18:28:57 +00:00
parent 26a7907f0a
commit 8ca61a79ac
8 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+3 -25
View File
@@ -72,8 +72,6 @@
int64_t utils::Timer::m_cache;
bool is_shutting_down = false;
void do_panic(int signum);
void print_help();
@@ -95,21 +93,6 @@ is_resized() {
return r;
}
void
do_shutdown(ui::Control* c) {
if (!is_shutting_down) {
is_shutting_down = true;
torrent::listen_close();
c->get_core().shutdown(false);
} else {
// Close all torrents, this will stop all tracker connections and cause
// a quick shutdown.
c->get_core().shutdown(true);
}
}
int
parse_options(ui::Control* c, OptionHandler* optionHandler, int argc, char** argv) {
OptionParser optionParser;
@@ -233,7 +216,7 @@ main(int argc, char** argv) {
try {
SignalHandler::set_ignore(SIGPIPE);
SignalHandler::set_handler(SIGINT, sigc::bind(sigc::mem_fun(uiControl, &ui::Control::set_shutdown_received), true));
SignalHandler::set_handler(SIGINT, sigc::mem_fun(uiControl, &ui::Control::receive_shutdown));
SignalHandler::set_handler(SIGSEGV, sigc::bind(sigc::ptr_fun(&do_panic), SIGSEGV));
SignalHandler::set_handler(SIGBUS, sigc::bind(sigc::ptr_fun(&do_panic), SIGBUS));
SignalHandler::set_handler(SIGFPE, sigc::bind(sigc::ptr_fun(&do_panic), SIGFPE));
@@ -256,13 +239,7 @@ main(int argc, char** argv) {
uiControl.get_display().adjust_layout();
while (!is_shutting_down || !torrent::is_inactive()) {
if (uiControl.get_shutdown_received()) {
do_shutdown(&uiControl);
uiControl.set_shutdown_received(false);
}
while (!uiControl.is_shutdown_completed()) {
utils::Timer::update();
utils::taskScheduler.execute(utils::Timer::cache());
@@ -272,6 +249,7 @@ main(int argc, char** argv) {
utils::displayScheduler.get_next_timeout() <= utils::Timer::cache())
uiControl.get_display().do_update();
// Do shutdown check before poll, not after.
uiControl.get_core().get_poll().poll(!utils::taskScheduler.empty() ?
utils::taskScheduler.get_next_timeout() - utils::Timer::cache() :
60 * 1000000);