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

FS-5528 --resolve

This commit is contained in:
Moises Silva 2013-08-16 09:52:14 -04:00
parent dfc34d5a96
commit 6a2cd0632b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
View File

@ -894,6 +894,7 @@ SWITCH_STANDARD_API(sangoma_function)
char *argv[10] = { 0 }; char *argv[10] = { 0 };
int argc = 0; int argc = 0;
char *mycmd = NULL; char *mycmd = NULL;
switch_bool_t locked = SWITCH_FALSE;
if (zstr(cmd)) { if (zstr(cmd)) {
stream->write_function(stream, "%s", SANGOMA_SYNTAX); stream->write_function(stream, "%s", SANGOMA_SYNTAX);
@ -910,6 +911,10 @@ SWITCH_STANDARD_API(sangoma_function)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
/* Most operations in this API require the global session lock anyways since sessions can disappear at any moment ... */
switch_mutex_lock(g_sessions_lock);
locked = SWITCH_TRUE;
if (!strcasecmp(argv[0], "settings")) { if (!strcasecmp(argv[0], "settings")) {
char addrbuff[50]; char addrbuff[50];
int addr; int addr;
@ -922,7 +927,6 @@ SWITCH_STANDARD_API(sangoma_function)
const void *var; const void *var;
void *val; void *val;
unsigned totalsess = 0; unsigned totalsess = 0;
switch_mutex_lock(g_sessions_lock);
#define STATS_FORMAT "%-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-15.15s %-15.15s\n" #define STATS_FORMAT "%-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-15.15s %-15.15s\n"
stream->write_function(stream, STATS_FORMAT, stream->write_function(stream, STATS_FORMAT,
"Session", "Codec", "Enc", "Dec", "Enc Tx", "Enc Rx", "Dec Tx", "Dec Rx", "Enc Lost", "Dec Lost", "Enc AvgRxMs", "Dec AvgRxMs"); "Session", "Codec", "Enc", "Dec", "Enc Tx", "Enc Rx", "Dec Tx", "Dec Rx", "Enc Lost", "Dec Lost", "Enc AvgRxMs", "Dec AvgRxMs");
@ -967,7 +971,6 @@ SWITCH_STANDARD_API(sangoma_function)
decoder_avgrxus_str); decoder_avgrxus_str);
totalsess++; totalsess++;
} }
switch_mutex_unlock(g_sessions_lock);
stream->write_function(stream, "Total sessions: %d\n", totalsess); stream->write_function(stream, "Total sessions: %d\n", totalsess);
} else if (!strcasecmp(argv[0], "stats")) { } else if (!strcasecmp(argv[0], "stats")) {
struct sangoma_transcoding_session *sess; struct sangoma_transcoding_session *sess;
@ -983,6 +986,7 @@ SWITCH_STANDARD_API(sangoma_function)
stream->write_function(stream, "%s", SANGOMA_SYNTAX); stream->write_function(stream, "%s", SANGOMA_SYNTAX);
goto done; goto done;
} }
sess = sangoma_find_session(sessid); sess = sangoma_find_session(sessid);
if (!sess) { if (!sess) {
stream->write_function(stream, "Failed to find session %lu\n", sessid); stream->write_function(stream, "Failed to find session %lu\n", sessid);
@ -1076,6 +1080,9 @@ SWITCH_STANDARD_API(sangoma_function)
} }
done: done:
if (locked) {
switch_mutex_unlock(g_sessions_lock);
}
switch_safe_free(mycmd); switch_safe_free(mycmd);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;