Remove apc_emalloc and friends

Instead use pemalloc(, 1) etc, which are the PHP provided
infallible system allocator functions. The naming apc_emalloc was
rather confusing, as it usually implies per-request allocation.

Author: nikic

apc.c

@@ -34,45 +34,6 @@
 #include "apc_globals.h"
 #include "php.h"
 
-#if HAVE_PCRE || HAVE_BUNDLED_PCRE
-#   include "ext/pcre/php_pcre.h"
-#   include "zend_smart_str.h"
-#endif
-
-/* {{{ memory allocation wrappers */
-
-PHP_APCU_API void* apc_emalloc(size_t n)
-{
-	void* p = malloc(n);
-	if (p == NULL) {
-		apc_error("apc_emalloc: malloc failed to allocate %zu bytes:", n);
-		return NULL;
-	}
-	return p;
-}
-
-PHP_APCU_API void* apc_erealloc(void* p, size_t n)
-{
-	void *new;
-	new = realloc(p, n);
-	if (new == NULL) {
-		apc_error("apc_erealloc: realloc failed to allocate %zu bytes:", n);
-		return NULL;
-	}
-	return new;
-}
-
-PHP_APCU_API void apc_efree(void* p)
-{
-	if (p == NULL) {
-		apc_error("apc_efree: attempt to free null pointer");
-		return;
-	}
-	free(p);
-}
-
-/* }}} */
-
 /* {{{ console display functions */
 #define APC_PRINT_FUNCTION(name, verbosity)					\
 	void apc_##name(const char *format, ...)				\

apc.h

@@ -67,15 +67,6 @@
 #include "php.h"
 #include "main/php_streams.h"
 
-/* typedefs for extensible memory allocators */
-typedef void* (*apc_malloc_t)(size_t);
-typedef void  (*apc_free_t)  (void *);
-
-/* wrappers for memory allocation routines */
-PHP_APCU_API void* apc_emalloc(size_t n);
-PHP_APCU_API void* apc_erealloc(void* p, size_t n);
-PHP_APCU_API void  apc_efree(void* p);
-
 /* console display functions */
 PHP_APCU_API void apc_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);
 PHP_APCU_API void apc_warning(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);

apc_cache.c

@@ -277,7 +277,7 @@ PHP_APCU_API apc_cache_t* apc_cache_create(apc_sma_t* sma, apc_serializer_t* ser
 	nslots = make_prime(size_hint > 0 ? size_hint : 2000);
 
 	/* allocate pointer by normal means */
-	cache = (apc_cache_t*) apc_emalloc(sizeof(apc_cache_t));
+	cache = (apc_cache_t*) pemalloc(sizeof(apc_cache_t), 1);
 
 	if (!cache) {
 		apc_error("Unable to allocate memory for cache structures. (Perhaps your memory_limit isn't large enough?). ");
@@ -666,7 +666,7 @@ PHP_APCU_API void apc_cache_destroy(apc_cache_t* cache)
 		children to freeze. It might be because the segment is shared between
 		several processes. To figure out is how to free this safely. */
 	/*apc_sma_free(cache->shmaddr);*/
-	apc_efree(cache);
+	free(cache);
 }
 /* }}} */
 

apc_signal.c

@@ -124,8 +124,8 @@ static int apc_register_signal(int signo, void (*handler)(int, siginfo_t*, void*
 			p_sig.siginfo = ((sa.sa_flags & SA_SIGINFO) == SA_SIGINFO);
 			p_sig.handler = (void *)sa.sa_handler;
 
-			apc_signal_info.prev = (apc_signal_entry_t **)apc_erealloc(apc_signal_info.prev, (apc_signal_info.installed+1)*sizeof(apc_signal_entry_t *));
-			apc_signal_info.prev[apc_signal_info.installed] = (apc_signal_entry_t *)apc_emalloc(sizeof(apc_signal_entry_t));
+			apc_signal_info.prev = (apc_signal_entry_t **) perealloc(apc_signal_info.prev, (apc_signal_info.installed+1)*sizeof(apc_signal_entry_t *), 1);
+			apc_signal_info.prev[apc_signal_info.installed] = (apc_signal_entry_t *) pemalloc(sizeof(apc_signal_entry_t), 1);
 			*apc_signal_info.prev[apc_signal_info.installed++] = p_sig;
 		} else {
 			/* inherit flags and mask if already set */
@@ -201,10 +201,10 @@ void apc_shutdown_signals()
 {
 	int i=0;
 	if (apc_signal_info.installed > 0) {
-		for (i=0;  (i < apc_signal_info.installed);  i++) {
-			apc_efree(apc_signal_info.prev[i]);
+		for (i=0; i < apc_signal_info.installed; i++) {
+			free(apc_signal_info.prev[i]);
 		}
-		apc_efree(apc_signal_info.prev);
+		free(apc_signal_info.prev);
 		apc_signal_info.installed = 0; /* just in case */
 	}
 }

apc_sma.c

@@ -295,7 +295,7 @@ PHP_APCU_API void apc_sma_api_init(apc_sma_t* sma, void** data, apc_sma_expunge_
 
 	sma->size = size > 0 ? size : DEFAULT_SEGSIZE;
 
-	sma->segs = (apc_segment_t*) apc_emalloc((sma->num * sizeof(apc_segment_t)));
+	sma->segs = (apc_segment_t*) pemalloc(sma->num * sizeof(apc_segment_t), 1);
 
 	for (i = 0; i < sma->num; i++) {
 		sma_header_t*   header;
@@ -371,7 +371,7 @@ PHP_APCU_API void apc_sma_api_cleanup(apc_sma_t* sma) {
 	}
 	sma->initialized = 0;
 
-	apc_efree(sma->segs);
+	free(sma->segs);
 }
 
 PHP_APCU_API void* apc_sma_api_malloc_ex(apc_sma_t* sma, zend_ulong n, zend_ulong fragment, zend_ulong* allocated) {
@@ -563,11 +563,11 @@ PHP_APCU_API apc_sma_info_t* apc_sma_api_info(apc_sma_t* sma, zend_bool limited)
 		return NULL;
 	}
 
-	info = (apc_sma_info_t*) apc_emalloc(sizeof(apc_sma_info_t));
+	info = (apc_sma_info_t*) pemalloc(sizeof(apc_sma_info_t), 1);
 	info->num_seg = sma->num;
 	info->seg_size = sma->size - (ALIGNWORD(sizeof(sma_header_t)) + ALIGNWORD(sizeof(block_t)) + ALIGNWORD(sizeof(block_t)));
 
-	info->list = apc_emalloc(info->num_seg * sizeof(apc_sma_link_t*));
+	info->list = pemalloc(info->num_seg * sizeof(apc_sma_link_t*), 1);
 	for (i = 0; i < sma->num; i++) {
 		info->list[i] = NULL;
 	}
@@ -590,7 +590,7 @@ PHP_APCU_API apc_sma_info_t* apc_sma_api_info(apc_sma_t* sma, zend_bool limited)
 
 			CHECK_CANARY(cur);
 
-			*link = apc_emalloc(sizeof(apc_sma_link_t));
+			*link = pemalloc(sizeof(apc_sma_link_t), 1);
 			(*link)->size = cur->size;
 			(*link)->offset = prv->fnext;
 			(*link)->next = NULL;
@@ -612,11 +612,11 @@ PHP_APCU_API void apc_sma_api_free_info(apc_sma_t* sma, apc_sma_info_t* info) {
 		while (p) {
 			apc_sma_link_t* q = p;
 			p = p->next;
-			apc_efree(q);
+			free(q);
 		}
 	}
-	apc_efree(info->list);
-	apc_efree(info);
+	free(info->list);
+	free(info);
 }
 
 PHP_APCU_API zend_ulong apc_sma_api_get_avail_mem(apc_sma_t* sma) {