diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_block_alloc.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index 0897c65a64..d92fd755d8 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -41,7 +41,6 @@ mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk) */ pool->free_size += chunk->size; } - pool->refcount--; } else { mnd_efree(chunk->ptr); } @@ -74,8 +73,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz chunk->ptr = new_ptr; pool->free_size += chunk->size; chunk->size = size; - chunk->pool = NULL; /* now we have no pool memory */ - pool->refcount--; + chunk->from_pool = FALSE; /* now we have no pool memory */ } else { /* If the chunk is > than asked size then free_memory increases, otherwise decreases*/ pool->free_size += (chunk->size - size); @@ -93,8 +91,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz memcpy(new_ptr, chunk->ptr, chunk->size); chunk->ptr = new_ptr; chunk->size = size; - chunk->pool = NULL; /* now we have non-pool memory */ - pool->refcount--; + chunk->from_pool = FALSE; /* now we have non-pool memory */ } } } else { @@ -136,7 +133,6 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool } } else { chunk->from_pool = TRUE; - ++pool->refcount; chunk->ptr = pool->arena + (pool->arena_size - pool->free_size); /* Last step, update free_size */ pool->free_size -= size; @@ -157,7 +153,6 @@ mysqlnd_mempool_create(size_t arena_size) if (ret) { ret->get_chunk = mysqlnd_mempool_get_chunk; ret->free_size = ret->arena_size = arena_size ? arena_size : 0; - ret->refcount = 0; /* OOM ? */ ret->arena = mnd_emalloc(ret->arena_size); if (!ret->arena) { |