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

Merge 95f3d8867a into 3b58ebc5f3

This commit is contained in:
谭映宇 2025-01-21 00:17:14 +00:00 committed by GitHub
parent 3b58ebc5f3 95f3d8867a
commit f595b9bcdd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch_console.c
View File

@ -82,7 +82,7 @@ static int console_bufferInput(char *buf, int len, char *cmd, int key);
static char *console_fnkeys[12]; static char *console_fnkeys[12];
/* /*
* Load from console.conf XML file the section: * Load from switch.conf XML file the section:
* <keybindings> * <keybindings>
* <key name="1" value="show calls"/> * <key name="1" value="show calls"/>
* </keybindings> * </keybindings>

15
src/switch_core_rwlock.c
View File

@ -145,25 +145,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(switch_core
#ifdef SWITCH_DEBUG_RWLOCKS #ifdef SWITCH_DEBUG_RWLOCKS
SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line) SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line)
{
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Write lock ACQUIRED\n",
switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
#else #else
SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session) SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session)
#endif
{ {
#ifdef SWITCH_DEBUG_RWLOCKS
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Write lock ACQUIRED\n",
switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
#endif #endif
switch_thread_rwlock_wrlock(session->rwlock); switch_thread_rwlock_wrlock(session->rwlock);
} }
#ifdef SWITCH_DEBUG_RWLOCKS #ifdef SWITCH_DEBUG_RWLOCKS
SWITCH_DECLARE(void) switch_core_session_perform_rwunlock(switch_core_session_t *session, const char *file, const char *func, int line) SWITCH_DECLARE(void) switch_core_session_perform_rwunlock(switch_core_session_t *session, const char *file, const char *func, int line)
{
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Read/Write lock CLEARED\n",
switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
#else #else
SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session) SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session)
#endif
{ {
#ifdef SWITCH_DEBUG_RWLOCKS
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Read/Write lock CLEARED\n",
switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
#endif #endif
switch_thread_rwlock_unlock(session->rwlock); switch_thread_rwlock_unlock(session->rwlock);

1
src/switch_ivr_say.c
View File

@ -68,6 +68,7 @@ static char *SAY_GENDER_NAMES[] = {
"MASCULINE", "MASCULINE",
"FEMININE", "FEMININE",
"NEUTER", "NEUTER",
"UTRUM",
NULL NULL
}; };