029d44cf8b
Fix tsd cleanup regressions that were introduced in
5460aa6f66 (Convert all tsd variables to
reside in a single tsd structure.). These regressions were twofold:
1) tsd_tryget() should never (and need never) return NULL. Rename it to
tsd_fetch() and simplify all callers.
2) tsd_*_set() must only be called when tsd is in the nominal state,
because cleanup happens during the nominal-->purgatory transition,
and re-initialization must not happen while in the purgatory state.
Add tsd_nominal() and use it as needed. Note that tsd_*{p,}_get()
can still be used as long as no re-initialization that would require
cleanup occurs. This means that e.g. the thread_allocated counter
can be updated unconditionally.
101 lines
1.8 KiB
C
101 lines
1.8 KiB
C
#include "test/jemalloc_test.h"
|
|
|
|
#define THREAD_DATA 0x72b65c10
|
|
|
|
typedef unsigned int data_t;
|
|
|
|
static bool data_cleanup_executed;
|
|
|
|
malloc_tsd_protos(, data_, data_t)
|
|
|
|
void
|
|
data_cleanup(void *arg)
|
|
{
|
|
data_t *data = (data_t *)arg;
|
|
|
|
if (!data_cleanup_executed) {
|
|
assert_x_eq(*data, THREAD_DATA,
|
|
"Argument passed into cleanup function should match tsd "
|
|
"value");
|
|
}
|
|
data_cleanup_executed = true;
|
|
|
|
/*
|
|
* Allocate during cleanup for two rounds, in order to assure that
|
|
* jemalloc's internal tsd reinitialization happens.
|
|
*/
|
|
switch (*data) {
|
|
case THREAD_DATA:
|
|
*data = 1;
|
|
data_tsd_set(data);
|
|
break;
|
|
case 1:
|
|
*data = 2;
|
|
data_tsd_set(data);
|
|
break;
|
|
case 2:
|
|
return;
|
|
default:
|
|
not_reached();
|
|
}
|
|
|
|
{
|
|
void *p = mallocx(1, 0);
|
|
assert_ptr_not_null(p, "Unexpeced mallocx() failure");
|
|
dallocx(p, 0);
|
|
}
|
|
}
|
|
|
|
malloc_tsd_externs(data_, data_t)
|
|
#define DATA_INIT 0x12345678
|
|
malloc_tsd_data(, data_, data_t, DATA_INIT)
|
|
malloc_tsd_funcs(, data_, data_t, DATA_INIT, data_cleanup)
|
|
|
|
static void *
|
|
thd_start(void *arg)
|
|
{
|
|
data_t d = (data_t)(uintptr_t)arg;
|
|
assert_x_eq(*data_tsd_get(), DATA_INIT,
|
|
"Initial tsd get should return initialization value");
|
|
|
|
data_tsd_set(&d);
|
|
assert_x_eq(*data_tsd_get(), d,
|
|
"After tsd set, tsd get should return value that was set");
|
|
|
|
d = 0;
|
|
assert_x_eq(*data_tsd_get(), (data_t)(uintptr_t)arg,
|
|
"Resetting local data should have no effect on tsd");
|
|
|
|
return (NULL);
|
|
}
|
|
|
|
TEST_BEGIN(test_tsd_main_thread)
|
|
{
|
|
|
|
thd_start((void *) 0xa5f3e329);
|
|
}
|
|
TEST_END
|
|
|
|
TEST_BEGIN(test_tsd_sub_thread)
|
|
{
|
|
thd_t thd;
|
|
|
|
data_cleanup_executed = false;
|
|
thd_create(&thd, thd_start, (void *)THREAD_DATA);
|
|
thd_join(thd, NULL);
|
|
assert_true(data_cleanup_executed,
|
|
"Cleanup function should have executed");
|
|
}
|
|
TEST_END
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
|
|
data_tsd_boot();
|
|
|
|
return (test(
|
|
test_tsd_main_thread,
|
|
test_tsd_sub_thread));
|
|
}
|