cvs: ZendEngine2(PHP_5_0) / zend_alloc.h

derick Wed Aug 11 02:13:12 2004 EDT Modified files: (Branch: PHP_5_0) /ZendEngine2 zend_alloc.h Log: - MFH: Patch to allow the Zend memory allocators to be disabled. http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.h?r1=1.52&r2=1.52.2.1&ty=u Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.52 ZendEngine2/zend_alloc.h:1.52.2.1 --- ZendEngine2/zend_alloc.h:1.52 Tue May 25 06:09:46 2004 +++ ZendEngine2/zend_alloc.h Wed Aug 11 02:13:12 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.h,v 1.52 2004/05/25 10:09:46 andi Exp $ */ +/* $Id: zend_alloc.h,v 1.52.2.1 2004/08/11 06:13:12 derick Exp $ */ #ifndef ZEND_ALLOC_H #define ZEND_ALLOC_H @@ -85,6 +85,10 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; +#define USE_ZEND_ALLOC 1 + +#if USE_ZEND_ALLOC + /* Standard wrapper macros */ #define emalloc(size) _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) #define safe_emalloc(nmemb, size, offset) _safe_emalloc((nmemb), (size), (offset) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) @@ -122,6 +126,52 @@ #define safe_estrdup(ptr) ((ptr)?(estrdup(ptr)):(empty_string)) #define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):(empty_string)) + +#else + +#define _GNU_SOURCE +#include <string.h> +#undef _GNU_SOURCE + +/* Standard wrapper macros */ +#define emalloc(size) malloc(size) +#define safe_emalloc(nmemb, size, offset) malloc((nmemb) * (size) + (offset)) +#define efree(ptr) free(ptr) +#define ecalloc(nmemb, size) calloc((nmemb), (size)) +#define erealloc(ptr, size) realloc((ptr), (size)) +#define erealloc_recoverable(ptr, size) realloc((ptr), (size)) +#define estrdup(s) strdup(s) +#define estrndup(s, length) strndup((s), (length)) + +/* Relay wrapper macros */ +#define emalloc_rel(size) malloc(size) +#define safe_emalloc_rel(nmemb, size, offset) malloc((nmemb) * (size) + (offset)) +#define efree_rel(ptr) free(ptr) +#define ecalloc_rel(nmemb, size) calloc((nmemb), (size)) +#define erealloc_rel(ptr, size) realloc((ptr), (size)) +#define erealloc_recoverable_rel(ptr, size) realloc((ptr), (size)) +#define estrdup_rel(s) strdup(s) +#define estrndup_rel(s, length) strndup((s), (length)) + +/* Selective persistent/non persistent allocation macros */ +#define pemalloc(size, persistent) malloc(size) +#define pefree(ptr, persistent) free(ptr) +#define pecalloc(nmemb, size, persistent) calloc((nmemb), (size)) +#define perealloc(ptr, size, persistent) realloc((ptr), (size)) +#define perealloc_recoverable(ptr, size, persistent) realloc((ptr), (size)) +#define pestrdup(s, persistent) strdup(s) + +#define pemalloc_rel(size, persistent) malloc(size) +#define pefree_rel(ptr, persistent) free(ptr) +#define pecalloc_rel(nmemb, size, persistent) calloc((nmemb), (size)) +#define perealloc_rel(ptr, size, persistent) realloc((ptr), (size)) +#define perealloc_recoverable_rel(ptr, size, persistent) realloc((ptr), (size)) +#define pestrdup_rel(s, persistent) strdup(s) + +#define safe_estrdup(ptr) ((ptr)?(strdup(ptr)):(empty_string)) +#define safe_estrndup(ptr, len) ((ptr)?(strndup((ptr), (len))):(empty_string)) + +#endif ZEND_API int zend_set_memory_limit(unsigned int memory_limit);