Changes in uspace/lib/c/generic/loc.c [cc574511:d0dd7b5] in mainline

File:

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

uspace/lib/c/generic/loc.c

@@ -45 +45 @@
 static FIBRIL_MUTEX_INITIALIZE(loc_consumer_mutex);
 
+static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex);
+static bool loc_callback_created = false;
+
 static async_sess_t *loc_supp_block_sess = NULL;
 static async_sess_t *loc_cons_block_sess = NULL;
@@ -51 +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;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* TODO: Handle hangup */
+                        return;
+                }
+                
+                int retval;
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case LOC_EVENT_CAT_CHANGE:
+                        fibril_mutex_lock(&loc_callback_mutex);
+                        cb_fun = cat_change_cb;
+                        if (cb_fun != NULL) {
+                                (*cb_fun)();
+                        }
+                        fibril_mutex_unlock(&loc_callback_mutex);
+                        retval = 0;
+                        break;
+                default:
+                        retval = ENOTSUP;
+                }
+                
+                async_answer_0(callid, retval);
+        }
+}
+
+
 static void clone_session(fibril_mutex_t *mtx, async_sess_t *src,
     async_sess_t **dst)
@@ -60 +99 @@
         
         fibril_mutex_unlock(mtx);
+}
+
+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) {
+                exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
+                
+                ipc_call_t answer;
+                aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer);
+                async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
+                loc_exchange_end(exch);
+                
+                async_wait_for(req, &retval);
+                if (rc != EOK)
+                        goto done;
+                
+                if (retval != EOK) {
+                        rc = retval;
+                        goto done;
+                }
+                
+                loc_callback_created = true;
+        }
+        
+        rc = EOK;
+done:
+        fibril_mutex_unlock(&loc_callback_mutex);
+        return rc;
 }
 
@@ -194 +267 @@
 }
 
-/** Register new device.
- *
- * The @p interface is used when forwarding connection to the driver.
+/** Register new service.
+ *
+ * The @p interface is used when forwarding connection to the server.
  * If not 0, the first argument is the interface and the second argument
  * is the service ID.
@@ -203 +276 @@
  * the handle (to ensure backward compatibility).
  *
- * @param      fqdn      Fully qualified device name.
- * @param[out] handle    Handle to the created instance of device.
- * @param      interface Interface when forwarding.
- *
- */
-int loc_service_register_with_iface(const char *fqdn,
-    service_id_t *handle, sysarg_t interface)
+ * @param      fqsn      Fully qualified service name
+ * @param[out] sid       Service ID of new service
+ * @param      interface Interface when forwarding
+ *
+ */
+int loc_service_register_with_iface(const char *fqsn,
+    service_id_t *sid, sysarg_t interface)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
@@ -216 +289 @@
         aid_t req = async_send_2(exch, LOC_SERVICE_REGISTER, interface, 0,
             &answer);
-        sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn));
         
         loc_exchange_end(exch);
@@ -228 +301 @@
         
         if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-                
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (service_id_t) IPC_GET_ARG1(answer);
+                if (sid != NULL)
+                        *sid = -1;
+                
+                return retval;
+        }
+        
+        if (sid != NULL)
+                *sid = (service_id_t) IPC_GET_ARG1(answer);
         
         return retval;
 }
 
-/** Register new device.
- *
- * @param fqdn   Fully qualified device name.
- * @param handle Output: Handle to the created instance of device.
- *
- */
-int loc_service_register(const char *fqdn, service_id_t *handle)
-{
-        return loc_service_register_with_iface(fqdn, handle, 0);
+/** Register new service.
+ *
+ * @param fqsn  Fully qualified service name
+ * @param sid   Output: ID of new service
+ *
+ */
+int loc_service_register(const char *fqdn, service_id_t *sid)
+{
+        return loc_service_register_with_iface(fqdn, sid, 0);
+}
+
+/** Unregister service.
+ *
+ * @param sid   Service ID
+ */
+int loc_service_unregister(service_id_t sid)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        
+        exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
+        retval = async_req_1_0(exch, LOC_SERVICE_UNREGISTER, sid);
+        loc_exchange_end(exch);
+        
+        return (int)retval;
 }
 
@@ -289 +378 @@
         
         return retval;
+}
+
+/** Get object name.
+ *
+ * Provided ID of an object, return its name.
+ *
+ * @param method        IPC method
+ * @param id            Object ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name)
+{
+        async_exch_t *exch;
+        char name_buf[LOC_NAME_MAXLEN + 1];
+        ipc_call_t dreply;
+        size_t act_size;
+        sysarg_t dretval;
+        
+        *name = NULL;
+        exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, method, id, &answer);
+        aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN,
+            &dreply);
+        async_wait_for(dreq, &dretval);
+        
+        loc_exchange_end(exch);
+        
+        if (dretval != EOK) {
+                async_wait_for(req, NULL);
+                return dretval;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        if (retval != EOK)
+                return retval;
+        
+        act_size = IPC_GET_ARG2(dreply);
+        assert(act_size <= LOC_NAME_MAXLEN);
+        name_buf[act_size] = '\0';
+
+        *name = str_dup(name_buf);
+        if (*name == NULL)
+                return ENOMEM;
+        
+        return EOK;
+}
+
+/** Get category name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param cat_id        Category ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+int loc_category_get_name(category_id_t cat_id, char **name)
+{
+        return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name);
+}
+
+/** Get service name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param svc_id        Service ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+int loc_service_get_name(service_id_t svc_id, char **name)
+{
+        return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name);
 }
 
@@ -589 +757 @@
 }
 
-static int loc_category_get_svcs_internal(category_id_t cat_id,
-    service_id_t *id_buf, size_t buf_size, size_t *act_size)
+static int loc_category_get_ids_once(sysarg_t method, sysarg_t arg1,
+    sysarg_t *id_buf, size_t buf_size, size_t *act_size)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
 
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, LOC_CATEGORY_GET_SVCS, cat_id,
-            &answer);
+        aid_t req = async_send_1(exch, method, arg1, &answer);
         int rc = async_data_read_start(exch, id_buf, buf_size);
         
@@ -614 +781 @@
         
         *act_size = IPC_GET_ARG1(answer);
+        return EOK;
+}
+
+/** Get list of IDs.
+ *
+ * Returns an allocated array of service IDs.
+ *
+ * @param method        IPC method
+ * @param arg1          IPC argument 1
+ * @param data          Place to store pointer to array of IDs
+ * @param count         Place to store number of IDs
+ * @return              EOK on success or negative error code
+ */
+static int loc_get_ids_internal(sysarg_t method, sysarg_t arg1,
+    sysarg_t **data, size_t *count)
+{
+        service_id_t *ids;
+        size_t act_size;
+        size_t alloc_size;
+        int rc;
+
+        *data = NULL;
+        act_size = 0;   /* silence warning */
+
+        rc = loc_category_get_ids_once(method, arg1, NULL, 0,
+            &act_size);
+        if (rc != EOK)
+                return rc;
+
+        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,
+                    &act_size);
+                if (rc != EOK)
+                        return rc;
+
+                if (act_size <= alloc_size)
+                        break;
+
+                alloc_size *= 2;
+                free(ids);
+
+                ids = malloc(alloc_size);
+                if (ids == NULL)
+                        return ENOMEM;
+        }
+
+        *count = act_size / sizeof(category_id_t);
+        *data = ids;
         return EOK;
 }
@@ -626 +846 @@
  * @return              EOK on success or negative error code
  */
-int loc_category_get_svcs(category_id_t cat_id, category_id_t **data,
+int loc_category_get_svcs(category_id_t cat_id, service_id_t **data,
     size_t *count)
 {
-        service_id_t *ids;
-        size_t act_size;
-        size_t alloc_size;
-        int rc;
-
-        *data = NULL;
-        act_size = 0;   /* silence warning */
-
-        rc = loc_category_get_svcs_internal(cat_id, NULL, 0, &act_size);
-        if (rc != EOK)
-                return rc;
-
-        alloc_size = act_size;
-        ids = malloc(alloc_size);
-        if (ids == NULL)
-                return ENOMEM;
-
-        while (true) {
-                rc = loc_category_get_svcs_internal(cat_id, ids, alloc_size,
-                    &act_size);
-                if (rc != EOK)
-                        return rc;
-
-                if (act_size <= alloc_size)
-                        break;
-
-                alloc_size *= 2;
-                free(ids);
-
-                ids = malloc(alloc_size);
-                if (ids == NULL)
-                        return ENOMEM;
-        }
-
-        *count = act_size / sizeof(category_id_t);
-        *data = ids;
+        return loc_get_ids_internal(LOC_CATEGORY_GET_SVCS, cat_id,
+            data, count);
+}
+
+/** Get list of categories.
+ *
+ * Returns an allocated array of category IDs.
+ *
+ * @param data          Place to store pointer to array of IDs
+ * @param count         Place to store number of IDs
+ * @return              EOK on success or negative error code
+ */
+int loc_get_categories(category_id_t **data, size_t *count)
+{
+        return loc_get_ids_internal(LOC_GET_CATEGORIES, 0,
+            data, count);
+}
+
+int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
+{
+        if (loc_callback_create() != EOK)
+                return EIO;
+
+        cat_change_cb = cb_fun;
         return EOK;
 }