r12344@catbus: nickm | 2007-04-10 21:27:25 -0400

 Fix documentation and usage of 2nd argument to mp_pool_new.

svn:r9942

diff --git a/src/common/mempool.c b/src/common/mempool.c
index b3c375253137cd234b8931cd16f738f5496da2a8..06f23ad94fc02386bef4992046293086d2e89ff6 100644 (file)
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -329,7 +329,7 @@ mp_pool_release(void *item)
 }
 
 /** Allocate a new memory pool to hold items of size <b>item_size</b>. We'll
- * try to fit about <b>chunk_capacity</b> items in each chunk. */
+ * try to fit about <b>chunk_capacity</b> bytes in each chunk. */
 mp_pool_t *
 mp_pool_new(size_t item_size, size_t chunk_capacity)
 {

diff --git a/src/common/mempool.h b/src/common/mempool.h
index a1bc3bd0d1a9c72b9348c5825479de7a9858d3fc..1f9e2f553464c8003f2652cafbc72b2431a57015 100644 (file)
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -17,7 +17,7 @@ typedef struct mp_pool_t mp_pool_t;
 
 void *mp_pool_get(mp_pool_t *pool);
 void mp_pool_release(void *item);
-mp_pool_t *mp_pool_new(size_t item_size, unsigned int n_per_chunk);
+mp_pool_t *mp_pool_new(size_t item_size, size_t chunk_capacity);
 void mp_pool_clean(mp_pool_t *pool, int n);
 void mp_pool_destroy(mp_pool_t *pool);
 void mp_pool_assert_ok(mp_pool_t *pool);

diff --git a/src/or/relay.c b/src/or/relay.c
index 491b7a9ce463d8a3e9df7b7e202b93671ab9d1f2..f6b4cbb4be49dd9f5f3afb608c784ab0001480e5 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1485,7 +1485,7 @@ void
 init_cell_pool(void)
 {
   tor_assert(!cell_pool);
-  cell_pool = mp_pool_new(sizeof(packed_cell_t), 64);
+  cell_pool = mp_pool_new(sizeof(packed_cell_t), 1<<19);
 }
 
 /** Free all storage used to hold cells. */

diff --git a/src/or/test.c b/src/or/test.c
index 9b427cfa76b354c177aeb0bd96eba34b03019044..68fb97e44c6fa8676f21597eb9ffa9e88cc80b27 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2119,7 +2119,7 @@ test_mempool(void)
   test_assert(pool->item_alloc_size >= sizeof(void*)+1);
   mp_pool_destroy(pool);
 
-  pool = mp_pool_new(241, 10);
+  pool = mp_pool_new(241, 2500);
   test_assert(pool->new_chunk_capacity >= 10);
   test_assert(pool->item_alloc_size >= sizeof(void*)+241);
   test_eq(pool->item_alloc_size & 0x03, 0);