kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of taskprocessor fields no longer necessary.

Browse Source 
This includes changing the taskprocessor to use its builtin
ao2_lock instead of having a separate mutex. It can do this
now since there is no longer an ast_cond_t associated with
the taskprocessor.



git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376119 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-11-08 23:35:10 +00:00
parent 77725bf293
commit 902a2d8919
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/taskprocessor.c
View File

@@ -67,14 +67,6 @@ struct tps_taskprocessor_stats {
struct ast_taskprocessor { struct ast_taskprocessor {
/*! \brief Friendly name of the taskprocessor */ /*! \brief Friendly name of the taskprocessor */
const char *name; const char *name;
/*! \brief Thread poll condition */
ast_cond_t poll_cond;
/*! \brief Taskprocessor thread */
pthread_t poll_thread;
/*! \brief Taskprocessor lock */
ast_mutex_t taskprocessor_lock;
/*! \brief Taskprocesor thread run flag */
unsigned char poll_thread_run;
/*! \brief Taskprocessor statistics */ /*! \brief Taskprocessor statistics */
struct tps_taskprocessor_stats *stats; struct tps_taskprocessor_stats *stats;
/*! \brief Taskprocessor current queue size */ /*! \brief Taskprocessor current queue size */
@@ -392,8 +384,6 @@ static void tps_taskprocessor_destroy(void *tps)
return; return;
} }
ast_debug(1, "destroying taskprocessor '%s'\n", t->name); ast_debug(1, "destroying taskprocessor '%s'\n", t->name);
/* kill it */
ast_mutex_destroy(&t->taskprocessor_lock);
/* free it */ /* free it */
if (t->stats) { if (t->stats) {
ast_free(t->stats); ast_free(t->stats);
@@ -419,11 +409,11 @@ static struct tps_task *tps_taskprocessor_pop(struct ast_taskprocessor *tps)
ast_log(LOG_ERROR, "missing taskprocessor\n"); ast_log(LOG_ERROR, "missing taskprocessor\n");
return NULL; return NULL;
} }
ast_mutex_lock(&tps->taskprocessor_lock); ao2_lock(tps);
if ((task = AST_LIST_REMOVE_HEAD(&tps->tps_queue, list))) { if ((task = AST_LIST_REMOVE_HEAD(&tps->tps_queue, list))) {
tps->tps_queue_size--; tps->tps_queue_size--;
} }
ast_mutex_unlock(&tps->taskprocessor_lock); ao2_unlock(tps);
return task; return task;
} }
@@ -573,10 +563,10 @@ int ast_taskprocessor_push(struct ast_taskprocessor *tps, int (*task_exe)(void *
ast_log(LOG_ERROR, "failed to allocate task! Can't push to '%s'\n", tps->name); ast_log(LOG_ERROR, "failed to allocate task! Can't push to '%s'\n", tps->name);
return -1; return -1;
} }
ast_mutex_lock(&tps->taskprocessor_lock); ao2_lock(tps);
AST_LIST_INSERT_TAIL(&tps->tps_queue, t, list); AST_LIST_INSERT_TAIL(&tps->tps_queue, t, list);
previous_size = tps->tps_queue_size++; previous_size = tps->tps_queue_size++;
ast_mutex_unlock(&tps->taskprocessor_lock); ao2_unlock(tps);
tps->listener->callbacks->task_pushed(tps->listener, previous_size ? 0 : 1); tps->listener->callbacks->task_pushed(tps->listener, previous_size ? 0 : 1);
return 0; return 0;
} }
@@ -594,7 +584,7 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps)
tps_task_free(t); tps_task_free(t);
ast_mutex_lock(&tps->taskprocessor_lock); ao2_lock(tps);
size = tps_taskprocessor_depth(tps); size = tps_taskprocessor_depth(tps);
if (tps->stats) { if (tps->stats) {
tps->stats->_tasks_processed_count++; tps->stats->_tasks_processed_count++;
@@ -602,7 +592,7 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps)
tps->stats->max_qsize = size; tps->stats->max_qsize = size;
} }
} }
ast_mutex_unlock(&tps->taskprocessor_lock); ao2_unlock(tps);
if (size == 0) { if (size == 0) {
tps->listener->callbacks->emptied(tps->listener); tps->listener->callbacks->emptied(tps->listener);