diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:30:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:30:55 -0400 |
commit | 630b4af26097e9813505b87532806b9b032a84f4 (patch) | |
tree | 32c6129db1ed9859caee3e18a19b09b18247ee0c /src/or | |
parent | 9511522bd4c072a1d1b03b4d8e866baea3161e35 (diff) | |
parent | 91ff10f6be984c6ca00a7240d32e79ab7db09c7c (diff) | |
download | tor-630b4af26097e9813505b87532806b9b032a84f4.tar tor-630b4af26097e9813505b87532806b9b032a84f4.tar.gz |
Merge remote-tracking branch 'andrea/bug11476'
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/buffers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index fb186081c..e54751db2 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -117,6 +117,9 @@ chunk_repack(chunk_t *chunk) chunk->data = &chunk->mem[0]; } +/** Keep track of total size of allocated chunks for consistency asserts */ +static size_t total_bytes_allocated_in_chunks = 0; + #if defined(ENABLE_BUF_FREELISTS) || defined(RUNNING_DOXYGEN) /** A freelist of chunks. */ typedef struct chunk_freelist_t { @@ -148,9 +151,6 @@ static chunk_freelist_t freelists[] = { * could help with? */ static uint64_t n_freelist_miss = 0; -/** DOCDOC */ -static size_t total_bytes_allocated_in_chunks = 0; - static void assert_freelist_ok(chunk_freelist_t *fl); /** Return the freelist to hold chunks of size <b>alloc</b>, or NULL if |