Changeset 278ac72 in mainline for uspace/srv

Timestamp:

2011-08-16T15:35:56Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

30c78c0

Parents:

16dc887

Message:

Add API for getting list of categories.

Location:

uspace/srv/loc

Files:

• category.c (modified) (1 diff)
• category.h (modified) (1 diff)
• loc.c (modified) (2 diffs)

uspace/srv/loc/category.c

@@ -54 +54 @@
         list_append(&cat->cat_list, &cdir->categories);
 }
+
+/** Get list of categories. */
+int categ_dir_get_categories(categ_dir_t *cdir, category_id_t *id_buf,
+    size_t buf_size, size_t *act_size)
+{
+        size_t act_cnt;
+        size_t buf_cnt;
+
+        assert(fibril_mutex_is_locked(&cdir->mutex));
+
+        buf_cnt = buf_size / sizeof(category_id_t);
+
+        act_cnt = list_count(&cdir->categories);
+        *act_size = act_cnt * sizeof(category_id_t);
+
+        if (buf_size % sizeof(category_id_t) != 0)
+                return EINVAL;
+
+        size_t pos = 0;
+        list_foreach(cdir->categories, item) {
+                category_t *cat =
+                    list_get_instance(item, category_t, cat_list);
+
+                if (pos < buf_cnt)
+                        id_buf[pos] = cat->id;
+                pos++;
+        }
+
+        return EOK;
+}
+
 
 /** Initialize category structure. */

uspace/srv/loc/category.h

@@ -69 +69 @@
 extern void categ_dir_init(categ_dir_t *);
 extern void categ_dir_add_cat(categ_dir_t *, category_t *);
+extern int categ_dir_get_categories(categ_dir_t *, service_id_t *, size_t,
+    size_t *);
 extern category_t *category_new(const char *);
 extern int category_add_service(category_t *, loc_service_t *);

uspace/srv/loc/loc.c

@@ -755 +755 @@
 }
 
+static void loc_get_categories(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        int rc;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        category_id_t *id_buf = (category_id_t *) malloc(size);
+        if (id_buf == NULL) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        fibril_mutex_lock(&cdir.mutex);
+        
+        rc = categ_dir_get_categories(&cdir, id_buf, size, &act_size);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        fibril_mutex_unlock(&cdir.mutex);
+        
+        sysarg_t retval = async_data_read_finalize(callid, id_buf, size);
+        free(id_buf);
+        
+        async_answer_1(iid, retval, act_size);
+}
+
 static void loc_get_namespaces(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -1181 +1220 @@
                 case LOC_GET_SERVICE_COUNT:
                         loc_get_service_count(callid, &call);
+                        break;
+                case LOC_GET_CATEGORIES:
+                        loc_get_categories(callid, &call);
                         break;
                 case LOC_GET_NAMESPACES: