From 2b00470094e1e3987ec135c68ad070204cadd6f0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 16 Aug 2007 16:41:36 +0000 Subject: [PATCH] r14588@catbus: nickm | 2007-08-16 12:04:44 -0400 Backport r10994: stop using SENTINELS checking, in order to use less RAM in buffer allocation. svn:r11132 --- ChangeLog | 8 +++++++- doc/TODO.012 | 2 +- src/or/buffers.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 502ba4c40..051e74819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ 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: diff --git a/doc/TODO.012 b/doc/TODO.012 index 573417399..5e309ed04 100644 --- a/doc/TODO.012 +++ b/doc/TODO.012 @@ -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 diff --git a/src/or/buffers.c b/src/or/buffers.c index 366704ee0..6ce9c6ac1 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -15,7 +15,7 @@ const char buffers_c_id[] = #include "or.h" -#define SENTINELS +#undef SENTINELS #undef CHECK_AFTER_RESIZE #undef PARANOIA #undef NOINLINE