Changeset 07b39338 in mainline for uspace/srv/loc/loc.c

Timestamp:

2011-08-20T18:21:49Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

6ab014d

Parents:

0cf27ee (diff), f00af83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

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

uspace/srv/loc/loc.c

@@ -67 +67 @@
  **/
 
-static FIBRIL_MUTEX_INITIALIZE(services_list_mutex);
+FIBRIL_MUTEX_INITIALIZE(services_list_mutex);
 static FIBRIL_CONDVAR_INITIALIZE(services_list_cv);
 static FIBRIL_MUTEX_INITIALIZE(servers_list_mutex);
@@ -84 +84 @@
 /** Service directory ogranized by categories (yellow pages) */
 static categ_dir_t cdir;
+
+static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex);
+static async_sess_t *callback_sess = NULL;
 
 service_id_t loc_create_id(void)
@@ -308 +311 @@
 {
         assert(fibril_mutex_is_locked(&services_list_mutex));
-
+        assert(fibril_mutex_is_locked(&cdir.mutex));
+        
         loc_namespace_delref(service->namespace);
         list_remove(&(service->services));
         list_remove(&(service->server_services));
+        
+        /* Remove service from all categories. */
+        while (!list_empty(&service->cat_memb)) {
+                link_t *link = list_first(&service->cat_memb);
+                svc_categ_t *memb = list_get_instance(link, svc_categ_t,
+                    svc_link);
+                fibril_mutex_lock(&memb->cat->mutex);
+                category_remove_service(memb);
+                fibril_mutex_unlock(&memb->cat->mutex);
+        }
         
         free(service->name);
@@ -412 +426 @@
         fibril_mutex_lock(&services_list_mutex);
         fibril_mutex_lock(&server->services_mutex);
+        fibril_mutex_lock(&cdir.mutex);
         
         while (!list_empty(&server->services)) {
@@ -420 +435 @@
         }
         
+        fibril_mutex_unlock(&cdir.mutex);
         fibril_mutex_unlock(&server->services_mutex);
         fibril_mutex_unlock(&services_list_mutex);
@@ -489 +505 @@
         link_initialize(&service->services);
         link_initialize(&service->server_services);
+        list_initialize(&service->cat_memb);
         
         /* Check that service is not already registered */
@@ -526 +543 @@
  *
  */
-static int loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall, 
+static void loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall, 
     loc_server_t *server)
 {
-        /* TODO */
-        return EOK;
+        loc_service_t *svc;
+        
+        fibril_mutex_lock(&services_list_mutex);
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
+        if (svc == NULL) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        fibril_mutex_lock(&cdir.mutex);
+        loc_service_unregister_core(svc);
+        fibril_mutex_unlock(&cdir.mutex);
+        fibril_mutex_unlock(&services_list_mutex);
+        async_answer_0(iid, EOK);
+}
+
+static void loc_category_get_name(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        category_t *cat;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        fibril_mutex_lock(&cdir.mutex);
+        
+        cat = category_get(&cdir, IPC_GET_ARG1(*icall));
+        if (cat == NULL) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        act_size = str_size(cat->name);
+        if (act_size > size) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, EOVERFLOW);
+                async_answer_0(iid, EOVERFLOW);
+                return;
+        }
+        
+        sysarg_t retval = async_data_read_finalize(callid, cat->name,
+            min(size, act_size));
+        
+        fibril_mutex_unlock(&cdir.mutex);
+        
+        async_answer_0(iid, retval);
 }
 
@@ -571 +640 @@
         async_answer_0(iid, retval);
 }
-
 
 /** Connect client to the service.
@@ -728 +796 @@
  *
  */
+static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
+{
+        async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (cb_sess == NULL) {
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        fibril_mutex_lock(&callback_sess_mutex);
+        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);
+        
+        async_answer_0(iid, EOK);
+}
+
+void loc_category_change_event(void)
+{
+        fibril_mutex_lock(&callback_sess_mutex);
+
+        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);
+}
+
+/** 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.
+ *
+ */
 static void loc_category_get_id(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -1095 +1203 @@
         
         fibril_mutex_lock(&services_list_mutex);
+        fibril_mutex_lock(&cdir.mutex);
         loc_service_unregister_core(null_services[i]);
+        fibril_mutex_unlock(&cdir.mutex);
         fibril_mutex_unlock(&services_list_mutex);
         
@@ -1129 +1239 @@
 
         async_answer_0(iid, retval);
+
+        loc_category_change_event();
 }
 
@@ -1156 +1268 @@
 
         cat = category_new("serial");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("usbhc");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("virtual");
         categ_dir_add_cat(&cdir, cat);
 
@@ -1244 +1362 @@
                         loc_namespace_get_id(callid, &call);
                         break;
+                case LOC_CALLBACK_CREATE:
+                        loc_callback_create(callid, &call);
+                        break;
                 case LOC_CATEGORY_GET_ID:
                         loc_category_get_id(callid, &call);
+                        break;
+                case LOC_CATEGORY_GET_NAME:
+                        loc_category_get_name(callid, &call);
                         break;
                 case LOC_CATEGORY_GET_SVCS: