[or-cvs] r13579: TOR_PERF has not not been a sane thing for ages. Remove it. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-19 14:30:37 -0500 (Tue, 19 Feb 2008)
New Revision: 13579

Modified:
   tor/trunk/
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/or.h
Log:
 r18195 at catbus:  nickm | 2008-02-19 14:11:15 -0500
 TOR_PERF has not not been a sane thing for ages. Remove it.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18195] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-02-19 19:27:55 UTC (rev 13578)
+++ tor/trunk/src/or/circuitbuild.c	2008-02-19 19:30:37 UTC (rev 13579)
@@ -1039,15 +1039,12 @@
 
   tor_assert(routers);
 
-#ifdef TOR_PERF
-  routelen = 2;
-#else
   routelen = 3;
   if (exit &&
       purpose != CIRCUIT_PURPOSE_TESTING &&
       purpose != CIRCUIT_PURPOSE_S_ESTABLISH_INTRO)
     routelen++;
-#endif
+
   log_debug(LD_CIRC,"Chosen route length %d (%d routers available).",
             routelen, smartlist_len(routers));
 

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-02-19 19:27:55 UTC (rev 13578)
+++ tor/trunk/src/or/or.h	2008-02-19 19:30:37 UTC (rev 13579)
@@ -647,14 +647,6 @@
 #define CELL_DIRECTION_IN 1
 #define CELL_DIRECTION_OUT 2
 
-#ifdef TOR_PERF
-/* These options are here for internal testing on a separate network. If
- * you enable them, you won't be compatible with the main Tor network. */
-#define CIRCWINDOW_START 10000
-#define CIRCWINDOW_INCREMENT 1000
-#define STREAMWINDOW_START 5000
-#define STREAMWINDOW_INCREMENT 500
-#else
 /** Initial value for both sides of a circuit transmission window when the
  * circuit is initialized.  Measured in cells. */
 #define CIRCWINDOW_START 1000
@@ -665,7 +657,6 @@
 #define STREAMWINDOW_START 500
 /** Amount to increment a stream window when we get a stream SENDME. */
 #define STREAMWINDOW_INCREMENT 50
-#endif
 
 /* cell commands */
 #define CELL_PADDING 0