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

mdbx: backport - fix comments typos (squashed).

Browse Source
This commit is contained in:
Leonid Yuriev 2018-08-19 02:04:44 +03:00
parent bc6db4e4d7
commit 888003c072
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mdbx.h
View File

@ -468,7 +468,7 @@ typedef struct MDBX_envinfo {
uint64_t lower; /* lower limit for datafile size */ uint64_t lower; /* lower limit for datafile size */
uint64_t upper; /* upper limit for datafile size */ uint64_t upper; /* upper limit for datafile size */
uint64_t current; /* current datafile size */ uint64_t current; /* current datafile size */
uint64_t shrink; /* shrink theshold for datafile */ uint64_t shrink; /* shrink threshold for datafile */
uint64_t grow; /* growth step for datafile */ uint64_t grow; /* growth step for datafile */
} mi_geo; } mi_geo;
uint64_t mi_mapsize; /* Size of the data memory map */ uint64_t mi_mapsize; /* Size of the data memory map */

2
src/bits.h
View File

@ -408,7 +408,7 @@ typedef struct MDBX_lockinfo {
volatile uint32_t mti_envmode; volatile uint32_t mti_envmode;
#ifdef MDBX_OSAL_LOCK #ifdef MDBX_OSAL_LOCK
/* Mutex protecting write access to this table. */ /* Mutex protecting write-txn. */
union { union {
MDBX_OSAL_LOCK mti_wmutex; MDBX_OSAL_LOCK mti_wmutex;
uint8_t pad_mti_wmutex[MDBX_OSAL_LOCK_SIZE % sizeof(size_t)]; uint8_t pad_mti_wmutex[MDBX_OSAL_LOCK_SIZE % sizeof(size_t)];

2
src/mdbx.c
View File

@ -5391,7 +5391,7 @@ static int __cold mdbx_setup_dxb(MDBX_env *env, int lck_rc) {
/* apply preconfigured params, but only if substantial changes: /* apply preconfigured params, but only if substantial changes:
* - upper or lower limit changes * - upper or lower limit changes
* - shrink theshold or growth step * - shrink threshold or growth step
* But ignore just chagne just a 'now/current' size. */ * But ignore just chagne just a 'now/current' size. */
if (bytes_align2os_bytes(env, env->me_dbgeo.upper) != if (bytes_align2os_bytes(env, env->me_dbgeo.upper) !=
pgno_align2os_bytes(env, meta.mm_geo.upper) || pgno_align2os_bytes(env, meta.mm_geo.upper) ||

8
test/osal-windows.cc
View File

@ -53,7 +53,7 @@ void osal_wait4barrier(void) {
} }
} }
static HANDLE make_inharitable(HANDLE hHandle) { static HANDLE make_inheritable(HANDLE hHandle) {
assert(hHandle != NULL && hHandle != INVALID_HANDLE_VALUE); assert(hHandle != NULL && hHandle != INVALID_HANDLE_VALUE);
if (!DuplicateHandle(GetCurrentProcess(), hHandle, GetCurrentProcess(), if (!DuplicateHandle(GetCurrentProcess(), hHandle, GetCurrentProcess(),
&hHandle, 0, TRUE, &hHandle, 0, TRUE,
@ -71,7 +71,7 @@ void osal_setup(const std::vector<actor_config> &actors) {
HANDLE hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); HANDLE hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (!hEvent) if (!hEvent)
failure_perror("CreateEvent()", GetLastError()); failure_perror("CreateEvent()", GetLastError());
hEvent = make_inharitable(hEvent); hEvent = make_inheritable(hEvent);
log_trace("osal_setup: event %" PRIuPTR " -> %p", i, hEvent); log_trace("osal_setup: event %" PRIuPTR " -> %p", i, hEvent);
events[i] = hEvent; events[i] = hEvent;
} }
@ -79,12 +79,12 @@ void osal_setup(const std::vector<actor_config> &actors) {
hBarrierSemaphore = CreateSemaphore(NULL, 0, (LONG)actors.size(), NULL); hBarrierSemaphore = CreateSemaphore(NULL, 0, (LONG)actors.size(), NULL);
if (!hBarrierSemaphore) if (!hBarrierSemaphore)
failure_perror("CreateSemaphore(BarrierSemaphore)", GetLastError()); failure_perror("CreateSemaphore(BarrierSemaphore)", GetLastError());
hBarrierSemaphore = make_inharitable(hBarrierSemaphore); hBarrierSemaphore = make_inheritable(hBarrierSemaphore);
hBarrierEvent = CreateEvent(NULL, TRUE, FALSE, NULL); hBarrierEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (!hBarrierEvent) if (!hBarrierEvent)
failure_perror("CreateEvent(BarrierEvent)", GetLastError()); failure_perror("CreateEvent(BarrierEvent)", GetLastError());
hBarrierEvent = make_inharitable(hBarrierEvent); hBarrierEvent = make_inheritable(hBarrierEvent);
} }
void osal_broadcast(unsigned id) { void osal_broadcast(unsigned id) {