archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use PHP memory manager for mysqlnd memory pools.

Browse source
This commit is contained in:
Dmitry Stogov 2015-04-02 14:28:39 +03:00
parent ad863c1740
commit 83a15801cc
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -44,9 +44,9 @@ mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk)
} }
pool->refcount--; pool->refcount--;
} else { } else {
mnd_free(chunk->ptr); mnd_efree(chunk->ptr);
} }
mnd_free(chunk); mnd_efree(chunk);
DBG_VOID_RETURN; DBG_VOID_RETURN;
} }
/* }}} */ /* }}} */
@ -67,7 +67,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
*/ */
if ((chunk->size + pool->free_size) < size) { if ((chunk->size + pool->free_size) < size) {
zend_uchar *new_ptr; zend_uchar *new_ptr;
new_ptr = mnd_malloc(size); new_ptr = mnd_emalloc(size);
if (!new_ptr) { if (!new_ptr) {
DBG_RETURN(FAIL); DBG_RETURN(FAIL);
} }
@ -87,7 +87,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
; /* nop */ ; /* nop */
} else { } else {
zend_uchar *new_ptr; zend_uchar *new_ptr;
new_ptr = mnd_malloc(size); new_ptr = mnd_emalloc(size);
if (!new_ptr) { if (!new_ptr) {
DBG_RETURN(FAIL); DBG_RETURN(FAIL);
} }
@ -99,7 +99,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz
} }
} }
} else { } else {
zend_uchar *new_ptr = mnd_realloc(chunk->ptr, size); zend_uchar *new_ptr = mnd_erealloc(chunk->ptr, size);
if (!new_ptr) { if (!new_ptr) {
DBG_RETURN(FAIL); DBG_RETURN(FAIL);
} }
@ -117,7 +117,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool
MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL; MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL;
DBG_ENTER("mysqlnd_mempool_get_chunk"); DBG_ENTER("mysqlnd_mempool_get_chunk");
chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK)); chunk = mnd_emalloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK));
if (chunk) { if (chunk) {
chunk->free_chunk = mysqlnd_mempool_free_chunk; chunk->free_chunk = mysqlnd_mempool_free_chunk;
chunk->resize_chunk = mysqlnd_mempool_resize_chunk; chunk->resize_chunk = mysqlnd_mempool_resize_chunk;
@ -130,7 +130,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool
chunk->pool = pool; chunk->pool = pool;
if (size > pool->free_size) { if (size > pool->free_size) {
chunk->from_pool = FALSE; chunk->from_pool = FALSE;
chunk->ptr = mnd_malloc(size); chunk->ptr = mnd_emalloc(size);
if (!chunk->ptr) { if (!chunk->ptr) {
chunk->free_chunk(chunk); chunk->free_chunk(chunk);
chunk = NULL; chunk = NULL;
@ -153,14 +153,14 @@ PHPAPI MYSQLND_MEMORY_POOL *
mysqlnd_mempool_create(size_t arena_size) mysqlnd_mempool_create(size_t arena_size)
{ {
/* We calloc, because we free(). We don't mnd_calloc() for a reason. */ /* We calloc, because we free(). We don't mnd_calloc() for a reason. */
MYSQLND_MEMORY_POOL * ret = mnd_calloc(1, sizeof(MYSQLND_MEMORY_POOL)); MYSQLND_MEMORY_POOL * ret = mnd_ecalloc(1, sizeof(MYSQLND_MEMORY_POOL));
DBG_ENTER("mysqlnd_mempool_create"); DBG_ENTER("mysqlnd_mempool_create");
if (ret) { if (ret) {
ret->get_chunk = mysqlnd_mempool_get_chunk; ret->get_chunk = mysqlnd_mempool_get_chunk;
ret->free_size = ret->arena_size = arena_size ? arena_size : 0; ret->free_size = ret->arena_size = arena_size ? arena_size : 0;
ret->refcount = 0; ret->refcount = 0;
/* OOM ? */ /* OOM ? */
ret->arena = mnd_malloc(ret->arena_size); ret->arena = mnd_emalloc(ret->arena_size);
if (!ret->arena) { if (!ret->arena) {
mysqlnd_mempool_destroy(ret); mysqlnd_mempool_destroy(ret);
ret = NULL; ret = NULL;
@ -177,8 +177,8 @@ mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool)
{ {
DBG_ENTER("mysqlnd_mempool_destroy"); DBG_ENTER("mysqlnd_mempool_destroy");
/* mnd_free will reference LOCK_access and might crash, depending on the caller...*/ /* mnd_free will reference LOCK_access and might crash, depending on the caller...*/
mnd_free(pool->arena); mnd_efree(pool->arena);
mnd_free(pool); mnd_efree(pool);
DBG_VOID_RETURN; DBG_VOID_RETURN;
} }
/* }}} */ /* }}} */