From 988424fba59dd9b03a30af2111f0549736eb82f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E6=98=A0=E5=AE=87?= Date: Sat, 22 Jul 2023 18:13:32 +0800 Subject: [PATCH 1/3] Update switch_core_rwlock.c --- src/switch_core_rwlock.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c index 69e188ed79..161764b339 100644 --- a/src/switch_core_rwlock.c +++ b/src/switch_core_rwlock.c @@ -145,25 +145,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(switch_core #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_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 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 switch_thread_rwlock_wrlock(session->rwlock); } #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_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 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 switch_thread_rwlock_unlock(session->rwlock); From 43f2a5c8d035fcc9c9fce3a63fb4b2a66d9e15c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E6=98=A0=E5=AE=87?= Date: Tue, 25 Jul 2023 18:46:53 +0800 Subject: [PATCH 2/3] Update switch_ivr_say.c --- src/switch_ivr_say.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/switch_ivr_say.c b/src/switch_ivr_say.c index 0d7ee1c04a..3229462ae7 100644 --- a/src/switch_ivr_say.c +++ b/src/switch_ivr_say.c @@ -68,6 +68,7 @@ static char *SAY_GENDER_NAMES[] = { "MASCULINE", "FEMININE", "NEUTER", + "UTRUM", NULL }; From f543e2f08a70c2a3e01b57bb4504d99949bb1df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E6=98=A0=E5=AE=87?= Date: Mon, 31 Jul 2023 11:55:05 +0800 Subject: [PATCH 3/3] Update switch_console.c comment is error. --- src/switch_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/switch_console.c b/src/switch_console.c index 8e26fec749..c986bba469 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -82,7 +82,7 @@ static int console_bufferInput(char *buf, int len, char *cmd, int key); static char *console_fnkeys[12]; /* - * Load from console.conf XML file the section: + * Load from switch.conf XML file the section: * * *