ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-12-30 02:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-windows: more crutches for MinGW.

Browse Source 
More for https://github.com/erthink/libmdbx/issues/155

Change-Id: I7de6122ff160372b2dcfd2a0a26e332cb52d0560
This commit is contained in:
Leonid Yuriev 2021-05-08 10:59:15 +03:00
parent 33e8b19ea4
commit 5ae120af80
9 changed files with 127 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/compiler.cmake
View File

@ -619,12 +619,6 @@ macro(setup_compile_flags)
endif() endif()
endif() endif()
if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG}
AND CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 5)
# G++ bug. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31488
add_compile_flags("CXX" "-Wno-invalid-offsetof")
endif()
add_definitions("-D__STDC_FORMAT_MACROS=1") add_definitions("-D__STDC_FORMAT_MACROS=1")
add_definitions("-D__STDC_LIMIT_MACROS=1") add_definitions("-D__STDC_LIMIT_MACROS=1")
add_definitions("-D__STDC_CONSTANT_MACROS=1") add_definitions("-D__STDC_CONSTANT_MACROS=1")
@ -648,6 +642,19 @@ macro(setup_compile_flags)
endif() endif()
endif() endif()
if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG}
AND CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER_VERSION VERSION_LESS 5)
# G++ bug. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31488
add_compile_flags("CXX" "-Wno-invalid-offsetof")
endif()
if(MINGW)
# Disable junk MINGW's warnings that issued due to incompatibilities
# and shortcomings of MINGW,
# since the code is checked by builds with GCC, CLANG and MSVC.
add_compile_flags("C;CXX" "-Wno-format-extra-args" "-Wno-format" "-Wno-cast-function-type" "-Wno-implicit-fallthrough")
endif()
if(ENABLE_ASAN) if(ENABLE_ASAN)
add_compile_flags("C;CXX" "-fsanitize=address") add_compile_flags("C;CXX" "-fsanitize=address")
endif() endif()
@ -778,7 +785,7 @@ if(CMAKE_CXX_COMPILER_LOADED)
elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
set(LIBCXX_FILESYSTEM "stdc++fs") set(LIBCXX_FILESYSTEM "stdc++fs")
endif() endif()
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
set(LIBCXX_FILESYSTEM "stdc++fs") set(LIBCXX_FILESYSTEM "stdc++fs")
endif() endif()

26
mdbx.h++
View File

@ -1652,8 +1652,18 @@ struct LIBMDBX_API_TYPE map_handle {
map_handle::state state) noexcept; map_handle::state state) noexcept;
info(const info &) noexcept = default; info(const info &) noexcept = default;
info &operator=(const info &) noexcept = default; info &operator=(const info &) noexcept = default;
MDBX_CXX11_CONSTEXPR ::mdbx::key_mode key_mode() const noexcept; #if CONSTEXPR_ENUM_FLAGS_OPERATIONS
MDBX_CXX11_CONSTEXPR ::mdbx::value_mode value_mode() const noexcept; MDBX_CXX11_CONSTEXPR
#else
inline
#endif
::mdbx::key_mode key_mode() const noexcept;
#if CONSTEXPR_ENUM_FLAGS_OPERATIONS
MDBX_CXX11_CONSTEXPR
#else
inline
#endif
::mdbx::value_mode value_mode() const noexcept;
}; };
}; };
@ -3263,13 +3273,17 @@ MDBX_CXX11_CONSTEXPR map_handle::info::info(map_handle::flags flags,
map_handle::state state) noexcept map_handle::state state) noexcept
: flags(flags), state(state) {} : flags(flags), state(state) {}
MDBX_CXX11_CONSTEXPR ::mdbx::key_mode #if CONSTEXPR_ENUM_FLAGS_OPERATIONS
map_handle::info::key_mode() const noexcept { MDBX_CXX11_CONSTEXPR
#endif
::mdbx::key_mode map_handle::info::key_mode() const noexcept {
return ::mdbx::key_mode(flags & (MDBX_REVERSEKEY | MDBX_INTEGERKEY)); return ::mdbx::key_mode(flags & (MDBX_REVERSEKEY | MDBX_INTEGERKEY));
} }
MDBX_CXX11_CONSTEXPR ::mdbx::value_mode #if CONSTEXPR_ENUM_FLAGS_OPERATIONS
map_handle::info::value_mode() const noexcept { MDBX_CXX11_CONSTEXPR
#endif
::mdbx::value_mode map_handle::info::value_mode() const noexcept {
return ::mdbx::value_mode(flags & (MDBX_DUPSORT | MDBX_REVERSEDUP | return ::mdbx::value_mode(flags & (MDBX_DUPSORT | MDBX_REVERSEDUP |
MDBX_DUPFIXED | MDBX_INTEGERDUP)); MDBX_DUPFIXED | MDBX_INTEGERDUP));
} }

2
src/core.c
View File

@ -10431,7 +10431,7 @@ static MDBX_meta *__cold mdbx_init_metas(const MDBX_env *env, void *buffer) {
return page_meta(page2); return page_meta(page2);
} }
#if MDBX_ENABLE_MADVISE #if MDBX_ENABLE_MADVISE && !(defined(_WIN32) || defined(_WIN64))
static size_t mdbx_madvise_threshold(const MDBX_env *env, static size_t mdbx_madvise_threshold(const MDBX_env *env,
const size_t largest_bytes) { const size_t largest_bytes) {
/* TODO: use options */ /* TODO: use options */

2
src/internals.h
View File

@ -1632,7 +1632,7 @@ log2n_powerof2(size_t value) {
MDBX_LIFORECLAIM | MDBX_EXCLUSIVE) MDBX_LIFORECLAIM | MDBX_EXCLUSIVE)
#define ENV_USABLE_FLAGS (ENV_CHANGEABLE_FLAGS | ENV_CHANGELESS_FLAGS) #define ENV_USABLE_FLAGS (ENV_CHANGEABLE_FLAGS | ENV_CHANGELESS_FLAGS)
#if !defined(__cplusplus) || defined(__cpp_constexpr) #if !defined(__cplusplus) || CONSTEXPR_ENUM_FLAGS_OPERATIONS
static __maybe_unused void static_checks(void) { static __maybe_unused void static_checks(void) {
STATIC_ASSERT_MSG(INT16_MAX - CORE_DBS == MDBX_MAX_DBI, STATIC_ASSERT_MSG(INT16_MAX - CORE_DBS == MDBX_MAX_DBI,
"Oops, MDBX_MAX_DBI or CORE_DBS?"); "Oops, MDBX_MAX_DBI or CORE_DBS?");

80
src/lck-windows.c
View File

@ -131,7 +131,7 @@ static __inline BOOL funlock(mdbx_filehandle_t fd, uint64_t offset,
/* global `write` lock for write-txt processing, /* global `write` lock for write-txt processing,
* exclusive locking both meta-pages) */ * exclusive locking both meta-pages) */
#define LCK_MAXLEN (1u + (size_t)(MAXSSIZE_T)) #define LCK_MAXLEN (1u + ((~(size_t)0) >> 1))
#define LCK_META_OFFSET 0 #define LCK_META_OFFSET 0
#define LCK_META_LEN (MAX_PAGESIZE * NUM_METAS) #define LCK_META_LEN (MAX_PAGESIZE * NUM_METAS)
#define LCK_BODY_OFFSET LCK_META_LEN #define LCK_BODY_OFFSET LCK_META_LEN
@ -161,7 +161,7 @@ int mdbx_txn_lock(MDBX_env *env, bool dontwait) {
: (LCK_EXCLUSIVE | LCK_WAITFOR), : (LCK_EXCLUSIVE | LCK_WAITFOR),
LCK_BODY)) LCK_BODY))
return MDBX_SUCCESS; return MDBX_SUCCESS;
int rc = GetLastError(); int rc = (int)GetLastError();
LeaveCriticalSection(&env->me_windowsbug_lock); LeaveCriticalSection(&env->me_windowsbug_lock);
return (!dontwait || rc != ERROR_LOCK_VIOLATION) ? rc : MDBX_BUSY; return (!dontwait || rc != ERROR_LOCK_VIOLATION) ? rc : MDBX_BUSY;
} }
@ -172,7 +172,7 @@ void mdbx_txn_unlock(MDBX_env *env) {
: funlock(env->me_lazy_fd, LCK_BODY); : funlock(env->me_lazy_fd, LCK_BODY);
LeaveCriticalSection(&env->me_windowsbug_lock); LeaveCriticalSection(&env->me_windowsbug_lock);
if (!rc) if (!rc)
mdbx_panic("%s failed: err %u", __func__, GetLastError()); mdbx_panic("%s failed: err %u", __func__, (int)GetLastError());
} }
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
@ -197,7 +197,7 @@ MDBX_INTERNAL_FUNC int mdbx_rdt_lock(MDBX_env *env) {
flock(env->me_lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER)) flock(env->me_lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER))
return MDBX_SUCCESS; return MDBX_SUCCESS;
int rc = GetLastError(); int rc = (int)GetLastError();
mdbx_srwlock_ReleaseShared(&env->me_remap_guard); mdbx_srwlock_ReleaseShared(&env->me_remap_guard);
return rc; return rc;
} }
@ -207,7 +207,7 @@ MDBX_INTERNAL_FUNC void mdbx_rdt_unlock(MDBX_env *env) {
/* transition from S-E (locked) to S-? (used), e.g. unlock upper-part */ /* transition from S-E (locked) to S-? (used), e.g. unlock upper-part */
if ((env->me_flags & MDBX_EXCLUSIVE) == 0 && if ((env->me_flags & MDBX_EXCLUSIVE) == 0 &&
!funlock(env->me_lfd, LCK_UPPER)) !funlock(env->me_lfd, LCK_UPPER))
mdbx_panic("%s failed: err %u", __func__, GetLastError()); mdbx_panic("%s failed: err %u", __func__, (int)GetLastError());
} }
mdbx_srwlock_ReleaseShared(&env->me_remap_guard); mdbx_srwlock_ReleaseShared(&env->me_remap_guard);
} }
@ -218,7 +218,7 @@ MDBX_INTERNAL_FUNC int mdbx_lockfile(mdbx_filehandle_t fd, bool wait) {
: LCK_EXCLUSIVE | LCK_DONTWAIT, : LCK_EXCLUSIVE | LCK_DONTWAIT,
0, LCK_MAXLEN) 0, LCK_MAXLEN)
? MDBX_SUCCESS ? MDBX_SUCCESS
: GetLastError(); : (int)GetLastError();
} }
static int suspend_and_append(mdbx_handle_array_t **array, static int suspend_and_append(mdbx_handle_array_t **array,
@ -242,10 +242,10 @@ static int suspend_and_append(mdbx_handle_array_t **array,
HANDLE hThread = OpenThread(THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION, HANDLE hThread = OpenThread(THREAD_SUSPEND_RESUME | THREAD_QUERY_INFORMATION,
FALSE, ThreadId); FALSE, ThreadId);
if (hThread == NULL) if (hThread == NULL)
return GetLastError(); return (int)GetLastError();
if (SuspendThread(hThread) == -1) { if (SuspendThread(hThread) == (DWORD)-1) {
int err = GetLastError(); int err = (int)GetLastError();
DWORD ExitCode; DWORD ExitCode;
if (err == /* workaround for Win10 UCRT bug */ ERROR_ACCESS_DENIED || if (err == /* workaround for Win10 UCRT bug */ ERROR_ACCESS_DENIED ||
!GetExitCodeThread(hThread, &ExitCode) || ExitCode != STILL_ACTIVE) !GetExitCodeThread(hThread, &ExitCode) || ExitCode != STILL_ACTIVE)
@ -302,13 +302,13 @@ mdbx_suspend_threads_before_remap(MDBX_env *env, mdbx_handle_array_t **array) {
mdbx_assert(env, env->me_flags & (MDBX_EXCLUSIVE | MDBX_RDONLY)); mdbx_assert(env, env->me_flags & (MDBX_EXCLUSIVE | MDBX_RDONLY));
const HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); const HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
if (hSnapshot == INVALID_HANDLE_VALUE) if (hSnapshot == INVALID_HANDLE_VALUE)
return GetLastError(); return (int)GetLastError();
THREADENTRY32 entry; THREADENTRY32 entry;
entry.dwSize = sizeof(THREADENTRY32); entry.dwSize = sizeof(THREADENTRY32);
if (!Thread32First(hSnapshot, &entry)) { if (!Thread32First(hSnapshot, &entry)) {
rc = GetLastError(); rc = (int)GetLastError();
bailout_toolhelp: bailout_toolhelp:
CloseHandle(hSnapshot); CloseHandle(hSnapshot);
(void)mdbx_resume_threads_after_remap(*array); (void)mdbx_resume_threads_after_remap(*array);
@ -326,7 +326,7 @@ mdbx_suspend_threads_before_remap(MDBX_env *env, mdbx_handle_array_t **array) {
} while (Thread32Next(hSnapshot, &entry)); } while (Thread32Next(hSnapshot, &entry));
rc = GetLastError(); rc = (int)GetLastError();
if (rc != ERROR_NO_MORE_FILES) if (rc != ERROR_NO_MORE_FILES)
goto bailout_toolhelp; goto bailout_toolhelp;
CloseHandle(hSnapshot); CloseHandle(hSnapshot);
@ -340,8 +340,8 @@ mdbx_resume_threads_after_remap(mdbx_handle_array_t *array) {
int rc = MDBX_SUCCESS; int rc = MDBX_SUCCESS;
for (unsigned i = 0; i < array->count; ++i) { for (unsigned i = 0; i < array->count; ++i) {
const HANDLE hThread = array->handles[i]; const HANDLE hThread = array->handles[i];
if (ResumeThread(hThread) == -1) { if (ResumeThread(hThread) == (DWORD)-1) {
const int err = GetLastError(); const int err = (int)GetLastError();
DWORD ExitCode; DWORD ExitCode;
if (err != /* workaround for Win10 UCRT bug */ ERROR_ACCESS_DENIED && if (err != /* workaround for Win10 UCRT bug */ ERROR_ACCESS_DENIED &&
GetExitCodeThread(hThread, &ExitCode) && ExitCode == STILL_ACTIVE) GetExitCodeThread(hThread, &ExitCode) && ExitCode == STILL_ACTIVE)
@ -393,7 +393,7 @@ static void lck_unlock(MDBX_env *env) {
/* double `unlock` for robustly remove overlapped shared/exclusive locks */ /* double `unlock` for robustly remove overlapped shared/exclusive locks */
while (funlock(env->me_lfd, LCK_LOWER)) while (funlock(env->me_lfd, LCK_LOWER))
; ;
err = GetLastError(); err = (int)GetLastError();
assert(err == ERROR_NOT_LOCKED || assert(err == ERROR_NOT_LOCKED ||
(mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION)); (mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION));
(void)err; (void)err;
@ -401,7 +401,7 @@ static void lck_unlock(MDBX_env *env) {
while (funlock(env->me_lfd, LCK_UPPER)) while (funlock(env->me_lfd, LCK_UPPER))
; ;
err = GetLastError(); err = (int)GetLastError();
assert(err == ERROR_NOT_LOCKED || assert(err == ERROR_NOT_LOCKED ||
(mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION)); (mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION));
(void)err; (void)err;
@ -413,7 +413,7 @@ static void lck_unlock(MDBX_env *env) {
* releases such locks via deferred queues) */ * releases such locks via deferred queues) */
while (funlock(env->me_lazy_fd, LCK_BODY)) while (funlock(env->me_lazy_fd, LCK_BODY))
; ;
err = GetLastError(); err = (int)GetLastError();
assert(err == ERROR_NOT_LOCKED || assert(err == ERROR_NOT_LOCKED ||
(mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION)); (mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION));
(void)err; (void)err;
@ -421,7 +421,7 @@ static void lck_unlock(MDBX_env *env) {
while (funlock(env->me_lazy_fd, LCK_WHOLE)) while (funlock(env->me_lazy_fd, LCK_WHOLE))
; ;
err = GetLastError(); err = (int)GetLastError();
assert(err == ERROR_NOT_LOCKED || assert(err == ERROR_NOT_LOCKED ||
(mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION)); (mdbx_RunningUnderWine() && err == ERROR_LOCK_VIOLATION));
(void)err; (void)err;
@ -439,7 +439,7 @@ static int internal_seize_lck(HANDLE lfd) {
/* 1) now on ?-? (free), get ?-E (middle) */ /* 1) now on ?-? (free), get ?-E (middle) */
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (!flock(lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER)) { if (!flock(lfd, LCK_EXCLUSIVE | LCK_WAITFOR, LCK_UPPER)) {
rc = GetLastError() /* 2) something went wrong, give up */; rc = (int)GetLastError() /* 2) something went wrong, give up */;
mdbx_error("%s, err %u", "?-?(free) >> ?-E(middle)", rc); mdbx_error("%s, err %u", "?-?(free) >> ?-E(middle)", rc);
return rc; return rc;
} }
@ -450,20 +450,20 @@ static int internal_seize_lck(HANDLE lfd) {
return MDBX_RESULT_TRUE /* 4) got E-E (exclusive-write), done */; return MDBX_RESULT_TRUE /* 4) got E-E (exclusive-write), done */;
/* 5) still on ?-E (middle) */ /* 5) still on ?-E (middle) */
rc = GetLastError(); rc = (int)GetLastError();
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (rc != ERROR_SHARING_VIOLATION && rc != ERROR_LOCK_VIOLATION) { if (rc != ERROR_SHARING_VIOLATION && rc != ERROR_LOCK_VIOLATION) {
/* 6) something went wrong, give up */ /* 6) something went wrong, give up */
if (!funlock(lfd, LCK_UPPER)) if (!funlock(lfd, LCK_UPPER))
mdbx_panic("%s(%s) failed: err %u", __func__, "?-E(middle) >> ?-?(free)", mdbx_panic("%s(%s) failed: err %u", __func__, "?-E(middle) >> ?-?(free)",
GetLastError()); (int)GetLastError());
return rc; return rc;
} }
/* 7) still on ?-E (middle), try S-E (locked) */ /* 7) still on ?-E (middle), try S-E (locked) */
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
rc = flock(lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER) ? MDBX_RESULT_FALSE rc = flock(lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER) ? MDBX_RESULT_FALSE
: GetLastError(); : (int)GetLastError();
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (rc != MDBX_RESULT_FALSE) if (rc != MDBX_RESULT_FALSE)
@ -473,7 +473,7 @@ static int internal_seize_lck(HANDLE lfd) {
* transition to S-? (used) or ?-? (free) */ * transition to S-? (used) or ?-? (free) */
if (!funlock(lfd, LCK_UPPER)) if (!funlock(lfd, LCK_UPPER))
mdbx_panic("%s(%s) failed: err %u", __func__, mdbx_panic("%s(%s) failed: err %u", __func__,
"X-E(locked/middle) >> X-?(used/free)", GetLastError()); "X-E(locked/middle) >> X-?(used/free)", (int)GetLastError());
/* 9) now on S-? (used, DONE) or ?-? (free, FAILURE) */ /* 9) now on S-? (used, DONE) or ?-? (free, FAILURE) */
return rc; return rc;
@ -492,7 +492,7 @@ MDBX_INTERNAL_FUNC int mdbx_lck_seize(MDBX_env *env) {
/* LY: without-lck mode (e.g. on read-only filesystem) */ /* LY: without-lck mode (e.g. on read-only filesystem) */
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (!flock(env->me_lazy_fd, LCK_SHARED | LCK_DONTWAIT, LCK_WHOLE)) { if (!flock(env->me_lazy_fd, LCK_SHARED | LCK_DONTWAIT, LCK_WHOLE)) {
rc = GetLastError(); rc = (int)GetLastError();
mdbx_error("%s, err %u", "without-lck", rc); mdbx_error("%s, err %u", "without-lck", rc);
return rc; return rc;
} }
@ -509,7 +509,7 @@ MDBX_INTERNAL_FUNC int mdbx_lck_seize(MDBX_env *env) {
* - we can't lock meta-pages, otherwise other process could get an error * - we can't lock meta-pages, otherwise other process could get an error
* while opening db in valid (non-conflict) mode. */ * while opening db in valid (non-conflict) mode. */
if (!flock(env->me_lazy_fd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_BODY)) { if (!flock(env->me_lazy_fd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_BODY)) {
rc = GetLastError(); rc = (int)GetLastError();
mdbx_error("%s, err %u", "lock-against-without-lck", rc); mdbx_error("%s, err %u", "lock-against-without-lck", rc);
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
lck_unlock(env); lck_unlock(env);
@ -517,7 +517,7 @@ MDBX_INTERNAL_FUNC int mdbx_lck_seize(MDBX_env *env) {
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (!funlock(env->me_lazy_fd, LCK_BODY)) if (!funlock(env->me_lazy_fd, LCK_BODY))
mdbx_panic("%s(%s) failed: err %u", __func__, mdbx_panic("%s(%s) failed: err %u", __func__,
"unlock-against-without-lck", GetLastError()); "unlock-against-without-lck", (int)GetLastError());
} }
} }
@ -535,11 +535,11 @@ MDBX_INTERNAL_FUNC int mdbx_lck_downgrade(MDBX_env *env) {
/* 1) now at E-E (exclusive-write), transition to ?_E (middle) */ /* 1) now at E-E (exclusive-write), transition to ?_E (middle) */
if (!funlock(env->me_lfd, LCK_LOWER)) if (!funlock(env->me_lfd, LCK_LOWER))
mdbx_panic("%s(%s) failed: err %u", __func__, mdbx_panic("%s(%s) failed: err %u", __func__,
"E-E(exclusive-write) >> ?-E(middle)", GetLastError()); "E-E(exclusive-write) >> ?-E(middle)", (int)GetLastError());
/* 2) now at ?-E (middle), transition to S-E (locked) */ /* 2) now at ?-E (middle), transition to S-E (locked) */
if (!flock(env->me_lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER)) { if (!flock(env->me_lfd, LCK_SHARED | LCK_DONTWAIT, LCK_LOWER)) {
int rc = GetLastError() /* 3) something went wrong, give up */; int rc = (int)GetLastError() /* 3) something went wrong, give up */;
mdbx_error("%s, err %u", "?-E(middle) >> S-E(locked)", rc); mdbx_error("%s, err %u", "?-E(middle) >> S-E(locked)", rc);
return rc; return rc;
} }
@ -547,7 +547,7 @@ MDBX_INTERNAL_FUNC int mdbx_lck_downgrade(MDBX_env *env) {
/* 4) got S-E (locked), continue transition to S-? (used) */ /* 4) got S-E (locked), continue transition to S-? (used) */
if (!funlock(env->me_lfd, LCK_UPPER)) if (!funlock(env->me_lfd, LCK_UPPER))
mdbx_panic("%s(%s) failed: err %u", __func__, "S-E(locked) >> S-?(used)", mdbx_panic("%s(%s) failed: err %u", __func__, "S-E(locked) >> S-?(used)",
GetLastError()); (int)GetLastError());
return MDBX_SUCCESS /* 5) now at S-? (used), done */; return MDBX_SUCCESS /* 5) now at S-? (used), done */;
} }
@ -564,7 +564,7 @@ MDBX_INTERNAL_FUNC int mdbx_lck_upgrade(MDBX_env *env) {
/* 1) now on S-? (used), try S-E (locked) */ /* 1) now on S-? (used), try S-E (locked) */
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (!flock(env->me_lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_UPPER)) { if (!flock(env->me_lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_UPPER)) {
rc = GetLastError() /* 2) something went wrong, give up */; rc = (int)GetLastError() /* 2) something went wrong, give up */;
mdbx_verbose("%s, err %u", "S-?(used) >> S-E(locked)", rc); mdbx_verbose("%s, err %u", "S-?(used) >> S-E(locked)", rc);
return rc; return rc;
} }
@ -572,12 +572,12 @@ MDBX_INTERNAL_FUNC int mdbx_lck_upgrade(MDBX_env *env) {
/* 3) now on S-E (locked), transition to ?-E (middle) */ /* 3) now on S-E (locked), transition to ?-E (middle) */
if (!funlock(env->me_lfd, LCK_LOWER)) if (!funlock(env->me_lfd, LCK_LOWER))
mdbx_panic("%s(%s) failed: err %u", __func__, "S-E(locked) >> ?-E(middle)", mdbx_panic("%s(%s) failed: err %u", __func__, "S-E(locked) >> ?-E(middle)",
GetLastError()); (int)GetLastError());
/* 4) now on ?-E (middle), try E-E (exclusive-write) */ /* 4) now on ?-E (middle), try E-E (exclusive-write) */
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (!flock(env->me_lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_LOWER)) { if (!flock(env->me_lfd, LCK_EXCLUSIVE | LCK_DONTWAIT, LCK_LOWER)) {
rc = GetLastError() /* 5) something went wrong, give up */; rc = (int)GetLastError() /* 5) something went wrong, give up */;
mdbx_verbose("%s, err %u", "?-E(middle) >> E-E(exclusive-write)", rc); mdbx_verbose("%s, err %u", "?-E(middle) >> E-E(exclusive-write)", rc);
return rc; return rc;
} }
@ -637,11 +637,11 @@ MDBX_INTERNAL_FUNC int mdbx_rpid_check(MDBX_env *env, uint32_t pid) {
int rc; int rc;
if (likely(hProcess)) { if (likely(hProcess)) {
rc = WaitForSingleObject(hProcess, 0); rc = WaitForSingleObject(hProcess, 0);
if (unlikely(rc == WAIT_FAILED)) if (unlikely(rc == (int)WAIT_FAILED))
rc = GetLastError(); rc = (int)GetLastError();
CloseHandle(hProcess); CloseHandle(hProcess);
} else { } else {
rc = GetLastError(); rc = (int)GetLastError();
} }
switch (rc) { switch (rc) {
@ -733,10 +733,6 @@ static void WINAPI stub_srwlock_ReleaseExclusive(MDBX_srwlock *srwl) {
srwl->writerCount = 0; srwl->writerCount = 0;
} }
MDBX_srwlock_function mdbx_srwlock_Init, mdbx_srwlock_AcquireShared,
mdbx_srwlock_ReleaseShared, mdbx_srwlock_AcquireExclusive,
mdbx_srwlock_ReleaseExclusive;
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#if 0 /* LY: unused for now */ #if 0 /* LY: unused for now */
@ -744,7 +740,7 @@ static DWORD WINAPI stub_DiscardVirtualMemory(PVOID VirtualAddress,
SIZE_T Size) { SIZE_T Size) {
return VirtualAlloc(VirtualAddress, Size, MEM_RESET, PAGE_NOACCESS) return VirtualAlloc(VirtualAddress, Size, MEM_RESET, PAGE_NOACCESS)
? ERROR_SUCCESS ? ERROR_SUCCESS
: GetLastError(); : (int)GetLastError();
} }
#endif /* unused for now */ #endif /* unused for now */
@ -758,6 +754,10 @@ static uint64_t WINAPI stub_GetTickCount64(void) {
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#ifndef xMDBX_ALLOY #ifndef xMDBX_ALLOY
MDBX_srwlock_function mdbx_srwlock_Init, mdbx_srwlock_AcquireShared,
mdbx_srwlock_ReleaseShared, mdbx_srwlock_AcquireExclusive,
mdbx_srwlock_ReleaseExclusive;
MDBX_NtExtendSection mdbx_NtExtendSection; MDBX_NtExtendSection mdbx_NtExtendSection;
MDBX_GetFileInformationByHandleEx mdbx_GetFileInformationByHandleEx; MDBX_GetFileInformationByHandleEx mdbx_GetFileInformationByHandleEx;
MDBX_GetVolumeInformationByHandleW mdbx_GetVolumeInformationByHandleW; MDBX_GetVolumeInformationByHandleW mdbx_GetVolumeInformationByHandleW;

66
src/osal.c
View File

@ -25,7 +25,7 @@ static int waitstatus2errcode(DWORD result) {
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
return MDBX_SUCCESS; return MDBX_SUCCESS;
case WAIT_FAILED: case WAIT_FAILED:
return GetLastError(); return (int)GetLastError();
case WAIT_ABANDONED: case WAIT_ABANDONED:
return ERROR_ABANDONED_WAIT_0; return ERROR_ABANDONED_WAIT_0;
case WAIT_IO_COMPLETION: case WAIT_IO_COMPLETION:
@ -44,7 +44,7 @@ static int ntstatus2errcode(NTSTATUS status) {
memset(&ov, 0, sizeof(ov)); memset(&ov, 0, sizeof(ov));
ov.Internal = status; ov.Internal = status;
return GetOverlappedResult(NULL, &ov, &dummy, FALSE) ? MDBX_SUCCESS return GetOverlappedResult(NULL, &ov, &dummy, FALSE) ? MDBX_SUCCESS
: GetLastError(); : (int)GetLastError();
} }
/* We use native NT APIs to setup the memory map, so that we can /* We use native NT APIs to setup the memory map, so that we can
@ -384,17 +384,17 @@ MDBX_INTERNAL_FUNC int mdbx_condpair_init(mdbx_condpair_t *condpair) {
memset(condpair, 0, sizeof(mdbx_condpair_t)); memset(condpair, 0, sizeof(mdbx_condpair_t));
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if ((condpair->mutex = CreateMutexW(NULL, FALSE, NULL)) == NULL) { if ((condpair->mutex = CreateMutexW(NULL, FALSE, NULL)) == NULL) {
rc = GetLastError(); rc = (int)GetLastError();
goto bailout_mutex; goto bailout_mutex;
} }
if ((condpair->event[0] = CreateEventW(NULL, FALSE, FALSE, NULL)) == NULL) { if ((condpair->event[0] = CreateEventW(NULL, FALSE, FALSE, NULL)) == NULL) {
rc = GetLastError(); rc = (int)GetLastError();
goto bailout_event; goto bailout_event;
} }
if ((condpair->event[1] = CreateEventW(NULL, FALSE, FALSE, NULL)) != NULL) if ((condpair->event[1] = CreateEventW(NULL, FALSE, FALSE, NULL)) != NULL)
return MDBX_SUCCESS; return MDBX_SUCCESS;
rc = GetLastError(); rc = (int)GetLastError();
(void)CloseHandle(condpair->event[0]); (void)CloseHandle(condpair->event[0]);
bailout_event: bailout_event:
(void)CloseHandle(condpair->mutex); (void)CloseHandle(condpair->mutex);
@ -420,9 +420,9 @@ bailout_mutex:
MDBX_INTERNAL_FUNC int mdbx_condpair_destroy(mdbx_condpair_t *condpair) { MDBX_INTERNAL_FUNC int mdbx_condpair_destroy(mdbx_condpair_t *condpair) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
int rc = CloseHandle(condpair->mutex) ? MDBX_SUCCESS : GetLastError(); int rc = CloseHandle(condpair->mutex) ? MDBX_SUCCESS : (int)GetLastError();
rc = CloseHandle(condpair->event[0]) ? rc : GetLastError(); rc = CloseHandle(condpair->event[0]) ? rc : (int)GetLastError();
rc = CloseHandle(condpair->event[1]) ? rc : GetLastError(); rc = CloseHandle(condpair->event[1]) ? rc : (int)GetLastError();
#else #else
int err, rc = pthread_mutex_destroy(&condpair->mutex); int err, rc = pthread_mutex_destroy(&condpair->mutex);
rc = (err = pthread_cond_destroy(&condpair->cond[0])) ? err : rc; rc = (err = pthread_cond_destroy(&condpair->cond[0])) ? err : rc;
@ -443,7 +443,7 @@ MDBX_INTERNAL_FUNC int mdbx_condpair_lock(mdbx_condpair_t *condpair) {
MDBX_INTERNAL_FUNC int mdbx_condpair_unlock(mdbx_condpair_t *condpair) { MDBX_INTERNAL_FUNC int mdbx_condpair_unlock(mdbx_condpair_t *condpair) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
return ReleaseMutex(condpair->mutex) ? MDBX_SUCCESS : GetLastError(); return ReleaseMutex(condpair->mutex) ? MDBX_SUCCESS : (int)GetLastError();
#else #else
return pthread_mutex_unlock(&condpair->mutex); return pthread_mutex_unlock(&condpair->mutex);
#endif #endif
@ -452,7 +452,7 @@ MDBX_INTERNAL_FUNC int mdbx_condpair_unlock(mdbx_condpair_t *condpair) {
MDBX_INTERNAL_FUNC int mdbx_condpair_signal(mdbx_condpair_t *condpair, MDBX_INTERNAL_FUNC int mdbx_condpair_signal(mdbx_condpair_t *condpair,
bool part) { bool part) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
return SetEvent(condpair->event[part]) ? MDBX_SUCCESS : GetLastError(); return SetEvent(condpair->event[part]) ? MDBX_SUCCESS : (int)GetLastError();
#else #else
return pthread_cond_signal(&condpair->cond[part]); return pthread_cond_signal(&condpair->cond[part]);
#endif #endif
@ -530,7 +530,7 @@ MDBX_INTERNAL_FUNC int mdbx_removefile(const char *pathname) {
wchar_t *const pathnameW = _alloca((wlen + 1) * sizeof(wchar_t)); wchar_t *const pathnameW = _alloca((wlen + 1) * sizeof(wchar_t));
if (wlen != mbstowcs(pathnameW, pathname, wlen + 1)) if (wlen != mbstowcs(pathnameW, pathname, wlen + 1))
return ERROR_INVALID_NAME; return ERROR_INVALID_NAME;
return DeleteFileW(pathnameW) ? MDBX_SUCCESS : GetLastError(); return DeleteFileW(pathnameW) ? MDBX_SUCCESS : (int)GetLastError();
#else #else
return unlink(pathname) ? errno : MDBX_SUCCESS; return unlink(pathname) ? errno : MDBX_SUCCESS;
#endif #endif
@ -548,7 +548,7 @@ MDBX_INTERNAL_FUNC int mdbx_removedirectory(const char *pathname) {
wchar_t *const pathnameW = _alloca((wlen + 1) * sizeof(wchar_t)); wchar_t *const pathnameW = _alloca((wlen + 1) * sizeof(wchar_t));
if (wlen != mbstowcs(pathnameW, pathname, wlen + 1)) if (wlen != mbstowcs(pathnameW, pathname, wlen + 1))
return ERROR_INVALID_NAME; return ERROR_INVALID_NAME;
return RemoveDirectoryW(pathnameW) ? MDBX_SUCCESS : GetLastError(); return RemoveDirectoryW(pathnameW) ? MDBX_SUCCESS : (int)GetLastError();
#else #else
return rmdir(pathname) ? errno : MDBX_SUCCESS; return rmdir(pathname) ? errno : MDBX_SUCCESS;
#endif #endif
@ -615,11 +615,11 @@ MDBX_INTERNAL_FUNC int mdbx_openfile(const enum mdbx_openfile_purpose purpose,
*fd = CreateFileW(pathnameW, DesiredAccess, ShareMode, NULL, *fd = CreateFileW(pathnameW, DesiredAccess, ShareMode, NULL,
CreationDisposition, FlagsAndAttributes, NULL); CreationDisposition, FlagsAndAttributes, NULL);
if (*fd == INVALID_HANDLE_VALUE) if (*fd == INVALID_HANDLE_VALUE)
return GetLastError(); return (int)GetLastError();
BY_HANDLE_FILE_INFORMATION info; BY_HANDLE_FILE_INFORMATION info;
if (!GetFileInformationByHandle(*fd, &info)) { if (!GetFileInformationByHandle(*fd, &info)) {
int err = GetLastError(); int err = (int)GetLastError();
CloseHandle(*fd); CloseHandle(*fd);
*fd = INVALID_HANDLE_VALUE; *fd = INVALID_HANDLE_VALUE;
return err; return err;
@ -769,7 +769,7 @@ MDBX_INTERNAL_FUNC int mdbx_openfile(const enum mdbx_openfile_purpose purpose,
MDBX_INTERNAL_FUNC int mdbx_closefile(mdbx_filehandle_t fd) { MDBX_INTERNAL_FUNC int mdbx_closefile(mdbx_filehandle_t fd) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
return CloseHandle(fd) ? MDBX_SUCCESS : GetLastError(); return CloseHandle(fd) ? MDBX_SUCCESS : (int)GetLastError();
#else #else
assert(fd > STDERR_FILENO); assert(fd > STDERR_FILENO);
return (close(fd) == 0) ? MDBX_SUCCESS : errno; return (close(fd) == 0) ? MDBX_SUCCESS : errno;
@ -788,7 +788,7 @@ MDBX_INTERNAL_FUNC int mdbx_pread(mdbx_filehandle_t fd, void *buf, size_t bytes,
DWORD read = 0; DWORD read = 0;
if (unlikely(!ReadFile(fd, buf, (DWORD)bytes, &read, &ov))) { if (unlikely(!ReadFile(fd, buf, (DWORD)bytes, &read, &ov))) {
int rc = GetLastError(); int rc = (int)GetLastError();
return (rc == MDBX_SUCCESS) ? /* paranoia */ ERROR_READ_FAULT : rc; return (rc == MDBX_SUCCESS) ? /* paranoia */ ERROR_READ_FAULT : rc;
} }
#else #else
@ -816,7 +816,7 @@ MDBX_INTERNAL_FUNC int mdbx_pwrite(mdbx_filehandle_t fd, const void *buf,
if (unlikely(!WriteFile( if (unlikely(!WriteFile(
fd, buf, likely(bytes <= MAX_WRITE) ? (DWORD)bytes : MAX_WRITE, fd, buf, likely(bytes <= MAX_WRITE) ? (DWORD)bytes : MAX_WRITE,
&written, &ov))) &written, &ov)))
return GetLastError(); return (int)GetLastError();
if (likely(bytes == written)) if (likely(bytes == written))
return MDBX_SUCCESS; return MDBX_SUCCESS;
#else #else
@ -847,7 +847,7 @@ MDBX_INTERNAL_FUNC int mdbx_write(mdbx_filehandle_t fd, const void *buf,
if (unlikely(!WriteFile( if (unlikely(!WriteFile(
fd, buf, likely(bytes <= MAX_WRITE) ? (DWORD)bytes : MAX_WRITE, fd, buf, likely(bytes <= MAX_WRITE) ? (DWORD)bytes : MAX_WRITE,
&written, nullptr))) &written, nullptr)))
return GetLastError(); return (int)GetLastError();
if (likely(bytes == written)) if (likely(bytes == written))
return MDBX_SUCCESS; return MDBX_SUCCESS;
#else #else
@ -902,7 +902,7 @@ MDBX_INTERNAL_FUNC int mdbx_fsync(mdbx_filehandle_t fd,
enum mdbx_syncmode_bits mode_bits) { enum mdbx_syncmode_bits mode_bits) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if ((mode_bits & (MDBX_SYNC_DATA | MDBX_SYNC_IODQ)) && !FlushFileBuffers(fd)) if ((mode_bits & (MDBX_SYNC_DATA | MDBX_SYNC_IODQ)) && !FlushFileBuffers(fd))
return GetLastError(); return (int)GetLastError();
return MDBX_SUCCESS; return MDBX_SUCCESS;
#else #else
@ -949,7 +949,7 @@ int mdbx_filesize(mdbx_filehandle_t fd, uint64_t *length) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
BY_HANDLE_FILE_INFORMATION info; BY_HANDLE_FILE_INFORMATION info;
if (!GetFileInformationByHandle(fd, &info)) if (!GetFileInformationByHandle(fd, &info))
return GetLastError(); return (int)GetLastError();
*length = info.nFileSizeLow | (uint64_t)info.nFileSizeHigh << 32; *length = info.nFileSizeLow | (uint64_t)info.nFileSizeHigh << 32;
#else #else
struct stat st; struct stat st;
@ -973,7 +973,7 @@ MDBX_INTERNAL_FUNC int mdbx_is_pipe(mdbx_filehandle_t fd) {
case FILE_TYPE_PIPE: case FILE_TYPE_PIPE:
return MDBX_RESULT_TRUE; return MDBX_RESULT_TRUE;
default: default:
return GetLastError(); return (int)GetLastError();
} }
#else #else
struct stat info; struct stat info;
@ -1004,13 +1004,13 @@ MDBX_INTERNAL_FUNC int mdbx_ftruncate(mdbx_filehandle_t fd, uint64_t length) {
&EndOfFileInfo, &EndOfFileInfo,
sizeof(FILE_END_OF_FILE_INFO)) sizeof(FILE_END_OF_FILE_INFO))
? MDBX_SUCCESS ? MDBX_SUCCESS
: GetLastError(); : (int)GetLastError();
} else { } else {
LARGE_INTEGER li; LARGE_INTEGER li;
li.QuadPart = length; li.QuadPart = length;
return (SetFilePointerEx(fd, li, NULL, FILE_BEGIN) && SetEndOfFile(fd)) return (SetFilePointerEx(fd, li, NULL, FILE_BEGIN) && SetEndOfFile(fd))
? MDBX_SUCCESS ? MDBX_SUCCESS
: GetLastError(); : (int)GetLastError();
} }
#else #else
STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t),
@ -1024,7 +1024,7 @@ MDBX_INTERNAL_FUNC int mdbx_fseek(mdbx_filehandle_t fd, uint64_t pos) {
LARGE_INTEGER li; LARGE_INTEGER li;
li.QuadPart = pos; li.QuadPart = pos;
return SetFilePointerEx(fd, li, NULL, FILE_BEGIN) ? MDBX_SUCCESS return SetFilePointerEx(fd, li, NULL, FILE_BEGIN) ? MDBX_SUCCESS
: GetLastError(); : (int)GetLastError();
#else #else
STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t), STATIC_ASSERT_MSG(sizeof(off_t) >= sizeof(size_t),
"libmdbx requires 64-bit file I/O on 64-bit systems"); "libmdbx requires 64-bit file I/O on 64-bit systems");
@ -1040,7 +1040,7 @@ mdbx_thread_create(mdbx_thread_t *thread,
void *arg) { void *arg) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
*thread = CreateThread(NULL, 0, start_routine, arg, 0, NULL); *thread = CreateThread(NULL, 0, start_routine, arg, 0, NULL);
return *thread ? MDBX_SUCCESS : GetLastError(); return *thread ? MDBX_SUCCESS : (int)GetLastError();
#else #else
return pthread_create(thread, NULL, start_routine, arg); return pthread_create(thread, NULL, start_routine, arg);
#endif #endif
@ -1064,7 +1064,7 @@ MDBX_INTERNAL_FUNC int mdbx_msync(mdbx_mmap_t *map, size_t offset,
uint8_t *ptr = (uint8_t *)map->address + offset; uint8_t *ptr = (uint8_t *)map->address + offset;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if (!FlushViewOfFile(ptr, length)) if (!FlushViewOfFile(ptr, length))
return GetLastError(); return (int)GetLastError();
#else #else
#if defined(__linux__) || defined(__gnu_linux__) #if defined(__linux__) || defined(__gnu_linux__)
if (mode_bits == MDBX_SYNC_NONE && mdbx_linux_kernel_version > 0x02061300) if (mode_bits == MDBX_SYNC_NONE && mdbx_linux_kernel_version > 0x02061300)
@ -1089,7 +1089,7 @@ MDBX_INTERNAL_FUNC int mdbx_check_fs_rdonly(mdbx_filehandle_t handle,
DWORD unused, flags; DWORD unused, flags;
if (!mdbx_GetVolumeInformationByHandleW(handle, nullptr, 0, nullptr, &unused, if (!mdbx_GetVolumeInformationByHandleW(handle, nullptr, 0, nullptr, &unused,
&flags, nullptr, 0)) &flags, nullptr, 0))
return GetLastError(); return (int)GetLastError();
if ((flags & FILE_READ_ONLY_VOLUME) == 0) if ((flags & FILE_READ_ONLY_VOLUME) == 0)
return MDBX_EACCESS; return MDBX_EACCESS;
#else #else
@ -1164,7 +1164,7 @@ static int mdbx_check_fs_local(mdbx_filehandle_t handle, int flags) {
if (!mdbx_GetVolumeInformationByHandleW(handle, PathBuffer, INT16_MAX, if (!mdbx_GetVolumeInformationByHandleW(handle, PathBuffer, INT16_MAX,
&VolumeSerialNumber, NULL, &VolumeSerialNumber, NULL,
&FileSystemFlags, NULL, 0)) { &FileSystemFlags, NULL, 0)) {
rc = GetLastError(); rc = (int)GetLastError();
goto bailout; goto bailout;
} }
@ -1180,7 +1180,7 @@ static int mdbx_check_fs_local(mdbx_filehandle_t handle, int flags) {
if (!mdbx_GetFinalPathNameByHandleW(handle, PathBuffer, INT16_MAX, if (!mdbx_GetFinalPathNameByHandleW(handle, PathBuffer, INT16_MAX,
FILE_NAME_NORMALIZED | FILE_NAME_NORMALIZED |
VOLUME_NAME_NT)) { VOLUME_NAME_NT)) {
rc = GetLastError(); rc = (int)GetLastError();
goto bailout; goto bailout;
} }
@ -1563,7 +1563,7 @@ MDBX_INTERNAL_FUNC int mdbx_mresize(int flags, mdbx_mmap_t *map, size_t size,
SIZE_T RegionSize = limit - map->limit; SIZE_T RegionSize = limit - map->limit;
status = NtAllocateVirtualMemory(GetCurrentProcess(), &BaseAddress, 0, status = NtAllocateVirtualMemory(GetCurrentProcess(), &BaseAddress, 0,
&RegionSize, MEM_RESERVE, PAGE_NOACCESS); &RegionSize, MEM_RESERVE, PAGE_NOACCESS);
if (status == /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018) if (status == (NTSTATUS) /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018)
return MDBX_UNABLE_EXTEND_MAPSIZE; return MDBX_UNABLE_EXTEND_MAPSIZE;
if (!NT_SUCCESS(status)) if (!NT_SUCCESS(status))
return ntstatus2errcode(status); return ntstatus2errcode(status);
@ -1611,7 +1611,7 @@ retry_file_and_section:
&ReservedSize, MEM_RESERVE, PAGE_NOACCESS); &ReservedSize, MEM_RESERVE, PAGE_NOACCESS);
if (!NT_SUCCESS(status)) { if (!NT_SUCCESS(status)) {
ReservedAddress = NULL; ReservedAddress = NULL;
if (status != /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018) if (status != (NTSTATUS) /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018)
goto bailout_ntstatus /* no way to recovery */; goto bailout_ntstatus /* no way to recovery */;
if (may_move) if (may_move)
@ -1671,7 +1671,7 @@ retry_mapview:;
(flags & MDBX_WRITEMAP) ? PAGE_READWRITE : PAGE_READONLY); (flags & MDBX_WRITEMAP) ? PAGE_READWRITE : PAGE_READONLY);
if (!NT_SUCCESS(status)) { if (!NT_SUCCESS(status)) {
if (status == /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018 && if (status == (NTSTATUS) /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018 &&
map->address && may_move) { map->address && may_move) {
/* try remap at another base address */ /* try remap at another base address */
map->address = NULL; map->address = NULL;
@ -2422,7 +2422,7 @@ __cold int mdbx_get_sysraminfo(intptr_t *page_size, intptr_t *total_pages,
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.dwLength = sizeof(info); info.dwLength = sizeof(info);
if (!GlobalMemoryStatusEx(&info)) if (!GlobalMemoryStatusEx(&info))
return GetLastError(); return (int)GetLastError();
#endif #endif
if (total_pages) { if (total_pages) {

13
src/osal.h
View File

@ -148,6 +148,10 @@ __extern_C key_t ftok(const char *, int);
#elif _WIN32_WINNT < 0x0500 #elif _WIN32_WINNT < 0x0500
#error At least 'Windows 2000' API is required for libmdbx. #error At least 'Windows 2000' API is required for libmdbx.
#endif /* _WIN32_WINNT */ #endif /* _WIN32_WINNT */
#if (defined(__MINGW32__) || defined(__MINGW64__)) && \
!defined(__USE_MINGW_ANSI_STDIO)
#define __USE_MINGW_ANSI_STDIO 1
#endif /* MinGW */
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif /* WIN32_LEAN_AND_MEAN */ #endif /* WIN32_LEAN_AND_MEAN */
@ -170,6 +174,15 @@ typedef struct {
} mdbx_condpair_t; } mdbx_condpair_t;
typedef CRITICAL_SECTION mdbx_fastmutex_t; typedef CRITICAL_SECTION mdbx_fastmutex_t;
#if !defined(_MSC_VER) && !defined(__try)
/* *INDENT-OFF* */
/* clang-format off */
#define __try
#define __except(COND) if(false)
/* *INDENT-ON* */
/* clang-format on */
#endif /* stub for MSVC's __try/__except */
#if MDBX_WITHOUT_MSVC_CRT #if MDBX_WITHOUT_MSVC_CRT
#ifndef mdbx_malloc #ifndef mdbx_malloc

4
test/keygen.cc
View File

@ -191,7 +191,7 @@ void __hot maker::pair(serial_t serial, const buffer &key, buffer &value,
void maker::setup(const config::actor_params_pod &actor, unsigned actor_id, void maker::setup(const config::actor_params_pod &actor, unsigned actor_id,
unsigned thread_number) { unsigned thread_number) {
#if defined(__cpp_constexpr) #if CONSTEXPR_ENUM_FLAGS_OPERATIONS
static_assert(unsigned(MDBX_INTEGERKEY | MDBX_REVERSEKEY | MDBX_DUPSORT | static_assert(unsigned(MDBX_INTEGERKEY | MDBX_REVERSEKEY | MDBX_DUPSORT |
MDBX_INTEGERDUP | MDBX_REVERSEDUP) < UINT16_MAX, MDBX_INTEGERDUP | MDBX_REVERSEDUP) < UINT16_MAX,
"WTF?"); "WTF?");
@ -328,7 +328,7 @@ void __hot maker::mk_begin(const serial_t serial, const essentials &params,
void __hot maker::mk_continue(const serial_t serial, const essentials &params, void __hot maker::mk_continue(const serial_t serial, const essentials &params,
result &out) { result &out) {
#if defined(__cpp_constexpr) #if CONSTEXPR_ENUM_FLAGS_OPERATIONS
static_assert( static_assert(
(essentials::prng_fill_flag & (essentials::prng_fill_flag &
unsigned(MDBX_DUPSORT | MDBX_DUPFIXED | MDBX_INTEGERKEY | unsigned(MDBX_DUPSORT | MDBX_DUPFIXED | MDBX_INTEGERKEY |

3
test/log.cc
View File

@ -123,6 +123,9 @@ void output_nocheckloglevel_ap(const logging::loglevel priority,
struct tm tm; struct tm tm;
#ifdef _MSC_VER #ifdef _MSC_VER
int rc = _localtime32_s(&tm, (const __time32_t *)&now.utc); int rc = _localtime32_s(&tm, (const __time32_t *)&now.utc);
#elif defined(_WIN32) || defined(_WIN64)
const time_t time_proxy = now.utc;
int rc = localtime_s(&tm, &time_proxy);
#else #else
time_t time = now.utc; time_t time = now.utc;
int rc = localtime_r(&time, &tm) ? MDBX_SUCCESS : errno; int rc = localtime_r(&time, &tm) ? MDBX_SUCCESS : errno;