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

mdbx: fix MSVC/Windows warnings.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-24 19:02:24 +03:00
parent b9dbe7c577
commit 7315b99b9d
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mdbx.c
View File

@ -651,12 +651,13 @@ static const char *__mdbx_strerr(int errnum) {
const char *__cold mdbx_strerror_r(int errnum, char *buf, size_t buflen) { const char *__cold mdbx_strerror_r(int errnum, char *buf, size_t buflen) {
const char *msg = __mdbx_strerr(errnum); const char *msg = __mdbx_strerr(errnum);
if (!msg) { if (!msg) {
if (!buflen) if (!buflen || buflen > INT_MAX)
return NULL; return NULL;
#ifdef _MSC_VER #ifdef _MSC_VER
size_t size = FormatMessageA( size_t size = FormatMessageA(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, buflen, NULL); errnum, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (DWORD)buflen,
NULL);
return size ? buf : NULL; return size ? buf : NULL;
#elif defined(_GNU_SOURCE) #elif defined(_GNU_SOURCE)
/* GNU-specific */ /* GNU-specific */
@ -1085,7 +1086,7 @@ static int mdbx_page_loose(MDBX_cursor *mc, MDBX_page *mp) {
* [in] all No shortcuts. Needed except after a full mdbx_page_flush(). * [in] all No shortcuts. Needed except after a full mdbx_page_flush().
* *
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
static int mdbx_pages_xkeep(MDBX_cursor *mc, unsigned pflags, int all) { static int mdbx_pages_xkeep(MDBX_cursor *mc, unsigned pflags, bool all) {
const unsigned Mask = P_SUBP | P_DIRTY | P_LOOSE | P_KEEP; const unsigned Mask = P_SUBP | P_DIRTY | P_LOOSE | P_KEEP;
MDBX_txn *txn = mc->mc_txn; MDBX_txn *txn = mc->mc_txn;
MDBX_cursor *m3, *m0 = mc; MDBX_cursor *m3, *m0 = mc;
@ -1142,7 +1143,7 @@ mark_done:
return rc; return rc;
} }
static int mdbx_page_flush(MDBX_txn *txn, int keep); static int mdbx_page_flush(MDBX_txn *txn, size_t keep);
/* Spill pages from the dirty list back to disk. /* Spill pages from the dirty list back to disk.
* This is intended to prevent running into MDBX_TXN_FULL situations, * This is intended to prevent running into MDBX_TXN_FULL situations,
@ -1180,16 +1181,13 @@ static int mdbx_page_flush(MDBX_txn *txn, int keep);
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) { static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
MDBX_txn *txn = m0->mc_txn; MDBX_txn *txn = m0->mc_txn;
MDBX_page *dp;
MDBX_ID2L dl = txn->mt_rw_dirtylist; MDBX_ID2L dl = txn->mt_rw_dirtylist;
unsigned i, j, need;
int rc;
if (m0->mc_flags & C_SUB) if (m0->mc_flags & C_SUB)
return MDBX_SUCCESS; return MDBX_SUCCESS;
/* Estimate how much space this op will take */ /* Estimate how much space this op will take */
i = m0->mc_db->md_depth; size_t i = m0->mc_db->md_depth;
/* Named DBs also dirty the main DB */ /* Named DBs also dirty the main DB */
if (m0->mc_dbi >= CORE_DBS) if (m0->mc_dbi >= CORE_DBS)
i += txn->mt_dbs[MAIN_DBI].md_depth; i += txn->mt_dbs[MAIN_DBI].md_depth;
@ -1197,7 +1195,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
if (key) if (key)
i += (LEAFSIZE(key, data) + txn->mt_env->me_psize) / txn->mt_env->me_psize; i += (LEAFSIZE(key, data) + txn->mt_env->me_psize) / txn->mt_env->me_psize;
i += i; /* double it for good measure */ i += i; /* double it for good measure */
need = i; size_t need = i;
if (txn->mt_dirtyroom > i) if (txn->mt_dirtyroom > i)
return MDBX_SUCCESS; return MDBX_SUCCESS;
@ -1209,8 +1207,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
} else { } else {
/* purge deleted slots */ /* purge deleted slots */
MDBX_IDL sl = txn->mt_spill_pages; MDBX_IDL sl = txn->mt_spill_pages;
unsigned num = sl[0]; unsigned num = sl[0], j = 0;
j = 0;
for (i = 1; i <= num; i++) { for (i = 1; i <= num; i++) {
if (!(sl[i] & 1)) if (!(sl[i] & 1))
sl[++j] = sl[i]; sl[++j] = sl[i];
@ -1219,7 +1216,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
} }
/* Preserve pages which may soon be dirtied again */ /* Preserve pages which may soon be dirtied again */
rc = mdbx_pages_xkeep(m0, P_DIRTY, 1); int rc = mdbx_pages_xkeep(m0, P_DIRTY, 1);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
@ -1236,7 +1233,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
/* flush from the tail forward, this saves a lot of shifting later on. */ /* flush from the tail forward, this saves a lot of shifting later on. */
for (i = dl[0].mid; i && need; i--) { for (i = dl[0].mid; i && need; i--) {
pgno_t pn = dl[i].mid << 1; pgno_t pn = dl[i].mid << 1;
dp = dl[i].mptr; MDBX_page *dp = dl[i].mptr;
if (dp->mp_flags & (P_LOOSE | P_KEEP)) if (dp->mp_flags & (P_LOOSE | P_KEEP))
continue; continue;
/* Can't spill twice, /* Can't spill twice,
@ -1245,7 +1242,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
MDBX_txn *tx2; MDBX_txn *tx2;
for (tx2 = txn->mt_parent; tx2; tx2 = tx2->mt_parent) { for (tx2 = txn->mt_parent; tx2; tx2 = tx2->mt_parent) {
if (tx2->mt_spill_pages) { if (tx2->mt_spill_pages) {
j = mdbx_midl_search(tx2->mt_spill_pages, pn); unsigned j = mdbx_midl_search(tx2->mt_spill_pages, pn);
if (j <= tx2->mt_spill_pages[0] && tx2->mt_spill_pages[j] == pn) { if (j <= tx2->mt_spill_pages[0] && tx2->mt_spill_pages[j] == pn) {
dp->mp_flags |= P_KEEP; dp->mp_flags |= P_KEEP;
break; break;
@ -1268,7 +1265,7 @@ static int mdbx_page_spill(MDBX_cursor *m0, MDBX_val *key, MDBX_val *data) {
goto bailout; goto bailout;
/* Reset any dirty pages we kept that page_flush didn't see */ /* Reset any dirty pages we kept that page_flush didn't see */
rc = mdbx_pages_xkeep(m0, P_DIRTY | P_KEEP, i); rc = mdbx_pages_xkeep(m0, P_DIRTY | P_KEEP, i != 0);
bailout: bailout:
txn->mt_flags |= rc ? MDBX_TXN_ERROR : MDBX_TXN_SPILLS; txn->mt_flags |= rc ? MDBX_TXN_ERROR : MDBX_TXN_SPILLS;
@ -2839,7 +2836,7 @@ bailout:
* [in] txn the transaction that's being committed * [in] txn the transaction that's being committed
* [in] keep number of initial pages in dirtylist to keep dirty. * [in] keep number of initial pages in dirtylist to keep dirty.
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
static int mdbx_page_flush(MDBX_txn *txn, int keep) { static int mdbx_page_flush(MDBX_txn *txn, size_t keep) {
MDBX_env *env = txn->mt_env; MDBX_env *env = txn->mt_env;
MDBX_ID2L dl = txn->mt_rw_dirtylist; MDBX_ID2L dl = txn->mt_rw_dirtylist;
unsigned psize = env->me_psize, j; unsigned psize = env->me_psize, j;