ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-04-27 07:02:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix hang/shutdown on big-endian platforms without __cxa_thread_atexit().

Browse Source 
Change-Id: I1bf706abaaf42d5b40751d85ed7c7a83d02acaf5
This commit is contained in:
Leonid Yuriev 2021-07-11 02:17:20 +03:00
parent 55d1f5e9c0
commit 678a80dd19
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core.c
View File

@ -1180,7 +1180,7 @@ static void thread_rthc_set(mdbx_thread_key_t key, const void *value) {
#define MDBX_THREAD_RTHC_ZERO 0 #define MDBX_THREAD_RTHC_ZERO 0
#define MDBX_THREAD_RTHC_REGISTERED 1 #define MDBX_THREAD_RTHC_REGISTERED 1
#define MDBX_THREAD_RTHC_COUNTED 2 #define MDBX_THREAD_RTHC_COUNTED 2
static __thread uint32_t thread_registration_state; static __thread char thread_registration_state;
if (value && unlikely(thread_registration_state == MDBX_THREAD_RTHC_ZERO)) { if (value && unlikely(thread_registration_state == MDBX_THREAD_RTHC_ZERO)) {
thread_registration_state = MDBX_THREAD_RTHC_REGISTERED; thread_registration_state = MDBX_THREAD_RTHC_REGISTERED;
mdbx_trace("thread registered 0x%" PRIxPTR, mdbx_thread_self()); mdbx_trace("thread registered 0x%" PRIxPTR, mdbx_thread_self());
@ -1284,8 +1284,8 @@ __cold void mdbx_rthc_thread_dtor(void *ptr) {
mdbx_trace("<< thread 0x%" PRIxPTR ", rthc %p", mdbx_thread_self(), ptr); mdbx_trace("<< thread 0x%" PRIxPTR ", rthc %p", mdbx_thread_self(), ptr);
rthc_unlock(); rthc_unlock();
#else #else
const char self_registration = *(char *)ptr; const char self_registration = *(volatile char *)ptr;
*(char *)ptr = MDBX_THREAD_RTHC_ZERO; *(volatile char *)ptr = MDBX_THREAD_RTHC_ZERO;
mdbx_trace("== thread 0x%" PRIxPTR ", rthc %p, pid %d, self-status %d", mdbx_trace("== thread 0x%" PRIxPTR ", rthc %p, pid %d, self-status %d",
mdbx_thread_self(), ptr, mdbx_getpid(), self_registration); mdbx_thread_self(), ptr, mdbx_getpid(), self_registration);
if (self_registration == MDBX_THREAD_RTHC_COUNTED) if (self_registration == MDBX_THREAD_RTHC_COUNTED)
@ -1311,12 +1311,13 @@ __cold void mdbx_rthc_global_dtor(void) {
rthc_lock(); rthc_lock();
#if !defined(_WIN32) && !defined(_WIN64) #if !defined(_WIN32) && !defined(_WIN64)
char *rthc = (char *)pthread_getspecific(rthc_key); char *rthc = pthread_getspecific(rthc_key);
mdbx_trace("== thread 0x%" PRIxPTR ", rthc %p, pid %d, self-status %d", mdbx_trace(
mdbx_thread_self(), __Wpedantic_format_voidptr(rthc), "== thread 0x%" PRIxPTR ", rthc %p, pid %d, self-status %d, left %d",
mdbx_getpid(), rthc ? *rthc : -1); mdbx_thread_self(), __Wpedantic_format_voidptr(rthc), mdbx_getpid(),
rthc ? *rthc : -1, atomic_load32(&rthc_pending, mo_Relaxed));
if (rthc) { if (rthc) {
const char self_registration = *(char *)rthc; const char self_registration = *rthc;
*rthc = MDBX_THREAD_RTHC_ZERO; *rthc = MDBX_THREAD_RTHC_ZERO;
if (self_registration == MDBX_THREAD_RTHC_COUNTED) if (self_registration == MDBX_THREAD_RTHC_COUNTED)
mdbx_ensure(nullptr, atomic_sub32(&rthc_pending, 1) > 0); mdbx_ensure(nullptr, atomic_sub32(&rthc_pending, 1) > 0);