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

FS-8821 #resolve [Check for status of executed operation]

This commit is contained in:
Anthony Minessale 2016-02-10 14:55:13 -06:00
parent a80c67e375
commit cb280ab14b
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/switch_core.h
View File

@ -1443,18 +1443,18 @@ SWITCH_DECLARE(void *) switch_core_hash_delete(_In_ switch_hash_t *hash, _In_z_
\param hash the hash to delete from \param hash the hash to delete from
\param key the key from which to delete the data \param key the key from which to delete the data
\param mutex optional mutex to lock \param mutex optional mutex to lock
\return SWITCH_STATUS_SUCCESS if the data is deleted \return a pointer to the deleted data
*/ */
SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(_In_ switch_hash_t *hash, _In_z_ const char *key, _In_opt_ switch_mutex_t *mutex); SWITCH_DECLARE(void *) switch_core_hash_delete_locked(_In_ switch_hash_t *hash, _In_z_ const char *key, _In_opt_ switch_mutex_t *mutex);
/*! /*!
\brief Delete data from a hash based on desired key \brief Delete data from a hash based on desired key
\param hash the hash to delete from \param hash the hash to delete from
\param key the key from which to delete the data \param key the key from which to delete the data
\param mutex optional rwlock to wrlock \param mutex optional rwlock to wrlock
\return SWITCH_STATUS_SUCCESS if the data is deleted \return a pointer to the deleted data
*/ */
SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_wrlock(_In_ switch_hash_t *hash, _In_z_ const char *key, _In_opt_ switch_thread_rwlock_t *rwlock); SWITCH_DECLARE(void *) switch_core_hash_delete_wrlock(_In_ switch_hash_t *hash, _In_z_ const char *key, _In_opt_ switch_thread_rwlock_t *rwlock);
/*! /*!
\brief Delete data from a hash based on callback function \brief Delete data from a hash based on callback function

26
src/switch_core_hash.c
View File

@ -66,32 +66,36 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_destructor(switch_hash_t
SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t *hash, const char *key, const void *data, switch_mutex_t *mutex) SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t *hash, const char *key, const void *data, switch_mutex_t *mutex)
{ {
switch_status_t status = SWITCH_STATUS_FALSE;
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} }
switch_core_hash_insert(hash, key, data); status = switch_core_hash_insert(hash, key, data);
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} }
return SWITCH_STATUS_SUCCESS; return status;
} }
SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_wrlock(switch_hash_t *hash, const char *key, const void *data, switch_thread_rwlock_t *rwlock) SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_wrlock(switch_hash_t *hash, const char *key, const void *data, switch_thread_rwlock_t *rwlock)
{ {
switch_status_t status = SWITCH_STATUS_FALSE;
if (rwlock) { if (rwlock) {
switch_thread_rwlock_wrlock(rwlock); switch_thread_rwlock_wrlock(rwlock);
} }
switch_core_hash_insert(hash, key, data); status = switch_core_hash_insert(hash, key, data);
if (rwlock) { if (rwlock) {
switch_thread_rwlock_unlock(rwlock); switch_thread_rwlock_unlock(rwlock);
} }
return SWITCH_STATUS_SUCCESS; return status;
} }
SWITCH_DECLARE(void *) switch_core_hash_delete(switch_hash_t *hash, const char *key) SWITCH_DECLARE(void *) switch_core_hash_delete(switch_hash_t *hash, const char *key)
@ -99,8 +103,10 @@ SWITCH_DECLARE(void *) switch_core_hash_delete(switch_hash_t *hash, const char *
return switch_hashtable_remove(hash, (void *)key); return switch_hashtable_remove(hash, (void *)key);
} }
SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t *hash, const char *key, switch_mutex_t *mutex) SWITCH_DECLARE(void *) switch_core_hash_delete_locked(switch_hash_t *hash, const char *key, switch_mutex_t *mutex)
{ {
void *ret = NULL;
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} }
@ -111,22 +117,24 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t *ha
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} }
return SWITCH_STATUS_SUCCESS; return ret;
} }
SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_wrlock(switch_hash_t *hash, const char *key, switch_thread_rwlock_t *rwlock) SWITCH_DECLARE(void *) switch_core_hash_delete_wrlock(switch_hash_t *hash, const char *key, switch_thread_rwlock_t *rwlock)
{ {
void *ret = NULL;
if (rwlock) { if (rwlock) {
switch_thread_rwlock_wrlock(rwlock); switch_thread_rwlock_wrlock(rwlock);
} }
switch_core_hash_delete(hash, key); ret = switch_core_hash_delete(hash, key);
if (rwlock) { if (rwlock) {
switch_thread_rwlock_unlock(rwlock); switch_thread_rwlock_unlock(rwlock);
} }
return SWITCH_STATUS_SUCCESS; return ret;
} }
SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *hash, switch_hash_delete_callback_t callback, void *pData) { SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *hash, switch_hash_delete_callback_t callback, void *pData) {