kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

make ast_state2str thread safe by using thread local storage instead of a

Browse Source 
static buffer for storing the result when the state value is unknown


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-07-21 22:36:25 +00:00
parent f2611e36c3
commit 83749437a9
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channel.c
View File

@@ -92,7 +92,9 @@ static int uniqueint = 0;
unsigned long global_fin = 0, global_fout = 0;
/* XXX Lock appropriately in more functions XXX */
static pthread_key_t state2str_buf_key;
static pthread_once_t state2str_buf_once = PTHREAD_ONCE_INIT;
#define STATE2STR_BUFSIZE 32
struct chanlist {
const struct ast_channel_tech *tech;
@@ -482,12 +484,17 @@ int ast_str2cause(const char *name)
return -1;
}
static void state2str_buf_key_create(void)
{
pthread_key_create(&state2str_buf_key, free);
}
/*! \brief Gives the string form of a given channel state */
char *ast_state2str(int state)
{
/* XXX Not reentrant XXX */
static char localtmp[256];
char *buf;
switch(state) {
case AST_STATE_DOWN:
return "Down";
@@ -506,8 +513,14 @@ char *ast_state2str(int state)
case AST_STATE_BUSY:
return "Busy";
default:
snprintf(localtmp, sizeof(localtmp), "Unknown (%d)\n", state);
return localtmp;
pthread_once(&state2str_buf_once, state2str_buf_key_create);
if (!(buf = pthread_getspecific(state2str_buf_key))) {
if (!(buf = ast_calloc(1, STATE2STR_BUFSIZE)))
return NULL;
pthread_setspecific(state2str_buf_key, buf);
}
snprintf(buf, STATE2STR_BUFSIZE, "Unknown (%d)\n", state);
return buf;
}
}