sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-07 09:49:30 +03:00
Code Activity

talloc: Allow nested pools.

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2013-09-06 14:52:28 -07:00
parent a3d9099d9a
commit 20ad6d7aa3
3 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/talloc/talloc.c
View File

@ -672,13 +672,6 @@ _PUBLIC_ void *talloc_pool(const void *context, size_t size)
tc = talloc_chunk_from_ptr(result);
pool_hdr = talloc_pool_from_chunk(tc);
if (unlikely(tc->flags & TALLOC_FLAG_POOLMEM)) {
/* We don't handle this correctly, so fail. */
talloc_log("talloc: cannot allocate pool off another pool %s\n",
talloc_get_name(context));
talloc_free(result);
return NULL;
}
tc->flags |= TALLOC_FLAG_POOL;
tc->size = 0;
@ -836,10 +829,19 @@ static inline void _talloc_free_poolmem(struct talloc_chunk *tc,
*/
pool_tc->name = location;
talloc_memlimit_update_on_free(pool_tc);
TC_INVALIDATE_FULL_CHUNK(pool_tc);
free(pool);
if (pool_tc->flags & TALLOC_FLAG_POOLMEM) {
_talloc_free_poolmem(pool_tc, location);
} else {
/*
* The talloc_memlimit_update_on_free()
* call takes into account the
* prefix TP_HDR_SIZE allocated before
* the pool talloc_chunk.
*/
talloc_memlimit_update_on_free(pool_tc);
TC_INVALIDATE_FULL_CHUNK(pool_tc);
free(pool);
}
return;
}
@ -869,6 +871,7 @@ static inline void _talloc_free_children_internal(struct talloc_chunk *tc,
static inline int _talloc_free_internal(void *ptr, const char *location)
{
struct talloc_chunk *tc;
void *ptr_to_free;
if (unlikely(ptr == NULL)) {
return -1;
@ -961,15 +964,13 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
}
/*
* This call takes into account the
* prefix TP_HDR_SIZE allocated before
* the pool talloc_chunk.
*/
talloc_memlimit_update_on_free(tc);
TC_INVALIDATE_FULL_CHUNK(tc);
free(pool);
return 0;
* With object_count==0, a pool becomes a normal piece of
* memory to free. If it's allocated inside a pool, it needs
* to be freed as poolmem, else it needs to be just freed.
*/
ptr_to_free = pool;
} else {
ptr_to_free = tc;
}
if (tc->flags & TALLOC_FLAG_POOLMEM) {
@ -980,7 +981,7 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
talloc_memlimit_update_on_free(tc);
TC_INVALIDATE_FULL_CHUNK(tc);
free(tc);
free(ptr_to_free);
return 0;
}
@ -2632,7 +2633,9 @@ static void talloc_memlimit_update_on_free(struct talloc_chunk *tc)
/*
* Pool entries don't count. Only the pools
* themselves are counted as part of the memory
* limits.
* limits. Note that this also takes care of
* nested pools which have both flags
* TALLOC_FLAG_POOLMEM|TALLOC_FLAG_POOL set.
*/
if (tc->flags & TALLOC_FLAG_POOLMEM) {
return;

3
lib/talloc/talloc.h
View File

@ -839,8 +839,7 @@ void *talloc_find_parent_bytype(const void *ptr, #type);
* talloc pool to a talloc parent outside the pool, the whole pool memory is
* not free(3)'ed until that moved chunk is also talloc_free()ed.
*
* @param[in] context The talloc context to hang the result off (must not
* be another pool).
* @param[in] context The talloc context to hang the result off.
*
* @param[in] size Size of the talloc pool.
*

26
lib/talloc/testsuite.c
View File

@ -1267,6 +1267,30 @@ static bool test_pool_steal(void)
return true;
}
static bool test_pool_nest(void)
{
void *p1, *p2, *p3;
void *e = talloc_new(NULL);
p1 = talloc_pool(NULL, 1024);
torture_assert("talloc_pool", p1 != NULL, "failed");
p2 = talloc_pool(p1, 500);
torture_assert("talloc_pool", p2 != NULL, "failed");
p3 = talloc_size(p2, 10);
talloc_steal(e, p3);
talloc_free(p2);
talloc_free(p3);
talloc_free(p1);
return true;
}
static bool test_free_ref_null_context(void)
{
void *p1, *p2, *p3;
@ -1566,6 +1590,8 @@ bool torture_local_talloc(struct torture_context *tctx)
setlinebuf(stdout);
test_reset();
ret &= test_pool_nest();
test_reset();
ret &= test_ref1();
test_reset();