Changeset ea186c6 in mainline for uspace/srv/loc/category.c

Timestamp:

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

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

921b84f

Parents:

1f44b056 (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/category.c (modified) (4 diffs)

uspace/srv/loc/category.c

@@ -93 +93 @@
         cat->id = loc_create_id();
         link_initialize(&cat->cat_list);
-        list_initialize(&cat->services);
+        list_initialize(&cat->svc_memb);
 }
 
@@ -113 +113 @@
 {
         assert(fibril_mutex_is_locked(&cat->mutex));
+        assert(fibril_mutex_is_locked(&services_list_mutex));
 
         /* Verify that category does not contain this service yet. */
-        list_foreach(cat->services, item) {
-
-                loc_service_t *csvc = list_get_instance(item, loc_service_t,
-                    cat_services);
-                if (csvc == svc) {
+        list_foreach(cat->svc_memb, item) {
+                svc_categ_t *memb = list_get_instance(item, svc_categ_t,
+                    cat_link);
+                if (memb->svc == svc) {
                         return EEXIST;
                 }
         }
 
-        list_append(&svc->cat_services, &cat->services);
+        svc_categ_t *nmemb = malloc(sizeof(svc_categ_t));
+        if (nmemb == NULL)
+                return ENOMEM;
+
+        nmemb->svc = svc;
+        nmemb->cat = cat;
+
+        list_append(&nmemb->cat_link, &cat->svc_memb);
+        list_append(&nmemb->svc_link, &svc->cat_memb);
+
         return EOK;
+}
+
+/** Remove service from category. */
+void category_remove_service(svc_categ_t *memb)
+{
+        assert(fibril_mutex_is_locked(&memb->cat->mutex));
+        assert(fibril_mutex_is_locked(&services_list_mutex));
+
+        list_remove(&memb->cat_link);
+        list_remove(&memb->svc_link);
+
+        free(memb);
 }
 
@@ -169 +190 @@
         buf_cnt = buf_size / sizeof(service_id_t);
 
-        act_cnt = list_count(&cat->services);
+        act_cnt = list_count(&cat->svc_memb);
         *act_size = act_cnt * sizeof(service_id_t);
 
@@ -176 +197 @@
 
         size_t pos = 0;
-        list_foreach(cat->services, item) {
-                loc_service_t *svc =
-                    list_get_instance(item, loc_service_t, cat_services);
+        list_foreach(cat->svc_memb, item) {
+                svc_categ_t *memb =
+                    list_get_instance(item, svc_categ_t, cat_link);
 
                 if (pos < buf_cnt)
-                        id_buf[pos] = svc->id;
+                        id_buf[pos] = memb->svc->id;
                 pos++;
         }