mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-10-19 23:56:16 +00:00
* Removed PeerConnection::m_taskStall, use the keepalive task instead.
* Fixed typo in USE_ALIGNED check. * Added checks to Tracker* to make sure m_taskTimeout isn't already inserted. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@534 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
+4
-4
@@ -119,8 +119,8 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([TORRENT_CHECK_ALIGN], [
|
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
|
||||||
AC_MSG_CHECKING(byte alignment)
|
AC_MSG_CHECKING(the byte alignment)
|
||||||
|
|
||||||
AC_RUN_IFELSE(
|
AC_RUN_IFELSE(
|
||||||
[[#include <inttypes.h>
|
[[#include <inttypes.h>
|
||||||
@@ -133,9 +133,9 @@ AC_DEFUN([TORRENT_CHECK_ALIGN], [
|
|||||||
}
|
}
|
||||||
]],
|
]],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(none)
|
AC_MSG_RESULT(none needed)
|
||||||
], [
|
], [
|
||||||
AC_DEFINE(USE_ALIGN, 1, Require byte alignment)
|
AC_DEFINE(USE_ALIGNED, 1, Require byte alignment)
|
||||||
AC_MSG_RESULT(required)
|
AC_MSG_RESULT(required)
|
||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -232,8 +232,6 @@ main(int argc, char** argv) {
|
|||||||
utils::displayScheduler.get_next_timeout() <= utils::Timer::cache())
|
utils::displayScheduler.get_next_timeout() <= utils::Timer::cache())
|
||||||
uiControl.get_display().do_update();
|
uiControl.get_display().do_update();
|
||||||
|
|
||||||
//utils::Timer::update();
|
|
||||||
|
|
||||||
// Do shutdown check before poll, not after.
|
// Do shutdown check before poll, not after.
|
||||||
uiControl.get_core().get_poll_manager()->poll(!utils::taskScheduler.empty() ?
|
uiControl.get_core().get_poll_manager()->poll(!utils::taskScheduler.empty() ?
|
||||||
utils::taskScheduler.get_next_timeout() - utils::Timer::cache() :
|
utils::taskScheduler.get_next_timeout() - utils::Timer::cache() :
|
||||||
|
|||||||
@@ -107,6 +107,8 @@ SignalHandler::as_string(unsigned int signum) {
|
|||||||
return "Timer signal";
|
return "Timer signal";
|
||||||
case SIGTERM:
|
case SIGTERM:
|
||||||
return "Termination signal";
|
return "Termination signal";
|
||||||
|
case SIGBUS:
|
||||||
|
return "Bus error";
|
||||||
default:
|
default:
|
||||||
return "Unlisted";
|
return "Unlisted";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user