ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-04-06 16:47:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: add minor workaround for E2K LCC's bug.

Browse Source 
Related to https://bugs.mcst.ru/bugzilla/show_bug.cgi?id=6011

Change-Id: I562dbcedb3c172e0646dcb03ef6d5cd3f14e02b9
This commit is contained in:
Leonid Yuriev 2021-05-07 15:44:17 +03:00
parent a14d6bcb11
commit c15ad25073
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core.c
View File

@ -12240,28 +12240,32 @@ __cold int mdbx_env_delete(const char *pathname, MDBX_env_delete_mode_t mode) {
break; break;
} }
MDBX_env dummy_env; #ifdef __e2k__ /* https://bugs.mcst.ru/bugzilla/show_bug.cgi?id=6011 */
memset(&dummy_env, 0, sizeof(dummy_env)); MDBX_env *const dummy_env = alloca(sizeof(MDBX_env));
dummy_env.me_flags = #else
MDBX_env dummy_env_silo, *const dummy_env = &dummy_env_silo;
#endif
memset(dummy_env, 0, sizeof(*dummy_env));
dummy_env->me_flags =
(mode == MDBX_ENV_ENSURE_UNUSED) ? MDBX_EXCLUSIVE : MDBX_ENV_DEFAULTS; (mode == MDBX_ENV_ENSURE_UNUSED) ? MDBX_EXCLUSIVE : MDBX_ENV_DEFAULTS;
dummy_env.me_os_psize = (unsigned)mdbx_syspagesize(); dummy_env->me_os_psize = (unsigned)mdbx_syspagesize();
dummy_env.me_psize = (unsigned)mdbx_default_pagesize(); dummy_env->me_psize = (unsigned)mdbx_default_pagesize();
dummy_env.me_pathname = (char *)pathname; dummy_env->me_pathname = (char *)pathname;
MDBX_handle_env_pathname env_pathname; MDBX_handle_env_pathname env_pathname;
STATIC_ASSERT(sizeof(dummy_env.me_flags) == sizeof(MDBX_env_flags_t)); STATIC_ASSERT(sizeof(dummy_env->me_flags) == sizeof(MDBX_env_flags_t));
int rc = MDBX_RESULT_TRUE, int rc = MDBX_RESULT_TRUE,
err = mdbx_handle_env_pathname( err = mdbx_handle_env_pathname(
&env_pathname, pathname, (MDBX_env_flags_t *)&dummy_env.me_flags, 0); &env_pathname, pathname, (MDBX_env_flags_t *)&dummy_env->me_flags, 0);
if (likely(err == MDBX_SUCCESS)) { if (likely(err == MDBX_SUCCESS)) {
mdbx_filehandle_t clk_handle = INVALID_HANDLE_VALUE, mdbx_filehandle_t clk_handle = INVALID_HANDLE_VALUE,
dxb_handle = INVALID_HANDLE_VALUE; dxb_handle = INVALID_HANDLE_VALUE;
if (mode > MDBX_ENV_JUST_DELETE) { if (mode > MDBX_ENV_JUST_DELETE) {
err = mdbx_openfile(MDBX_OPEN_DELETE, &dummy_env, env_pathname.dxb, err = mdbx_openfile(MDBX_OPEN_DELETE, dummy_env, env_pathname.dxb,
&dxb_handle, 0); &dxb_handle, 0);
err = (err == MDBX_ENOFILE) ? MDBX_SUCCESS : err; err = (err == MDBX_ENOFILE) ? MDBX_SUCCESS : err;
if (err == MDBX_SUCCESS) { if (err == MDBX_SUCCESS) {
err = mdbx_openfile(MDBX_OPEN_DELETE, &dummy_env, env_pathname.lck, err = mdbx_openfile(MDBX_OPEN_DELETE, dummy_env, env_pathname.lck,
&clk_handle, 0); &clk_handle, 0);
err = (err == MDBX_ENOFILE) ? MDBX_SUCCESS : err; err = (err == MDBX_ENOFILE) ? MDBX_SUCCESS : err;
} }
@ -12287,7 +12291,7 @@ __cold int mdbx_env_delete(const char *pathname, MDBX_env_delete_mode_t mode) {
err = MDBX_SUCCESS; err = MDBX_SUCCESS;
} }
if (err == MDBX_SUCCESS && !(dummy_env.me_flags & MDBX_NOSUBDIR)) { if (err == MDBX_SUCCESS && !(dummy_env->me_flags & MDBX_NOSUBDIR)) {
err = mdbx_removedirectory(pathname); err = mdbx_removedirectory(pathname);
if (err == MDBX_SUCCESS) if (err == MDBX_SUCCESS)
rc = MDBX_SUCCESS; rc = MDBX_SUCCESS;