Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #13483: Use VirtualAlloc in obmalloc on Windows.

This commit is contained in:
Martin v. Löwis 2013-06-27 12:23:29 +02:00
parent fe3ae3cdc7
commit cd83fa8c3e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
- Issue #13483: Use VirtualAlloc in obmalloc on Windows.
- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
OverflowError when an argument of %c format is out of range.

14
Objects/obmalloc.c
View File

@ -9,6 +9,10 @@
#endif
#endif
#ifdef MS_WINDOWS
#include <windows.h>
#endif
#ifdef WITH_VALGRIND
#include <valgrind/valgrind.h>
@ -598,7 +602,11 @@ new_arena(void)
arenaobj = unused_arena_objects;
unused_arena_objects = arenaobj->nextarena;
assert(arenaobj->address == 0);
#ifdef ARENAS_USE_MMAP
#ifdef MS_WINDOWS
address = (void*)VirtualAlloc(NULL, ARENA_SIZE,
MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
err = (address == NULL);
#elif defined(ARENAS_USE_MMAP)
address = mmap(NULL, ARENA_SIZE, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
err = (address == MAP_FAILED);
@ -1093,7 +1101,9 @@ PyObject_Free(void *p)
unused_arena_objects = ao;
/* Free the entire arena. */
#ifdef ARENAS_USE_MMAP
#ifdef MS_WINDOWS
VirtualFree((void *)ao->address, 0, MEM_RELEASE);
#elif defined(ARENAS_USE_MMAP)
munmap((void *)ao->address, ARENA_SIZE);
#else
free((void *)ao->address);