sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_stasis: signal when new command is queued 

res_statsis's app loop sleeps for up to .2s waiting on input
to a channel before re-checking the command queue. This can
cause delays between channel setup and bridge.

This change is to send a SIGURG on the sleeping thread when
a new command is enqueued. This exits the sleeping thread out
of the ast_waitfor() call triggering the new command being
processed on the channel immediately.

Resolves: #362

UserNote: Call setup times should be significantly improved
when using ARI.
This commit is contained in:
Mike Bradeen 2023-10-02 12:35:32 -06:00 committed by asterisk-org-access-app[bot]
parent b99606955e
commit 2694792e13
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_stasis.c
View File

@ -1548,7 +1548,11 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
continue;
}
/* Set this thread's id as the control thread id so that any
new commands can signal out of this wait */
control_set_thread(control, pthread_self());
r = ast_waitfor(chan, MAX_WAIT_MS);
control_set_thread(control, AST_PTHREADT_NULL);
if (r < 0) {
ast_debug(3, "%s: Poll error\n",

20
res/stasis/control.c
View File

@ -92,6 +92,10 @@ struct stasis_app_control {
* The name of the next Stasis application to move to.
*/
char *next_app;
/*!
* The thread currently blocking on the channel.
*/
pthread_t control_thread;
/*!
* The list of arguments to pass to StasisStart when moving to another app.
*/
@ -156,6 +160,8 @@ struct stasis_app_control *control_create(struct ast_channel *channel, struct st
control->next_app = NULL;
AST_VECTOR_INIT(&control->next_app_args, 0);
control_set_thread(control, AST_PTHREADT_NULL);
return control;
}
@ -185,6 +191,13 @@ static void app_control_unregister_rule(
ao2_unlock(control->command_queue);
}
void control_set_thread(struct stasis_app_control *control, pthread_t threadid)
{
ao2_lock(control->command_queue);
control->control_thread = threadid;
ao2_unlock(control->command_queue);
}
/*!
* \internal
* \brief Checks to make sure each rule in the given list passes.
@ -293,6 +306,13 @@ static struct stasis_app_command *exec_command_on_condition(
ao2_link_flags(control->command_queue, command, OBJ_NOLOCK);
ast_cond_signal(&control->wait_cond);
if (control->control_thread != AST_PTHREADT_NULL) {
/* if the control thread is waiting on the channel, send the SIGURG
to let it know there is a new command */
pthread_kill(control->control_thread, SIGURG);
}
ao2_unlock(control->command_queue);
return command;

9
res/stasis/control.h
View File

@ -48,6 +48,15 @@ struct stasis_app_control *control_create(struct ast_channel *channel, struct st
*/
void control_flush_queue(struct stasis_app_control *control);
/*!
* \brief set the control's thread id
* \since 18
*
* \param control Control object on which to set the thread id.
* \param threadid id to set
*/
void control_set_thread(struct stasis_app_control *control, pthread_t threadid);
/*!
* \brief Dispatch all commands enqueued to this control.
*