Changes in uspace/srv/loc/loc.c [e2e56e67:03f4acf] in mainline

File:

• uspace/srv/loc/loc.c (modified) (10 diffs)

uspace/srv/loc/loc.c

@@ -56 +56 @@
 #define NULL_SERVICES  256
 
-/** Callback session */
-typedef struct {
-        link_t cb_sess_list;
-        async_sess_t *sess;
-} cb_sess_t;
-
 LIST_INITIALIZE(services_list);
 LIST_INITIALIZE(namespaces_list);
@@ -92 +86 @@
 
 static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex);
-static LIST_INITIALIZE(callback_sess_list);
+static async_sess_t *callback_sess = NULL;
 
 service_id_t loc_create_id(void)
@@ -614 +608 @@
         size_t act_size;
         loc_service_t *svc;
-        char *fqn;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -632 +625 @@
         }
         
-        if (asprintf(&fqn, "%s/%s", svc->namespace->name, svc->name) < 0) {
-                fibril_mutex_unlock(&services_list_mutex);
-                async_answer_0(callid, ENOMEM);
-                async_answer_0(iid, ENOMEM);
-                return;
-        }
-        
-        act_size = str_size(fqn);
+        act_size = str_size(svc->name);
         if (act_size > size) {
-                free(fqn);
                 fibril_mutex_unlock(&services_list_mutex);
                 async_answer_0(callid, EOVERFLOW);
@@ -648 +633 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, fqn,
+        sysarg_t retval = async_data_read_finalize(callid, svc->name,
             min(size, act_size));
-        free(fqn);
         
         fibril_mutex_unlock(&services_list_mutex);
@@ -806 +790 @@
 }
 
-/** Create callback connection.
- *
- * Create callback connection which will be used to send category change
- * events.
- *
- * On success, answer will contain EOK int retval.
+/** Find ID for category specified by name.
+ *
+ * On success, answer will contain EOK int retval and service ID in arg1.
  * On failure, error code will be sent in retval.
  *
@@ -817 +798 @@
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
+        async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -823 +804 @@
         }
         
-        async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
-        if (sess == NULL) {
-                free(cb_sess);
-                async_answer_0(iid, ENOMEM);
-                return;
-        }
-        
-        cb_sess->sess = sess;
-        link_initialize(&cb_sess->cb_sess_list);
-        
         fibril_mutex_lock(&callback_sess_mutex);
-        list_append(&cb_sess->cb_sess_list, &callback_sess_list);
+        if (callback_sess != NULL) {
+                fibril_mutex_unlock(&callback_sess_mutex);
+                async_answer_0(iid, EEXIST);
+                return;
+        }
+        
+        callback_sess = cb_sess;
         fibril_mutex_unlock(&callback_sess_mutex);
         
@@ -843 +820 @@
 {
         fibril_mutex_lock(&callback_sess_mutex);
-        
-        list_foreach(callback_sess_list, link) {
-                cb_sess_t *cb_sess;
-                
-                cb_sess = list_get_instance(link, cb_sess_t, cb_sess_list);
-                
-                async_exch_t *exch = async_exchange_begin(cb_sess->sess);
+
+        if (callback_sess != NULL) {
+                async_exch_t *exch = async_exchange_begin(callback_sess);
                 async_msg_0(exch, LOC_EVENT_CAT_CHANGE);
                 async_exchange_end(exch);
         }
-        
+
         fibril_mutex_unlock(&callback_sess_mutex);
 }
@@ -1294 +1267 @@
 
         cat = category_new("bd");
-        categ_dir_add_cat(&cdir, cat);
-
-        cat = category_new("iplink");
         categ_dir_add_cat(&cdir, cat);