diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-04-06 20:05:34 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-04-06 20:05:34 +0000 |
| commit | 46089c49c43d539a92e336f763d12ee7c36661ff (patch) | |
| tree | 38a31722c84068b72d921e02c73131ece3de4c1e | |
| parent | 652dde72f1beed1fb83d137314f47aff15b01036 (diff) | |
| download | tor-46089c49c43d539a92e336f763d12ee7c36661ff.tar.gz tor-46089c49c43d539a92e336f763d12ee7c36661ff.zip | |
blow away most calls to assert_all_pending_dns_resolves_ok, since
they're eating our cpu.
svn:r4034
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c index e4d1d24398..7256c2040d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -353,7 +353,6 @@ conn_read_callback(int fd, short event, void *_conn) log_fn(LOG_DEBUG,"socket %d wants to read.",conn->s); assert_connection_ok(conn, time(NULL)); - assert_all_pending_dns_resolves_ok(); if (connection_handle_read(conn) < 0) { if (!conn->marked_for_close) { @@ -370,7 +369,6 @@ conn_read_callback(int fd, short event, void *_conn) } } assert_connection_ok(conn, time(NULL)); - assert_all_pending_dns_resolves_ok(); if (smartlist_len(closeable_connection_lst)) close_closeable_connections(); @@ -387,7 +385,6 @@ static void conn_write_callback(int fd, short events, void *_conn) return; assert_connection_ok(conn, time(NULL)); - assert_all_pending_dns_resolves_ok(); if (connection_handle_write(conn) < 0) { if (!conn->marked_for_close) { @@ -403,7 +400,6 @@ static void conn_write_callback(int fd, short events, void *_conn) } } assert_connection_ok(conn, time(NULL)); - assert_all_pending_dns_resolves_ok(); if (smartlist_len(closeable_connection_lst)) close_closeable_connections(); @@ -832,9 +828,7 @@ static void second_elapsed_callback(int fd, short event, void *args) else circuit_note_clock_jumped(seconds_elapsed); - assert_all_pending_dns_resolves_ok(); run_scheduled_events(now.tv_sec); - assert_all_pending_dns_resolves_ok(); current_second = now.tv_sec; /* remember which second it is, for next time */ |