Changeset e89a06a in mainline for uspace/lib

Timestamp:

2018-07-06T22:13:20Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

be0f5e4

Parents:

6419c6e

Message:

Encapsulate partitions list in volume server. (Global state is not good coding practice.)

Location:

uspace/lib

Files:

• c/generic/loc.c (modified) (5 diffs)
• c/include/loc.h (modified) (2 diffs)
• hound/include/hound/server.h (modified) (1 diff)
• hound/src/protocol.c (modified) (1 diff)

uspace/lib/c/generic/loc.c

@@ -48 +48 @@
 static bool loc_callback_created = false;
 static loc_cat_change_cb_t cat_change_cb = NULL;
+static void *cat_change_arg = NULL;
 
 static async_sess_t *loc_supp_block_sess = NULL;
@@ -70 +71 @@
                         fibril_mutex_lock(&loc_callback_mutex);
                         loc_cat_change_cb_t cb_fun = cat_change_cb;
+                        void *cb_arg = cat_change_arg;
                         fibril_mutex_unlock(&loc_callback_mutex);
 
@@ -75 +77 @@
 
                         if (cb_fun != NULL)
-                                (*cb_fun)();
+                                (*cb_fun)(cb_arg);
 
                         break;
@@ -859 +861 @@
 }
 
-errno_t loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
+errno_t loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun, void *cb_arg)
 {
         fibril_mutex_lock(&loc_callback_mutex);
+        if (cat_change_cb != NULL) {
+                fibril_mutex_unlock(&loc_callback_mutex);
+                return EEXIST;
+        }
+
         if (loc_callback_create() != EOK) {
                 fibril_mutex_unlock(&loc_callback_mutex);
@@ -868 +875 @@
 
         cat_change_cb = cb_fun;
+        cat_change_arg = cb_arg;
         fibril_mutex_unlock(&loc_callback_mutex);
 

uspace/lib/c/include/loc.h

@@ -40 +40 @@
 #include <stdbool.h>
 
-typedef void (*loc_cat_change_cb_t)(void);
+typedef void (*loc_cat_change_cb_t)(void *);
 
 extern async_exch_t *loc_exchange_begin_blocking(iface_t);
@@ -75 +75 @@
 extern size_t loc_get_services(service_id_t, loc_sdesc_t **);
 extern errno_t loc_get_categories(category_id_t **, size_t *);
-extern errno_t loc_register_cat_change_cb(loc_cat_change_cb_t);
-
+extern errno_t loc_register_cat_change_cb(loc_cat_change_cb_t, void *);
 
 #endif

uspace/lib/hound/include/hound/server.h

@@ -40 +40 @@
 #include <loc.h>
 
-typedef void (*dev_change_callback_t)(void);
+typedef void (*dev_change_callback_t)(void *);
 typedef errno_t (*device_callback_t)(service_id_t, const char *);
 
 errno_t hound_server_register(const char *name, service_id_t *id);
 void hound_server_unregister(service_id_t id);
-errno_t hound_server_set_device_change_callback(dev_change_callback_t cb);
+errno_t hound_server_set_device_change_callback(dev_change_callback_t cb,
+    void *);
 errno_t hound_server_devices_iterate(device_callback_t callback);
 

uspace/lib/hound/src/protocol.c

@@ -750 +750 @@
  * @return Error code.
  */
-errno_t hound_server_set_device_change_callback(dev_change_callback_t cb)
-{
-        return loc_register_cat_change_cb(cb);
+errno_t hound_server_set_device_change_callback(dev_change_callback_t cb,
+    void *arg)
+{
+        return loc_register_cat_change_cb(cb, arg);
 }