From 6c4280ab334cab2d629c3e057090ae98a29c3e49 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Dec 2017 17:13:08 +0300 Subject: merge with recent libmdbx fix --- plugins/Dbx_mdb/src/mdbx/bits.h | 2 +- plugins/Dbx_mdb/src/mdbx/defs.h | 2 +- plugins/Dbx_mdb/src/mdbx/lck-windows.c | 2 +- plugins/Dbx_mdb/src/mdbx/mdbx.c | 2 ++ plugins/Dbx_mdb/src/mdbx/mdbx.h | 2 +- plugins/Dbx_mdb/src/mdbx/osal.c | 2 +- plugins/Dbx_mdb/src/mdbx/osal.h | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) (limited to 'plugins/Dbx_mdb') diff --git a/plugins/Dbx_mdb/src/mdbx/bits.h b/plugins/Dbx_mdb/src/mdbx/bits.h index d1ebb7cd2d..4d3a50cc0b 100644 --- a/plugins/Dbx_mdb/src/mdbx/bits.h +++ b/plugins/Dbx_mdb/src/mdbx/bits.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2017 Leonid Yuriev * and other libmdbx authors: please see AUTHORS file. * All rights reserved. diff --git a/plugins/Dbx_mdb/src/mdbx/defs.h b/plugins/Dbx_mdb/src/mdbx/defs.h index 800553bb17..5190fa3a35 100644 --- a/plugins/Dbx_mdb/src/mdbx/defs.h +++ b/plugins/Dbx_mdb/src/mdbx/defs.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2017 Leonid Yuriev * and other libmdbx authors: please see AUTHORS file. * All rights reserved. diff --git a/plugins/Dbx_mdb/src/mdbx/lck-windows.c b/plugins/Dbx_mdb/src/mdbx/lck-windows.c index 0582b28d78..672512a7e1 100644 --- a/plugins/Dbx_mdb/src/mdbx/lck-windows.c +++ b/plugins/Dbx_mdb/src/mdbx/lck-windows.c @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2017 Leonid Yuriev * and other libmdbx authors: please see AUTHORS file. * All rights reserved. diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.c b/plugins/Dbx_mdb/src/mdbx/mdbx.c index 6e4182cfb2..e306208095 100644 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.c +++ b/plugins/Dbx_mdb/src/mdbx/mdbx.c @@ -2537,6 +2537,7 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) { r->mr_txnid = snap; mdbx_jitter4testing(false); mdbx_assert(env, r->mr_pid == mdbx_getpid()); + mdbx_assert(env, r->mr_tid == mdbx_thread_self()); mdbx_assert(env, r->mr_txnid == snap); mdbx_coherent_barrier(); env->me_lck->mti_readers_refresh_flag = true; @@ -4650,6 +4651,7 @@ LIBMDBX_API int mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, if (unlikely(rc != MDBX_SUCCESS)) goto bailout; } + env->me_sync_pending += env->me_psize; mdbx_meta_set_txnid(env, &meta, mdbx_meta_txnid_stable(env, head) + 1); rc = mdbx_sync_locked(env, env->me_flags, &meta); } diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.h b/plugins/Dbx_mdb/src/mdbx/mdbx.h index f7de11c0e4..421d833b70 100644 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.h +++ b/plugins/Dbx_mdb/src/mdbx/mdbx.h @@ -1,4 +1,4 @@ -/* LICENSE AND COPYRUSTING ***************************************************** +/* LICENSE AND COPYRUSTING ***************************************************** * * Copyright 2015-2017 Leonid Yuriev * and other libmdbx authors: please see AUTHORS file. diff --git a/plugins/Dbx_mdb/src/mdbx/osal.c b/plugins/Dbx_mdb/src/mdbx/osal.c index 5a8ec58002..d9026cfadf 100644 --- a/plugins/Dbx_mdb/src/mdbx/osal.c +++ b/plugins/Dbx_mdb/src/mdbx/osal.c @@ -772,7 +772,7 @@ int mdbx_mmap(int flags, mdbx_mmap_t *map, size_t must, size_t limit) { } NTSTATUS rc; -#if defined(_WIN64) && defined(WOF_CURRENT_VERSION) +#ifdef _WIN64 struct { WOF_EXTERNAL_INFO wof_info; union { diff --git a/plugins/Dbx_mdb/src/mdbx/osal.h b/plugins/Dbx_mdb/src/mdbx/osal.h index e3a503ba1a..871e52b0dc 100644 --- a/plugins/Dbx_mdb/src/mdbx/osal.h +++ b/plugins/Dbx_mdb/src/mdbx/osal.h @@ -1,4 +1,4 @@ -/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ +/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ /* * Copyright 2015-2017 Leonid Yuriev -- cgit v1.2.3