com php-src: Don't inline "slow" and rarely used functions.: Zend/zend_alloc.c Zend/zend_alloc.h

From: Date: Wed, 09 Sep 2015 10:42:35 +0000
Subject: com php-src: Don't inline "slow" and rarely used functions.: Zend/zend_alloc.c Zend/zend_alloc.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88976@lists.php.net to get a copy of this message
Commit: ac83eaef1097552065395872c69b77dcab2919b1 Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Sep 2015 13:42:35 +0300 Parents: 6d885e395ca33fef28c5b84b7cfd59885aaa6e2d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ac83eaef1097552065395872c69b77dcab2919b1 Log: Don't inline "slow" and rarely used functions. Changed paths: M Zend/zend_alloc.c M Zend/zend_alloc.h Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 05a53ba..4d5f2dc 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc..c @@ -2792,6 +2792,37 @@ ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_handlers *handlers, void #endif } +static ZEND_COLD ZEND_NORETURN void zend_out_of_memory(void) +{ + fprintf(stderr, "Out of memory\n"); + exit(1); +} + +ZEND_API void * __zend_malloc(size_t len) +{ + void *tmp = malloc(len); + if (EXPECTED(tmp)) { + return tmp; + } + zend_out_of_memory(); +} + +ZEND_API void * __zend_calloc(size_t nmemb, size_t len) +{ + void *tmp = _safe_malloc(nmemb, len, 0); + memset(tmp, 0, nmemb * len); + return tmp; +} + +ZEND_API void * __zend_realloc(void *p, size_t len) +{ + p = realloc(p, len); + if (EXPECTED(p)) { + return p; + } + zend_out_of_memory(); +} + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index cd4bb62..c250de0 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -187,33 +187,9 @@ ZEND_API void ZEND_FASTCALL _efree_huge(void *, size_t size); #define estrndup_rel(s, length) _estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define zend_mem_block_size_rel(ptr) _zend_mem_block_size((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) -zend_always_inline static void * __zend_malloc(size_t len) -{ - void *tmp = malloc(len); - if (tmp) { - return tmp; - } - fprintf(stderr, "Out of memory\n"); - exit(1); -} - -zend_always_inline static void * __zend_calloc(size_t nmemb, size_t len) -{ - void *tmp = _safe_malloc(nmemb, len, 0); - memset(tmp, 0, nmemb * len); - return tmp; -} - -zend_always_inline static void * __zend_realloc(void *p, size_t len) -{ - p = realloc(p, len); - if (p) { - return p; - } - fprintf(stderr, "Out of memory\n"); - exit(1); -} - +ZEND_API void * __zend_malloc(size_t len) ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE(1); +ZEND_API void * __zend_calloc(size_t nmemb, size_t len) ZEND_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_ALLOC_SIZE2(1,2); +ZEND_API void * __zend_realloc(void *p, size_t len) ZEND_ATTRIBUTE_ALLOC_SIZE(2); /* Selective persistent/non persistent allocation macros */ #define pemalloc(size, persistent) ((persistent)?__zend_malloc(size):emalloc(size))

« previous php.cvs (#88976) next »