nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

make lucky's weird libevent poll einprogress bug just warn, not kill tor.

Browse Source 
svn:r4300
This commit is contained in:
Roger Dingledine 2005-05-24 22:58:57 +00:00
parent f4a14410ad
commit 4f0d7b82ae
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/main.c
View File

@ -825,7 +825,7 @@ static void second_elapsed_callback(int fd, short event, void *args)
me ? me->address : options->Address, options->DirPort); me ? me->address : options->Address, options->DirPort);
} }
/* if more than 10s have elapsed, probably the clock jumped: doesn't count. */ /* if more than 100s have elapsed, probably the clock jumped: doesn't count. */
if (seconds_elapsed < 100) if (seconds_elapsed < 100)
stats_n_seconds_working += seconds_elapsed; stats_n_seconds_working += seconds_elapsed;
else else
@ -943,7 +943,7 @@ static int do_main_loop(void) {
if (loop_result < 0) { if (loop_result < 0) {
int e = errno; int e = errno;
/* let the program survive things like ^z */ /* let the program survive things like ^z */
if (e != EINTR) { if (e != EINTR && e != EINPROGRESS) {
#ifdef HAVE_EVENT_GET_METHOD #ifdef HAVE_EVENT_GET_METHOD
log_fn(LOG_ERR,"libevent poll with %s failed: %s [%d]", log_fn(LOG_ERR,"libevent poll with %s failed: %s [%d]",
event_get_method(), tor_socket_strerror(e), e); event_get_method(), tor_socket_strerror(e), e);
@ -953,6 +953,8 @@ static int do_main_loop(void) {
#endif #endif
return -1; return -1;
} else { } else {
if (e == EINPROGRESS)
log_fn(LOG_WARN,"libevent poll returned EINPROGRESS? Please report.");
log_fn(LOG_DEBUG,"event poll interrupted."); log_fn(LOG_DEBUG,"event poll interrupted.");
/* You can't trust the results of this poll(). Go back to the /* You can't trust the results of this poll(). Go back to the
* top of the big for loop. */ * top of the big for loop. */