res_pjsip res_pjsip_mwi: Misc fixes and cleanups.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 1 Aug 2016 20:07:30 +0000 (15:07 -0500)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 11 Aug 2016 17:17:48 +0000 (12:17 -0500)
* Eliminated RAII_VAR() usage in
ast_sip_persistent_endpoint_update_state().

* Added a missing allocation failure check to
persistent_endpoint_find_or_create().

* Made persistent_endpoint_find_or_create() create the new object without
a lock as it isn't needed.

* Cleaned up some ao2 container allocation idioms.

* Reordered res_pjsip_mwi.c load_module() and unload_module()

Change-Id: If8ce88fbd82a0c72a37a2388f74f77237a6a36a8

res/res_pjsip/pjsip_configuration.c
res/res_pjsip_mwi.c

index 16405eb..9871b41 100644 (file)
@@ -169,7 +169,6 @@ static int persistent_endpoint_update_state(void *obj, void *arg, int flags)
 
                        contact_status = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(),
                                CONTACT_STATUS, contact_id);
-
                        if (contact_status && contact_status->status != UNAVAILABLE) {
                                state = AST_ENDPOINT_ONLINE;
                        }
@@ -296,7 +295,8 @@ static void endpoint_deleted_observer(const void *object)
 {
        const struct ast_sip_endpoint *endpoint = object;
 
-       ao2_find(persistent_endpoints, ast_endpoint_get_resource(endpoint->persistent), OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NODATA);
+       ao2_find(persistent_endpoints, ast_endpoint_get_resource(endpoint->persistent),
+               OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NODATA);
 }
 
 static const struct ast_sorcery_observer endpoint_observers = {
@@ -1224,16 +1224,16 @@ static void persistent_endpoint_destroy(void *obj)
 
 int ast_sip_persistent_endpoint_update_state(const char *endpoint_name, enum ast_endpoint_state state)
 {
-       RAII_VAR(struct sip_persistent_endpoint *, persistent, NULL, ao2_cleanup);
-       SCOPED_AO2LOCK(lock, persistent_endpoints);
+       struct sip_persistent_endpoint *persistent;
 
-       if (!(persistent = ao2_find(persistent_endpoints, endpoint_name, OBJ_KEY | OBJ_NOLOCK))) {
-               return -1;
+       ao2_lock(persistent_endpoints);
+       persistent = ao2_find(persistent_endpoints, endpoint_name, OBJ_SEARCH_KEY | OBJ_NOLOCK);
+       if (persistent) {
+               endpoint_update_state(persistent->endpoint, state);
+               ao2_ref(persistent, -1);
        }
-
-       endpoint_update_state(persistent->endpoint, state);
-
-       return 0;
+       ao2_unlock(persistent_endpoints);
+       return persistent ? 0 : -1;
 }
 
 /*! \brief Internal function which finds (or creates) persistent endpoint information */
@@ -1242,16 +1242,25 @@ static struct ast_endpoint *persistent_endpoint_find_or_create(const struct ast_
        RAII_VAR(struct sip_persistent_endpoint *, persistent, NULL, ao2_cleanup);
        SCOPED_AO2LOCK(lock, persistent_endpoints);
 
-       if (!(persistent = ao2_find(persistent_endpoints, ast_sorcery_object_get_id(endpoint), OBJ_KEY | OBJ_NOLOCK))) {
-               if (!(persistent = ao2_alloc(sizeof(*persistent), persistent_endpoint_destroy))) {
+       persistent = ao2_find(persistent_endpoints, ast_sorcery_object_get_id(endpoint),
+               OBJ_SEARCH_KEY | OBJ_NOLOCK);
+       if (!persistent) {
+               persistent = ao2_alloc_options(sizeof(*persistent), persistent_endpoint_destroy,
+                       AO2_ALLOC_OPT_LOCK_NOLOCK);
+               if (!persistent) {
                        return NULL;
                }
 
-               if (!(persistent->endpoint = ast_endpoint_create("PJSIP", ast_sorcery_object_get_id(endpoint)))) {
+               persistent->endpoint = ast_endpoint_create("PJSIP",
+                       ast_sorcery_object_get_id(endpoint));
+               if (!persistent->endpoint) {
                        return NULL;
                }
 
                persistent->aors = ast_strdup(endpoint->aors);
+               if (!persistent->aors) {
+                       return NULL;
+               }
 
                ast_endpoint_set_state(persistent->endpoint, AST_ENDPOINT_UNKNOWN);
 
@@ -1757,7 +1766,9 @@ int ast_res_pjsip_initialize_configuration(void)
                return -1;
        }
 
-       if (!(persistent_endpoints = ao2_container_alloc(PERSISTENT_BUCKETS, persistent_endpoint_hash, persistent_endpoint_cmp))) {
+       persistent_endpoints = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
+               PERSISTENT_BUCKETS, persistent_endpoint_hash, NULL, persistent_endpoint_cmp);
+       if (!persistent_endpoints) {
                return -1;
        }
 
@@ -1979,6 +1990,7 @@ void ast_res_pjsip_destroy_configuration(void)
        ast_sip_unregister_cli_formatter(endpoint_formatter);
        ast_sip_destroy_cli();
        ao2_cleanup(persistent_endpoints);
+       persistent_endpoints = NULL;
 }
 
 int ast_res_pjsip_reload_configuration(void)
index bf7f042..925556e 100644 (file)
@@ -748,7 +748,6 @@ static int endpoint_receives_unsolicited_mwi_for_mailbox(struct ast_sip_endpoint
        int ret = 0;
 
        mwi_subs = ao2_find(unsolicited_mwi, endpoint_id, OBJ_SEARCH_KEY | OBJ_MULTIPLE);
-
        if (!mwi_subs) {
                return 0;
        }
@@ -1089,7 +1088,7 @@ static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub,
        }
 }
 
-/*! \note Called with the unsolicited_mwi conainer lock held. */
+/*! \note Called with the unsolicited_mwi container lock held. */
 static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags)
 {
        RAII_VAR(struct mwi_subscription *, aggregate_sub, NULL, ao2_cleanup);
@@ -1212,7 +1211,8 @@ static void mwi_contact_added(const void *object)
 
        ao2_lock(unsolicited_mwi);
 
-       mwi_subs = ao2_find(unsolicited_mwi, endpoint_id, OBJ_SEARCH_KEY | OBJ_MULTIPLE | OBJ_NOLOCK | OBJ_UNLINK);
+       mwi_subs = ao2_find(unsolicited_mwi, endpoint_id,
+               OBJ_SEARCH_KEY | OBJ_MULTIPLE | OBJ_NOLOCK | OBJ_UNLINK);
        if (mwi_subs) {
                for (; (mwi_sub = ao2_iterator_next(mwi_subs)); ao2_cleanup(mwi_sub)) {
                        unsubscribe(mwi_sub, NULL, 0);
@@ -1288,17 +1288,19 @@ static int load_module(void)
                return AST_MODULE_LOAD_DECLINE;
        }
 
-       unsolicited_mwi = ao2_container_alloc(MWI_BUCKETS, mwi_sub_hash, mwi_sub_cmp);
-       if (!unsolicited_mwi) {
-               ast_sip_unregister_subscription_handler(&mwi_handler);
-               return AST_MODULE_LOAD_DECLINE;
-       }
-
        if (mwi_serializer_pool_setup()) {
                ast_log(AST_LOG_WARNING, "Failed to create MWI serializer pool. The default SIP pool will be used for MWI\n");
        }
 
+       unsolicited_mwi = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, MWI_BUCKETS,
+               mwi_sub_hash, NULL, mwi_sub_cmp);
+       if (!unsolicited_mwi) {
+               mwi_serializer_pool_shutdown();
+               ast_sip_unregister_subscription_handler(&mwi_handler);
+               return AST_MODULE_LOAD_DECLINE;
+       }
        create_mwi_subscriptions();
+
        ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
        ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &global_observer);
        ast_sorcery_reload_object(ast_sip_get_sorcery(), "global");
@@ -1316,13 +1318,19 @@ static int load_module(void)
 
 static int unload_module(void)
 {
+       ast_sorcery_observer_remove(ast_sip_get_sorcery(), "global", &global_observer);
+       ast_sorcery_observer_remove(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
+
        ao2_callback(unsolicited_mwi, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, unsubscribe, NULL);
        ao2_ref(unsolicited_mwi, -1);
+       unsolicited_mwi = NULL;
+
        mwi_serializer_pool_shutdown();
-       ast_sorcery_observer_remove(ast_sip_get_sorcery(), "global", &global_observer);
-       ast_sorcery_observer_remove(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
+
        ast_sip_unregister_subscription_handler(&mwi_handler);
+
        ast_free(default_voicemail_extension);
+       default_voicemail_extension = NULL;
        return 0;
 }