kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-08 08:51:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #369 in FS/freeswitch from ~MICHAELGG/freeswitch:minor_perf_tweaks to master

Browse Source 
* commit 'c599f4f44701af865283f33eb0100d395fa77c7f':
  FS-7894: On Windows, use critical sections instead of mutexes. (Mutexes on Windows are cross-process, unlike lightweight Linux futexes.)
  FS-7894: Event header ARRAY:: data -- use strcmp to ensure data begins with ARRAY:: instead of substring search
This commit is contained in:
Mike Jerris 2015-07-29 22:16:34 -05:00
commit 01672dc96b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_apr.c
View File

@ -269,6 +269,11 @@ SWITCH_DECLARE(switch_status_t) switch_thread_rwlock_unlock(switch_thread_rwlock
SWITCH_DECLARE(switch_status_t) switch_mutex_init(switch_mutex_t ** lock, unsigned int flags, switch_memory_pool_t *pool) SWITCH_DECLARE(switch_status_t) switch_mutex_init(switch_mutex_t ** lock, unsigned int flags, switch_memory_pool_t *pool)
{ {
#ifdef WIN32
/* Old version of APR misunderstands mutexes. On Windows, mutexes are cross-process.
APR has no reason to not use critical sections instead of mutexes. */
if (flags == SWITCH_MUTEX_NESTED) flags = SWITCH_MUTEX_DEFAULT;
#endif
return apr_thread_mutex_create(lock, flags, pool); return apr_thread_mutex_create(lock, flags, pool);
} }

2
src/switch_event.c
View File

@ -1053,7 +1053,7 @@ static switch_status_t switch_event_base_add_header(switch_event_t *event, switc
switch_event_del_header(event, header_name); switch_event_del_header(event, header_name);
} }
if (strstr(data, "ARRAY::")) { if (!strncmp(data, "ARRAY::", 7)) {
switch_event_add_array(event, header_name, data); switch_event_add_array(event, header_name, data);
FREE(data); FREE(data);
goto end; goto end;