sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

r18996: merge from samba4:

Browse Source 
- fix bug 4078
- talloc_free(talloc_autofree_context()); should not result
  in a SIGABORT on exit
- add a test for this, but this test can also pass in the standalone build
  and samba3, as samba4 uses talloc_autofree_context()

metze
This commit is contained in:
Stefan Metzmacher 2006-09-29 10:53:27 +00:00 committed by Gerald (Jerry) Carter
parent 372471cbad
commit f5b0924f97
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/talloc/talloc.c
View File

@ -82,7 +82,7 @@
NULL
*/
static void *null_context;
static void *cleanup_context;
static void *autofree_context;
struct talloc_reference_handle {
struct talloc_reference_handle *next, *prev;
@ -1208,10 +1208,15 @@ void *talloc_realloc_fn(const void *context, void *ptr, size_t size)
}
static int talloc_autofree_destructor(void *ptr)
{
autofree_context = NULL;
return 0;
}
static void talloc_autofree(void)
{
talloc_free(cleanup_context);
cleanup_context = NULL;
talloc_free(autofree_context);
}
/*
@ -1220,11 +1225,12 @@ static void talloc_autofree(void)
*/
void *talloc_autofree_context(void)
{
if (cleanup_context == NULL) {
cleanup_context = talloc_named_const(NULL, 0, "autofree_context");
if (autofree_context == NULL) {
autofree_context = talloc_named_const(NULL, 0, "autofree_context");
talloc_set_destructor(autofree_context, talloc_autofree_destructor);
atexit(talloc_autofree);
}
return cleanup_context;
return autofree_context;
}
size_t talloc_get_size(const void *context)

31
source/lib/talloc/testsuite.c
View File

@ -24,10 +24,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef _SAMBA_BUILD_
#include "version.h"
#endif /* _SAMBA_BUILD_ */
#include "replace.h"
#include "system/time.h"
#include "talloc.h"
@ -48,7 +44,7 @@ static double timeval_elapsed(struct timeval *tv)
(tv2.tv_usec - tv->tv_usec)*1.0e-6;
}
#if SAMBA_VERSION_MAJOR==3
#if _SAMBA_BUILD_==3
#ifdef malloc
#undef malloc
#endif
@ -1040,6 +1036,28 @@ static bool test_talloc_ptrtype(void)
return ret;
}
static bool test_autofree(void)
{
#if _SAMBA_BUILD_>=4
/*
* we can't run this inside smbtorture in samba4
* as smbtorture uses talloc_autofree_context()
*/
printf("SKIPPING TALLOC AUTOFREE CONTEXT (not supported from smbtorture)\n");
#else
void *p;
printf("TESTING TALLOC AUTOFREE CONTEXT\n");
p = talloc_autofree_context();
talloc_free(p);
p = talloc_autofree_context();
talloc_free(p);
#endif
return true;
}
bool torture_local_talloc(struct torture_context *torture)
{
bool ret = true;
@ -1067,13 +1085,14 @@ bool torture_local_talloc(struct torture_context *torture)
if (ret) {
ret &= test_speed();
}
ret &= test_autofree();
return ret;
}
#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
#if _SAMBA_BUILD_<4
int main(void)
{
if (!torture_local_talloc(NULL)) {