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

taskprocessor: Do not use separate allocation for stats or name.

Browse Source 
Merge storage for the stats object and name string into the main
allocation for struct ast_taskprocessor.

Change-Id: I74fe9a7f357f0e6d63152f163cf5eef6428218e1
This commit is contained in:
Corey Farrell
2018-11-11 19:32:11 -05:00
parent 6f3275e54c
commit 944d90a7ea
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main/taskprocessor.c
View File

@@ -67,10 +67,8 @@ struct tps_taskprocessor_stats {
/*! \brief A ast_taskprocessor structure is a singleton by name */ /*! \brief A ast_taskprocessor structure is a singleton by name */
struct ast_taskprocessor { struct ast_taskprocessor {
/*! \brief Friendly name of the taskprocessor */
const char *name;
/*! \brief Taskprocessor statistics */ /*! \brief Taskprocessor statistics */
struct tps_taskprocessor_stats *stats; struct tps_taskprocessor_stats stats;
void *local_data; void *local_data;
/*! \brief Taskprocessor current queue size */ /*! \brief Taskprocessor current queue size */
long tps_queue_size; long tps_queue_size;
@@ -91,6 +89,8 @@ struct ast_taskprocessor {
unsigned int high_water_alert:1; unsigned int high_water_alert:1;
/*! Indicates if the taskprocessor is currently suspended */ /*! Indicates if the taskprocessor is currently suspended */
unsigned int suspended:1; unsigned int suspended:1;
/*! \brief Friendly name of the taskprocessor */
char name[0];
}; };
/*! /*!
@@ -515,13 +515,8 @@ static char *cli_tps_report(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
while ((tps = ao2_iterator_next(&iter))) { while ((tps = ao2_iterator_next(&iter))) {
ast_copy_string(name, tps->name, sizeof(name)); ast_copy_string(name, tps->name, sizeof(name));
qsize = tps->tps_queue_size; qsize = tps->tps_queue_size;
if (tps->stats) { maxqsize = tps->stats.max_qsize;
maxqsize = tps->stats->max_qsize; processed = tps->stats._tasks_processed_count;
processed = tps->stats->_tasks_processed_count;
} else {
maxqsize = 0;
processed = 0;
}
ast_cli(a->fd, FMT_FIELDS, name, processed, qsize, maxqsize, ast_cli(a->fd, FMT_FIELDS, name, processed, qsize, maxqsize,
tps->tps_queue_low, tps->tps_queue_high); tps->tps_queue_low, tps->tps_queue_high);
ast_taskprocessor_unreference(tps); ast_taskprocessor_unreference(tps);
@@ -645,10 +640,6 @@ static void tps_taskprocessor_dtor(void *tps)
tps_alert_add(t, -1); tps_alert_add(t, -1);
} }
ast_free(t->stats);
t->stats = NULL;
ast_free((char *) t->name);
t->name = NULL;
ao2_cleanup(t->listener); ao2_cleanup(t->listener);
t->listener = NULL; t->listener = NULL;
} }
@@ -744,7 +735,7 @@ static struct ast_taskprocessor *__allocate_taskprocessor(const char *name, stru
{ {
struct ast_taskprocessor *p; struct ast_taskprocessor *p;
p = ao2_alloc(sizeof(*p), tps_taskprocessor_dtor); p = ao2_alloc(sizeof(*p) + strlen(name) + 1, tps_taskprocessor_dtor);
if (!p) { if (!p) {
ast_log(LOG_WARNING, "failed to create taskprocessor '%s'\n", name); ast_log(LOG_WARNING, "failed to create taskprocessor '%s'\n", name);
return NULL; return NULL;
@@ -754,12 +745,7 @@ static struct ast_taskprocessor *__allocate_taskprocessor(const char *name, stru
p->tps_queue_low = (AST_TASKPROCESSOR_HIGH_WATER_LEVEL * 9) / 10; p->tps_queue_low = (AST_TASKPROCESSOR_HIGH_WATER_LEVEL * 9) / 10;
p->tps_queue_high = AST_TASKPROCESSOR_HIGH_WATER_LEVEL; p->tps_queue_high = AST_TASKPROCESSOR_HIGH_WATER_LEVEL;
p->stats = ast_calloc(1, sizeof(*p->stats)); strcpy(p->name, name); /*SAFE*/
p->name = ast_strdup(name);
if (!p->stats || !p->name) {
ao2_ref(p, -1);
return NULL;
}
ao2_ref(listener, +1); ao2_ref(listener, +1);
p->listener = listener; p->listener = listener;
@@ -985,13 +971,11 @@ int ast_taskprocessor_execute(struct ast_taskprocessor *tps)
size = ast_taskprocessor_size(tps); size = ast_taskprocessor_size(tps);
/* Update the stats */ /* Update the stats */
if (tps->stats) { ++tps->stats._tasks_processed_count;
++tps->stats->_tasks_processed_count;
/* Include the task we just executed as part of the queue size. */ /* Include the task we just executed as part of the queue size. */
if (size >= tps->stats->max_qsize) { if (size >= tps->stats.max_qsize) {
tps->stats->max_qsize = size + 1; tps->stats.max_qsize = size + 1;
}
} }
ao2_unlock(tps); ao2_unlock(tps);