[vidalia-svn] r1619: Be a little less eager to send a GeoIP request after queuein (in trunk: . doc src/gui/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-01-28 19:07:16 -0500 (Sun, 28 Jan 2007)
New Revision: 1619

Modified:
   trunk/
   trunk/doc/geoip-spec.txt
   trunk/src/gui/network/netviewer.cpp
Log:
 r1637@adrastea:  edmanm | 2007-01-28 18:44:21 -0500
 Be a little less eager to send a GeoIP request after queueing the last
 address. (Band-aid until 0.1.x, when we should base our decision on when to
 send the request based on whether we have any circuits built through a server
 with an IP address in the request queue.)



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r1637] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/doc/geoip-spec.txt
===================================================================
--- trunk/doc/geoip-spec.txt	2007-01-29 00:07:03 UTC (rev 1618)
+++ trunk/doc/geoip-spec.txt	2007-01-29 00:07:16 UTC (rev 1619)
@@ -111,9 +111,9 @@
    socks listening address and port via Tor's controller interface.
 
    Once Vidalia queues a request for geographic information, we wait
-   MIN_RESOLVE_QUEUE_DELAY (currently three seconds) after the last 
+   MIN_RESOLVE_QUEUE_DELAY (currently 10 seconds) after the last 
    queued request, but no longer than MAX_RESOLVE_QUEUE_DELAY 
-   (currently 10 seconds) after the first queued request, before actually 
+   (currently 30 seconds) after the first queued request, before actually 
    launching the connection. This way we lump them together and send 
    one larger request instead of several little ones. If Vidalia's network 
    map window is not currently visible, the requests are queued until

Modified: trunk/src/gui/network/netviewer.cpp
===================================================================
--- trunk/src/gui/network/netviewer.cpp	2007-01-29 00:07:03 UTC (rev 1618)
+++ trunk/src/gui/network/netviewer.cpp	2007-01-29 00:07:16 UTC (rev 1619)
@@ -38,10 +38,10 @@
 /** Number of milliseconds to wait after the arrival of the last descriptor whose
  * IP needs to be resolved to geographic information, in case more descriptors
  * arrive. Then we can simply lump the IPs into a single request. */
-#define MIN_RESOLVE_QUEUE_DELAY   3000
+#define MIN_RESOLVE_QUEUE_DELAY   (10*1000)
 /** Maximum number of milliseconds to wait after the arrival of the first
  * IP address into the resolve queue, before we flush the entire queue. */
-#define MAX_RESOLVE_QUEUE_DELAY   10000
+#define MAX_RESOLVE_QUEUE_DELAY   (30*1000)
 
 
 /** Constructor. Loads settings from VidaliaSettings.