[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] blow away most calls to assert_all_pending_dns_resolves_ok,...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] blow away most calls to assert_all_pending_dns_resolves_ok,...
- From: arma@xxxxxxxx (Roger Dingledine)
- Date: Wed,  6 Apr 2005 16:05:41 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Wed, 06 Apr 2005 16:06:15 -0400
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or
Modified Files:
	main.c 
Log Message:
blow away most calls to assert_all_pending_dns_resolves_ok, since
they're eating our cpu.
Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -d -r1.483 -r1.484
--- main.c	6 Apr 2005 15:19:32 -0000	1.483
+++ main.c	6 Apr 2005 20:05:34 -0000	1.484
@@ -353,7 +353,6 @@
   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 @@
     }
   }
   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 @@
     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 @@
     }
   }
   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 @@
   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 */