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

FS-10167: Small fix, made state volatile in session and connection to prevent odd behaviour by the GCC compiler under linux

This commit is contained in:
Shane Bryldt 2017-04-18 15:10:34 -05:00
parent 2c996b592f
commit 21f5635037
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libblade/src/blade_connection.c
View File

@ -42,7 +42,7 @@ struct blade_connection_s {
blade_connection_direction_t direction;
ks_thread_t *state_thread;
blade_connection_state_t state;
volatile blade_connection_state_t state;
const char *id;
ks_rwl_t *lock;

2
libs/libblade/src/blade_module_wss.c
View File

@ -1012,7 +1012,7 @@ blade_connection_state_hook_t blade_transport_wss_on_state_attach_inbound(blade_
if (json_req) cJSON_Delete(json_req);
if (json_res) cJSON_Delete(json_res);
return ret;
}

8
libs/libblade/src/blade_session.c
View File

@ -37,7 +37,7 @@ struct blade_session_s {
blade_handle_t *handle;
ks_pool_t *pool;
blade_session_state_t state;
volatile blade_session_state_t state;
const char *id;
ks_rwl_t *lock;
@ -180,7 +180,7 @@ KS_DECLARE(ks_status_t) blade_session_startup(blade_session_t *bs)
ks_assert(tpool);
blade_session_state_set(bs, BLADE_SESSION_STATE_NONE);
if (ks_thread_pool_add_job(tpool, blade_session_state_thread, bs) != KS_STATUS_SUCCESS) {
// @todo error logging
return KS_STATUS_FAIL;
@ -470,7 +470,7 @@ void *blade_session_state_thread(ks_thread_t *thread, void *data)
ks_assert(data);
bs = (blade_session_t *)data;
ks_mutex_lock(bs->mutex);
while (!shutdown) {
@ -490,7 +490,7 @@ void *blade_session_state_thread(ks_thread_t *thread, void *data)
cJSON_Delete(json);
}
}
blade_handle_session_state_callbacks_execute(bs, BLADE_SESSION_STATE_CONDITION_POST);
switch (state) {