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

devicestate: Cleanup engine thread during graceful shutdown.

Browse Source 
ASTERISK-25681 #close

Change-Id: I64337c70f0ebd8c77f70792042684607c950c8f1
This commit is contained in:
Corey Farrell
2016-01-10 18:08:16 -05:00
parent e6f77da664
commit e9c2c1dc67
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/devicestate.c
View File

@@ -214,6 +214,7 @@ static pthread_t change_thread = AST_PTHREADT_NULL;
/*! \brief Flag for the queue */ /*! \brief Flag for the queue */
static ast_cond_t change_pending; static ast_cond_t change_pending;
static volatile int shuttingdown;
struct stasis_subscription *devstate_message_sub; struct stasis_subscription *devstate_message_sub;
@@ -548,7 +549,7 @@ static void *do_devstate_changes(void *data)
{ {
struct state_change *next, *current; struct state_change *next, *current;
for (;;) { while (!shuttingdown) {
/* This basically pops off any state change entries, resets the list back to NULL, unlocks, and processes each state change */ /* This basically pops off any state change entries, resets the list back to NULL, unlocks, and processes each state change */
AST_LIST_LOCK(&state_changes); AST_LIST_LOCK(&state_changes);
if (AST_LIST_EMPTY(&state_changes)) if (AST_LIST_EMPTY(&state_changes))
@@ -626,6 +627,18 @@ static void devstate_change_cb(void *data, struct stasis_subscription *sub, stru
device_state->cachable, NULL); device_state->cachable, NULL);
} }
static void device_state_engine_cleanup(void)
{
shuttingdown = 1;
AST_LIST_LOCK(&state_changes);
ast_cond_signal(&change_pending);
AST_LIST_UNLOCK(&state_changes);
if (change_thread != AST_PTHREADT_NULL) {
pthread_join(change_thread, NULL);
}
}
/*! \brief Initialize the device state engine in separate thread */ /*! \brief Initialize the device state engine in separate thread */
int ast_device_state_engine_init(void) int ast_device_state_engine_init(void)
{ {
@@ -634,6 +647,7 @@ int ast_device_state_engine_init(void)
ast_log(LOG_ERROR, "Unable to start device state change thread.\n"); ast_log(LOG_ERROR, "Unable to start device state change thread.\n");
return -1; return -1;
} }
ast_register_cleanup(device_state_engine_cleanup);
return 0; return 0;
} }