osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

add a define that controls explicitely whether we want to use guard pages (if available) or not. 

let it default to     want-guard-pages  since the existing code does that.



svn path=/trunk/; revision=17562
This commit is contained in:
Ronnie Sahlberg 2006-03-10 05:15:52 +00:00
parent 0afb8cd493
commit eec9a1e95a
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
epan/emem.c
View File

@ -50,19 +50,6 @@
#include "emem.h"
#include <wiretap/file_util.h>
/* Add guard pages at each end of our allocated memory */
#if defined(HAVE_SYSCONF) && defined(HAVE_MMAP) && defined(HAVE_MPROTECT) && defined(HAVE_STDINT_H)
#include <stdint.h>
#include <sys/types.h>
#include <sys/mman.h>
#define USE_GUARD_PAGES 1
#endif
/* When required, allocate more memory from the OS in this size chunks */
#define EMEM_PACKET_CHUNK_SIZE 10485760
/* The maximum number of allocations per chunk */
#define EMEM_ALLOCS_PER_CHUNK (EMEM_PACKET_CHUNK_SIZE / 512)
/*
* Tools like Valgrind and ElectricFence don't work well with memchunks.
@ -72,9 +59,25 @@
/* #define EP_DEBUG_FREE 1 */
/* #define SE_DEBUG_FREE 1 */
#if GLIB_MAJOR_VERSION >= 2
GRand *rand_state = NULL;
/* Do we want to use guardpages? if available */
#define WANT_GUARD_PAGES 1
#ifdef WANT_GUARD_PAGES
/* Add guard pages at each end of our allocated memory */
#if defined(HAVE_SYSCONF) && defined(HAVE_MMAP) && defined(HAVE_MPROTECT) && defined(HAVE_STDINT_H)
#include <stdint.h>
#include <sys/types.h>
#include <sys/mman.h>
#define USE_GUARD_PAGES 1
#endif
#endif
/* When required, allocate more memory from the OS in this size chunks */
#define EMEM_PACKET_CHUNK_SIZE 10485760
/* The maximum number of allocations per chunk */
#define EMEM_ALLOCS_PER_CHUNK (EMEM_PACKET_CHUNK_SIZE / 512)
#define EMEM_CANARY_SIZE 8
#define EMEM_CANARY_DATA_SIZE (EMEM_CANARY_SIZE * 2 - 1)
@ -109,6 +112,10 @@ static emem_header_t se_packet_mem;
void
emem_canary(guint8 *canary) {
int i;
#if GLIB_MAJOR_VERSION >= 2
static GRand *rand_state = NULL;
#endif
/* First, use GLib's random function if we have it */
#if GLIB_MAJOR_VERSION >= 2