Changes in uspace/lib/c/generic/loc.c [c1f27f1d:f302586] in mainline

File:

• uspace/lib/c/generic/loc.c (modified) (7 diffs)

uspace/lib/c/generic/loc.c

@@ -47 +47 @@
 static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex);
 static bool loc_callback_created = false;
-static loc_cat_change_cb_t cat_change_cb = NULL;
 
 static async_sess_t *loc_supp_block_sess = NULL;
@@ -55 +54 @@
 static async_sess_t *loc_consumer_sess = NULL;
 
+static loc_cat_change_cb_t cat_change_cb = NULL;
+
 static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        loc_cat_change_cb_t cb_fun;
+        
         while (true) {
                 ipc_call_t call;
@@ -66 +69 @@
                 }
                 
+                int retval;
+                
                 switch (IPC_GET_IMETHOD(call)) {
                 case LOC_EVENT_CAT_CHANGE:
                         fibril_mutex_lock(&loc_callback_mutex);
-                        loc_cat_change_cb_t cb_fun = cat_change_cb;
+                        cb_fun = cat_change_cb;
+                        if (cb_fun != NULL) {
+                                (*cb_fun)();
+                        }
                         fibril_mutex_unlock(&loc_callback_mutex);
-                        
-                        async_answer_0(callid, EOK);
-                        
-                        if (cb_fun != NULL)
-                                (*cb_fun)();
-                        
+                        retval = 0;
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        retval = ENOTSUP;
                 }
+                
+                async_answer_0(callid, retval);
         }
 }
@@ -96 +101 @@
 }
 
-/** Create callback
- *
- * Must be called with loc_callback_mutex locked.
- *
- * @return EOK on success.
- *
- */
 static int loc_callback_create(void)
 {
+        async_exch_t *exch;
+        sysarg_t retval;
+        int rc = EOK;
+
+        fibril_mutex_lock(&loc_callback_mutex);
+        
         if (!loc_callback_created) {
-                async_exch_t *exch =
-                    loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
+                exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
                 
                 ipc_call_t answer;
                 aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer);
-                int rc = async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
+                async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
                 loc_exchange_end(exch);
                 
+                async_wait_for(req, &retval);
                 if (rc != EOK)
-                        return rc;
-                
-                sysarg_t retval;
-                async_wait_for(req, &retval);
-                if (retval != EOK)
-                        return retval;
+                        goto done;
+                
+                if (retval != EOK) {
+                        rc = retval;
+                        goto done;
+                }
                 
                 loc_callback_created = true;
         }
         
-        return EOK;
+        rc = EOK;
+done:
+        fibril_mutex_unlock(&loc_callback_mutex);
+        return rc;
 }
 
@@ -788 +795 @@
     sysarg_t **data, size_t *count)
 {
+        service_id_t *ids;
+        size_t act_size;
+        size_t alloc_size;
+        int rc;
+
         *data = NULL;
-        *count = 0;
-        
-        size_t act_size = 0;
-        int rc = loc_category_get_ids_once(method, arg1, NULL, 0,
+        act_size = 0;   /* silence warning */
+
+        rc = loc_category_get_ids_once(method, arg1, NULL, 0,
             &act_size);
         if (rc != EOK)
                 return rc;
-        
-        size_t alloc_size = act_size;
-        service_id_t *ids = malloc(alloc_size);
+
+        alloc_size = act_size;
+        ids = malloc(alloc_size);
         if (ids == NULL)
                 return ENOMEM;
-        
+
         while (true) {
                 rc = loc_category_get_ids_once(method, arg1, ids, alloc_size,
@@ -807 +818 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 if (act_size <= alloc_size)
                         break;
-                
-                alloc_size = act_size;
-                ids = realloc(ids, alloc_size);
+
+                alloc_size *= 2;
+                free(ids);
+
+                ids = malloc(alloc_size);
                 if (ids == NULL)
                         return ENOMEM;
         }
-        
+
         *count = act_size / sizeof(category_id_t);
         *data = ids;
@@ -854 +867 @@
 int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
 {
-        fibril_mutex_lock(&loc_callback_mutex);
-        if (loc_callback_create() != EOK) {
-                fibril_mutex_unlock(&loc_callback_mutex);
+        if (loc_callback_create() != EOK)
                 return EIO;
-        }
-        
+
         cat_change_cb = cb_fun;
-        fibril_mutex_unlock(&loc_callback_mutex);
-        
         return EOK;
 }