ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 17:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix mdbx_rthc_remove().

Browse Source
This commit is contained in:
Leo Yuriev 2017-04-21 18:19:21 +03:00
parent 55226499a8
commit 8bed6a5c89
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lck-posix.c
View File

@ -42,6 +42,10 @@ void mdbx_rthc_unlock(void) {
mdbx_ensure(NULL, pthread_mutex_unlock(&mdbx_rthc_mutex) == 0); mdbx_ensure(NULL, pthread_mutex_unlock(&mdbx_rthc_mutex) == 0);
} }
void __attribute__((destructor)) mdbx_global_destructor(void) {
mdbx_rthc_cleanup();
}
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* lck */ /* lck */

25
src/mdbx.c
View File

@ -61,12 +61,12 @@ static rthc_entry_t *rthc_table = rthc_table_static;
__cold void mdbx_rthc_dtor(void *ptr) { __cold void mdbx_rthc_dtor(void *ptr) {
MDB_reader *rthc = (MDB_reader *)ptr; MDB_reader *rthc = (MDB_reader *)ptr;
unsigned i;
mdbx_rthc_lock(); mdbx_rthc_lock();
for (i = 0; i < rthc_count; ++i) { const mdbx_pid_t self_pid = mdbx_getpid();
for (unsigned i = 0; i < rthc_count; ++i) {
if (rthc >= rthc_table[i].begin && rthc < rthc_table[i].end) { if (rthc >= rthc_table[i].begin && rthc < rthc_table[i].end) {
if (rthc->mr_pid && rthc->mr_pid == mdbx_getpid()) { if (rthc->mr_pid == self_pid) {
rthc->mr_pid = 0; rthc->mr_pid = 0;
mdbx_coherent_barrier(); mdbx_coherent_barrier();
} }
@ -77,15 +77,14 @@ __cold void mdbx_rthc_dtor(void *ptr) {
} }
__cold void mdbx_rthc_cleanup(void) { __cold void mdbx_rthc_cleanup(void) {
unsigned i;
mdbx_rthc_lock(); mdbx_rthc_lock();
for (i = 0; i < rthc_count; ++i) { const mdbx_pid_t self_pid = mdbx_getpid();
for (unsigned i = 0; i < rthc_count; ++i) {
mdbx_thread_key_t key = rthc_table[i].key; mdbx_thread_key_t key = rthc_table[i].key;
MDB_reader *rthc = mdbx_thread_rthc_get(key); MDB_reader *rthc = mdbx_thread_rthc_get(key);
if (rthc) { if (rthc) {
mdbx_thread_rthc_set(key, NULL); mdbx_thread_rthc_set(key, NULL);
if (rthc->mr_pid && rthc->mr_pid == mdbx_getpid()) { if (rthc->mr_pid == self_pid) {
rthc->mr_pid = 0; rthc->mr_pid = 0;
mdbx_coherent_barrier(); mdbx_coherent_barrier();
} }
@ -96,6 +95,9 @@ __cold void mdbx_rthc_cleanup(void) {
__cold int mdbx_rthc_alloc(mdbx_thread_key_t *key, MDB_reader *begin, __cold int mdbx_rthc_alloc(mdbx_thread_key_t *key, MDB_reader *begin,
MDB_reader *end) { MDB_reader *end) {
#ifndef NDEBUG
*key = (mdbx_thread_key_t)0xBADBADBAD;
#endif /* NDEBUG */
int rc = mdbx_thread_key_create(key); int rc = mdbx_thread_key_create(key);
if (rc != MDB_SUCCESS) if (rc != MDB_SUCCESS)
return rc; return rc;
@ -132,9 +134,14 @@ __cold void mdbx_rthc_remove(mdbx_thread_key_t key) {
mdbx_rthc_lock(); mdbx_rthc_lock();
mdbx_thread_key_delete(key); mdbx_thread_key_delete(key);
unsigned i; for (unsigned i = 0; i < rthc_count; ++i) {
for (i = 0; i < rthc_count; ++i) {
if (key == rthc_table[i].key) { if (key == rthc_table[i].key) {
const mdbx_pid_t self_pid = mdbx_getpid();
for (MDB_reader *rthc = rthc_table[i].begin; rthc < rthc_table[i].end;
++rthc)
if (rthc->mr_pid == self_pid)
rthc->mr_pid = 0;
mdbx_coherent_barrier();
if (--rthc_count > 0) if (--rthc_count > 0)
rthc_table[i] = rthc_table[rthc_count]; rthc_table[i] = rthc_table[rthc_count];
else if (rthc_table != rthc_table_static) { else if (rthc_table != rthc_table_static) {