[or-cvs] r11132: Backport r10994: stop using SENTINELS checking, in order to (in tor/branches/tor-0_1_2-patches: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-16 12:41:36 -0400 (Thu, 16 Aug 2007)
New Revision: 11132

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/buffers.c
Log:
 r14588 at catbus:  nickm | 2007-08-16 12:04:44 -0400
 Backport r10994: stop using SENTINELS checking, in order to use less  RAM in buffer allocation.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r14588] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-16 12:12:56 UTC (rev 11131)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-16 16:41:36 UTC (rev 11132)
@@ -1,9 +1,15 @@
 Changes in version 0.1.2.xx - 2007-xxxxx
-  o 
+  o Minor bugfixes (performance):
     - Save on most routerlist_assert_ok() calls in routerlist.c,
       thus greatly speeding up loading cached-routers from disk on
       startup (backport from trunk).
+    - Disable sentiel-based debugging for buffer code: we squashed all
+      the bugs that this was supposed to detect a long time ago, and
+      now its only effect is to change our buffer sizes from nice
+      powers of two (which platform mallocs tend to like) to values
+      slightly over powers of two (which make some platform mallocs sad).
 
+
 Changes in version 0.1.2.16 - 2007-08-01
   o Major security fixes:
     - Close immediately after missing authentication on control port;

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-08-16 12:12:56 UTC (rev 11131)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-08-16 16:41:36 UTC (rev 11132)
@@ -1,7 +1,7 @@
 Backport items for 0.1.2:
   - r10939: Choose with complete fairness when exits are weighted.
   - r10956: fix the math for exit bandwidth weighting
-  - r10994: Disable SENTINELS checking in order to use less RAM in
+  o r10994: Disable SENTINELS checking in order to use less RAM in
     buffer allocation.
   - r11117: cookie auth more usable
   - disable v0 control protocol

Modified: tor/branches/tor-0_1_2-patches/src/or/buffers.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/buffers.c	2007-08-16 12:12:56 UTC (rev 11131)
+++ tor/branches/tor-0_1_2-patches/src/or/buffers.c	2007-08-16 16:41:36 UTC (rev 11132)
@@ -15,7 +15,7 @@
 
 #include "or.h"
 
-#define SENTINELS
+#undef SENTINELS
 #undef CHECK_AFTER_RESIZE
 #undef PARANOIA
 #undef NOINLINE