ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 22:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-windows: treat STATUS_INVALID_ADDRESS same as STATUS_CONFLICTING_ADDRESSES for some cases.

Browse Source 
Change-Id: I542c7f4010f880428e3c7b10413e4f98c4aa7b48
This commit is contained in:
Leonid Yuriev 2019-12-24 20:47:33 +03:00
parent 379a789839
commit 7b6880bdc9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elements/osal.c
View File

@ -1422,13 +1422,16 @@ MDBX_INTERNAL_FUNC int mdbx_mresize(int flags, mdbx_mmap_t *map, size_t size,
} }
if (limit > map->limit) { if (limit > map->limit) {
/* check ability of address space for growth before umnap */ /* check ability of address space for growth before unmap */
PVOID BaseAddress = (PBYTE)map->address + map->limit; PVOID BaseAddress = (PBYTE)map->address + map->limit;
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 (!NT_SUCCESS(status)) if (!NT_SUCCESS(status)) {
if (status == /* STATUS_INVALID_ADDRESS */ 0xC0000141)
status = /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018;
return ntstatus2errcode(status); return ntstatus2errcode(status);
}
status = NtFreeVirtualMemory(GetCurrentProcess(), &BaseAddress, &RegionSize, status = NtFreeVirtualMemory(GetCurrentProcess(), &BaseAddress, &RegionSize,
MEM_RELEASE); MEM_RELEASE);
@ -1468,7 +1471,8 @@ MDBX_INTERNAL_FUNC int mdbx_mresize(int flags, mdbx_mmap_t *map, size_t size,
&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 != /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018 &&
status != /* STATUS_INVALID_ADDRESS */ 0xC0000141)
goto bailout_ntstatus /* no way to recovery */; goto bailout_ntstatus /* no way to recovery */;
/* assume we can change base address if mapping size changed or prev address /* assume we can change base address if mapping size changed or prev address
@ -1528,7 +1532,8 @@ 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 == /* STATUS_CONFLICTING_ADDRESSES */ 0xC0000018 ||
status == /* STATUS_INVALID_ADDRESS */ 0xC0000141) &&
map->address) { map->address) {
/* try remap at another base address */ /* try remap at another base address */
map->address = NULL; map->address = NULL;