kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5994 --resolve -- tips appriciated

This commit is contained in:
Anthony Minessale 2014-02-06 02:20:05 +05:00
parent b8b475855e
commit d7bc0ab13b
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_scheduler.h
View File

@ -47,6 +47,7 @@ SWITCH_BEGIN_EXTERN_C
char *group; char *group;
void *cmd_arg; void *cmd_arg;
uint32_t task_id; uint32_t task_id;
unsigned long hash;
}; };

66
src/switch_scheduler.c
View File

@ -51,6 +51,7 @@ static struct {
switch_mutex_t *task_mutex; switch_mutex_t *task_mutex;
uint32_t task_id; uint32_t task_id;
int task_thread_running; int task_thread_running;
switch_queue_t *event_queue;
switch_memory_pool_t *memory_pool; switch_memory_pool_t *memory_pool;
} globals; } globals;
@ -72,16 +73,10 @@ static void switch_scheduler_execute(switch_scheduler_task_container_t *tp)
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group)); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime);
switch_event_fire(&event); switch_queue_push(globals.event_queue, event);
event = NULL;
} }
} else { } else {
if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime);
switch_event_fire(&event);
}
tp->destroyed = 1; tp->destroyed = 1;
} }
} }
@ -142,10 +137,23 @@ static int task_thread_loop(int done)
switch_mutex_lock(globals.task_mutex); switch_mutex_lock(globals.task_mutex);
for (tp = globals.task_list; tp;) { for (tp = globals.task_list; tp;) {
if (tp->destroyed && !tp->in_thread) { if (tp->destroyed && !tp->in_thread) {
switch_event_t *event;
tofree = tp; tofree = tp;
tp = tp->next; tp = tp->next;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleting task %u %s (%s)\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleting task %u %s (%s)\n",
tofree->task.task_id, tofree->desc, switch_str_nil(tofree->task.group)); tofree->task.task_id, tofree->desc, switch_str_nil(tofree->task.group));
if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tofree->task.task_id);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tofree->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tofree->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tofree->task.runtime);
switch_queue_push(globals.event_queue, event);
event = NULL;
}
if (last) { if (last) {
last->next = tofree->next; last->next = tofree->next;
} else { } else {
@ -169,7 +177,7 @@ static int task_thread_loop(int done)
static void *SWITCH_THREAD_FUNC switch_scheduler_task_thread(switch_thread_t *thread, void *obj) static void *SWITCH_THREAD_FUNC switch_scheduler_task_thread(switch_thread_t *thread, void *obj)
{ {
void *pop;
globals.task_thread_running = 1; globals.task_thread_running = 1;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting task thread\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting task thread\n");
@ -177,7 +185,10 @@ static void *SWITCH_THREAD_FUNC switch_scheduler_task_thread(switch_thread_t *th
if (task_thread_loop(0)) { if (task_thread_loop(0)) {
break; break;
} }
switch_yield(500000); if (switch_queue_pop_timeout(globals.event_queue, &pop, 500) == SWITCH_STATUS_SUCCESS) {
switch_event_t *event = (switch_event_t *) pop;
switch_event_fire(&event);
}
} }
task_thread_loop(1); task_thread_loop(1);
@ -195,6 +206,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
switch_scheduler_task_container_t *container, *tp; switch_scheduler_task_container_t *container, *tp;
switch_event_t *event; switch_event_t *event;
switch_time_t now = switch_epoch_time_now(NULL); switch_time_t now = switch_epoch_time_now(NULL);
switch_ssize_t hlen = -1;
switch_mutex_lock(globals.task_mutex); switch_mutex_lock(globals.task_mutex);
switch_zmalloc(container, sizeof(*container)); switch_zmalloc(container, sizeof(*container));
@ -213,6 +225,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
container->task.cmd_arg = cmd_arg; container->task.cmd_arg = cmd_arg;
container->flags = flags; container->flags = flags;
container->desc = strdup(desc ? desc : "none"); container->desc = strdup(desc ? desc : "none");
container->task.hash = switch_ci_hashfunc_default(container->task.group, &hlen);
for (tp = globals.task_list; tp && tp->next; tp = tp->next); for (tp = globals.task_list; tp && tp->next; tp = tp->next);
@ -235,7 +248,8 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group)); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime);
switch_event_fire(&event); switch_queue_push(globals.event_queue, event);
event = NULL;
} }
return container->task.task_id; return container->task.task_id;
} }
@ -243,7 +257,6 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime,
SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id) SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id)
{ {
switch_scheduler_task_container_t *tp; switch_scheduler_task_container_t *tp;
switch_event_t *event;
uint32_t delcnt = 0; uint32_t delcnt = 0;
switch_mutex_lock(globals.task_mutex); switch_mutex_lock(globals.task_mutex);
@ -262,13 +275,6 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id)
} }
tp->destroyed++; tp->destroyed++;
if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime);
switch_event_fire(&event);
}
delcnt++; delcnt++;
break; break;
} }
@ -281,24 +287,27 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_id(uint32_t task_id)
SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group) SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group)
{ {
switch_scheduler_task_container_t *tp; switch_scheduler_task_container_t *tp;
switch_event_t *event;
uint32_t delcnt = 0; uint32_t delcnt = 0;
switch_ssize_t hlen = -1;
unsigned long hash = 0;
if (zstr(group)) {
return 0;
}
hash = switch_ci_hashfunc_default(group, &hlen);
switch_mutex_lock(globals.task_mutex); switch_mutex_lock(globals.task_mutex);
for (tp = globals.task_list; tp; tp = tp->next) { for (tp = globals.task_list; tp; tp = tp->next) {
if (!zstr(group) && !strcmp(tp->task.group, group)) { if (tp->destroyed) {
continue;
}
if (hash == tp->task.hash && !strcmp(tp->task.group, group)) {
if (switch_test_flag(tp, SSHF_NO_DEL)) { if (switch_test_flag(tp, SSHF_NO_DEL)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeletable task #%u (group %s)\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeletable task #%u (group %s)\n",
tp->task.task_id, group); tp->task.task_id, group);
continue; continue;
} }
if (switch_event_create(&event, SWITCH_EVENT_DEL_SCHEDULE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-ID", "%u", tp->task.task_id);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Desc", tp->desc);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Task-Group", switch_str_nil(tp->task.group));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Task-Runtime", "%" SWITCH_INT64_T_FMT, tp->task.runtime);
switch_event_fire(&event);
}
tp->destroyed++; tp->destroyed++;
delcnt++; delcnt++;
} }
@ -318,6 +327,7 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)
switch_core_new_memory_pool(&globals.memory_pool); switch_core_new_memory_pool(&globals.memory_pool);
switch_threadattr_create(&thd_attr, globals.memory_pool); switch_threadattr_create(&thd_attr, globals.memory_pool);
switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool); switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool);
switch_queue_create(&globals.event_queue, 250000, globals.memory_pool);
switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_detach_set(thd_attr, 1);
switch_thread_create(&task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); switch_thread_create(&task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);