pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfixed: free task point correctly in free_queue_destroy

pull/10/head
yuqing 2016-02-22 18:34:41 +08:00
parent e32e6315b5
commit 09bc970dab
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,6 +1,7 @@
Version 1.25 2016-02-19 Version 1.25 2016-02-22
* php7_ext_wrapper.h add more macro defines * php7_ext_wrapper.h add more macro defines
* compile passed in FreeBSD 10.2 * compile passed in FreeBSD 10.2
* bugfixed: free task point correctly in free_queue_destroy
Version 1.24 2016-02-15 Version 1.24 2016-02-15
* php extension compiled on PHP 7 * php extension compiled on PHP 7

26
src/fast_task_queue.c
View File

@ -313,17 +313,21 @@ void free_queue_destroy()
char *pCharEnd; char *pCharEnd;
struct fast_task_info *pTask; struct fast_task_info *pTask;
pCharEnd = ((char *)g_mpool.head->blocks) + g_free_queue.block_size * mpool = g_mpool.head;
g_free_queue.alloc_connections; while (mpool != NULL)
for (p=(char *)g_mpool.head->blocks; p<pCharEnd; p += g_free_queue.block_size) {
{ pCharEnd = (char *)mpool->last_block + g_free_queue.block_size;
pTask = (struct fast_task_info *)p; for (p=(char *)mpool->blocks; p<pCharEnd; p += g_free_queue.block_size)
if (pTask->data != NULL) {
{ pTask = (struct fast_task_info *)p;
free(pTask->data); if (pTask->data != NULL)
pTask->data = NULL; {
} free(pTask->data);
} pTask->data = NULL;
}
}
mpool = mpool->next;
}
} }
mpool = g_mpool.head; mpool = g_mpool.head;