summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2009-05-21 01:37:05 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-05-21 02:58:22 -0700
commitc7fd9f1df36a01ac9a1509d1001b0d259005b0f9 (patch)
tree4ed27b1cddb973536313fc1817dd32828a37c87f
parentef7fcc0d7c2695ab3b10477b3e1290e43831da99 (diff)
mem-pool,io-threads: Destroy mem-pool on deallocation
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
-rw-r--r--libglusterfs/src/mem-pool.c14
-rw-r--r--libglusterfs/src/mem-pool.h2
-rw-r--r--xlators/performance/io-threads/src/io-threads.c1
3 files changed, 17 insertions, 0 deletions
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index 56a4a1dc29f..90df2f39e0e 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -197,3 +197,17 @@ mem_put (struct mem_pool *pool, void *ptr)
}
UNLOCK (&pool->lock);
}
+
+
+void
+mem_pool_destroy (struct mem_pool *pool)
+{
+ if (!pool)
+ return;
+
+ LOCK_DESTROY (&pool->lock);
+ FREE (pool->pool);
+ FREE (pool);
+
+ return;
+}
diff --git a/libglusterfs/src/mem-pool.h b/libglusterfs/src/mem-pool.h
index 627945e1fe6..152c17bb412 100644
--- a/libglusterfs/src/mem-pool.h
+++ b/libglusterfs/src/mem-pool.h
@@ -52,4 +52,6 @@ mem_pool_new_fn (unsigned long sizeof_type, unsigned long count);
void mem_put (struct mem_pool *pool, void *ptr);
void *mem_get (struct mem_pool *pool);
+void mem_pool_destroy (struct mem_pool *pool);
+
#endif /* _MEM_POOL_H */
diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c
index 3136c9c1aa1..f16833609bf 100644
--- a/xlators/performance/io-threads/src/io-threads.c
+++ b/xlators/performance/io-threads/src/io-threads.c
@@ -2563,6 +2563,7 @@ deallocate_workers (iot_worker_t **workers,
end_count = count + start_alloc_idx;
for (i = start_alloc_idx; (i < end_count); i++) {
if (workers[i] != NULL) {
+ mem_pool_destroy (workers[i]->req_pool);
FREE (workers[i]);
workers[i] = NULL;
}