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

mdbx: more fix MSVC '/Wall' warnings.

Browse Source 
Change-Id: I359a3056d6bb5db762fe6b6b8a89e8ed066f8a87
This commit is contained in:
Leonid Yuriev
2017-07-26 15:56:39 +03:00
committed by Leo Yuriev
parent 006f531757
commit a78edd314e
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mdbx.c
View File

@@ -3024,7 +3024,7 @@ again_on_freelist_change:
if (total_room >= rpl_len) {
if (total_room == rpl_len || --more < 0)
break;
} else if (head_room >= env->me_maxfree_1pg && head_id > 1) {
} else if (head_room >= (ssize_t)env->me_maxfree_1pg && head_id > 1) {
/* Keep current record (overflow page), add a new one */
head_id--;
refill_reclaimed_pos++;
@@ -3072,7 +3072,7 @@ again_on_freelist_change:
/* (Re)write {key = head_id, IDL length = head_room} */
total_room -= head_room;
head_room = rpl_len - total_room;
if (head_room > env->me_maxfree_1pg && head_id > 1) {
if (head_room > (ssize_t)env->me_maxfree_1pg && head_id > 1) {
/* Overflow multi-page for part of me_reclaimed_pglist */
head_room /= (head_id < INT16_MAX) ? (pgno_t)head_id
: INT16_MAX; /* amortize page sizes */
@@ -4647,12 +4647,14 @@ static int __cold mdbx_setup_dxb(MDBX_env *env, int lck_rc) {
", have %" PRIu64 "/%" PRIaPGNO "), "
"assume collision in non-exclusive mode",
expected_bytes, bytes2pgno(env, expected_bytes),
filesize_before_mmap, bytes2pgno(env, filesize_before_mmap));
filesize_before_mmap,
bytes2pgno(env, (size_t)filesize_before_mmap));
} else {
mdbx_notice("filesize mismatch (expect %" PRIuPTR "/%" PRIaPGNO
", have %" PRIu64 "/%" PRIaPGNO ")",
expected_bytes, bytes2pgno(env, expected_bytes),
filesize_before_mmap, bytes2pgno(env, filesize_before_mmap));
filesize_before_mmap,
bytes2pgno(env, (size_t)filesize_before_mmap));
if (filesize_before_mmap < used_bytes) {
mdbx_error("last-page beyond end-of-file (last %" PRIaPGNO
", have %" PRIaPGNO ")",

6
src/osal.h
View File

@@ -83,13 +83,13 @@ typedef struct {
typedef CRITICAL_SECTION mdbx_fastmutex_t;
#else
#include <pthread.h>
#include <signal.h>
#include <sys/file.h>
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <unistd.h>
#include <signal.h>
typedef pthread_t mdbx_thread_t;
typedef pthread_key_t mdbx_thread_key_t;
#define INVALID_HANDLE_VALUE (-1)
@@ -561,7 +561,7 @@ static __inline uint64_t mdbx_atomic_add64(volatile uint64_t *p, uint64_t v) {
return __sync_fetch_and_add(p, v);
#else
#ifdef _MSC_VER
return _InterlockedExchangeAdd64(p, v);
return _InterlockedExchangeAdd64((volatile int64_t *)p, v);
#endif
#ifdef __APPLE__
return OSAtomicAdd64(v, (volatile int64_t *)p);
@@ -598,7 +598,7 @@ static __inline bool mdbx_atomic_compare_and_swap64(volatile uint64_t *p,
return __sync_bool_compare_and_swap(p, c, v);
#else
#ifdef _MSC_VER
return c == _InterlockedCompareExchange64(p, v, c);
return c == _InterlockedCompareExchange64((volatile int64_t *)p, v, c);
#endif
#ifdef __APPLE__
return c == OSAtomicCompareAndSwap64Barrier(c, v, (volatile uint64_t *)p);