Changeset d7427a7e in mainline for uspace/srv/loc/loc.c

Timestamp:

2011-08-18T20:27:02Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

be79a663

Parents:

0cc32f2 (diff), ef7052ec (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 mainline changes.

File:

• uspace/srv/loc/loc.c (modified) (8 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);
@@ -311 +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);
@@ -415 +426 @@
         fibril_mutex_lock(&services_list_mutex);
         fibril_mutex_lock(&server->services_mutex);
+        fibril_mutex_lock(&cdir.mutex);
         
         while (!list_empty(&server->services)) {
@@ -423 +435 @@
         }
         
+        fibril_mutex_unlock(&cdir.mutex);
         fibril_mutex_unlock(&server->services_mutex);
         fibril_mutex_unlock(&services_list_mutex);
@@ -492 +505 @@
         link_initialize(&service->services);
         link_initialize(&service->server_services);
+        list_initialize(&service->cat_memb);
         
         /* Check that service is not already registered */
@@ -529 +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);
 }
 
@@ -1176 +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);
         
@@ -1242 +1271 @@
 
         cat = category_new("usbhc");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("virtual");
         categ_dir_add_cat(&cdir, cat);