ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

library: Change init/deinit order to allow utils to depend on threading

This commit is contained in:
Martin Willi 2013-10-21 13:00:29 +02:00
parent c46cee6f6d
commit 965e846cc3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstrongswan/library.c
View File

@ -141,12 +141,13 @@ void library_deinit()
{
lib->leak_detective->report(lib->leak_detective, detailed);
lib->leak_detective->destroy(lib->leak_detective);
lib->leak_detective = NULL;
}
arrays_deinit();
threads_deinit();
backtrace_deinit();
arrays_deinit();
utils_deinit();
threads_deinit();
free((void*)this->public.ns);
free(this);
@ -269,10 +270,10 @@ bool library_init(char *settings, const char *namespace)
);
lib = &this->public;
utils_init();
backtrace_init();
threads_init();
utils_init();
arrays_init();
backtrace_init();
#ifdef LEAK_DETECTIVE
lib->leak_detective = leak_detective_create();

3
src/libstrongswan/tests/test_runner.c
View File

@ -18,6 +18,7 @@
#include "test_runner.h"
#include <library.h>
#include <threading/thread.h>
#include <plugins/plugin_feature.h>
#include <collections/array.h>
#include <utils/test.h>
@ -372,6 +373,7 @@ static void print_failures(array_t *failures)
{
failure_t failure;
threads_init();
backtrace_init();
while (array_remove(failures, 0, &failure))
@ -391,6 +393,7 @@ static void print_failures(array_t *failures)
}
backtrace_deinit();
threads_deinit();
}
/**