Changes in kernel/generic/src/cap/cap.c [cde999a:c1f68b0] in mainline

File:

• kernel/generic/src/cap/cap.c (modified) (12 diffs)

kernel/generic/src/cap/cap.c

@@ -41 +41 @@
  * A kernel object (kobject_t) encapsulates one of the following raw objects:
  *
- * - IPC call
  * - IPC phone
  * - IRQ object
@@ -74 +73 @@
 
 #include <cap/cap.h>
-#include <abi/cap.h>
 #include <proc/task.h>
 #include <synch/mutex.h>
@@ -83 +81 @@
 #include <stdint.h>
 
-#define CAPS_START      (CAP_NIL + 1)
-#define CAPS_SIZE       (INT_MAX - CAPS_START)
-#define CAPS_LAST       (CAPS_SIZE - 1)
-
-static slab_cache_t *cap_cache;
+#define MAX_CAPS        INT_MAX
+
+static slab_cache_t *cap_slab;
 
 static size_t caps_hash(const ht_link_t *item)
@@ -116 +112 @@
 void caps_init(void)
 {
-        cap_cache = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
+        cap_slab = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
             NULL, 0);
 }
@@ -133 +129 @@
         if (!task->cap_info->handles)
                 goto error_handles;
-        if (!ra_span_add(task->cap_info->handles, CAPS_START, CAPS_SIZE))
+        if (!ra_span_add(task->cap_info->handles, 0, MAX_CAPS))
                 goto error_span;
         if (!hash_table_create(&task->cap_info->caps, 0, 0, &caps_ops))
@@ -224 +220 @@
         assert(mutex_locked(&task->cap_info->lock));
 
-        if ((handle < CAPS_START) || (handle > CAPS_LAST))
+        if ((handle < 0) || (handle >= MAX_CAPS))
                 return NULL;
         ht_link_t *link = hash_table_find(&task->cap_info->caps, &handle);
@@ -257 +253 @@
  * @param task  Task for which to allocate the new capability.
  *
- * @param[out] handle  New capability handle on success.
- *
- * @return An error code in case of error.
- */
-int cap_alloc(task_t *task, cap_handle_t *handle)
+ * @return New capability handle on success.
+ * @return Negative error code in case of error.
+ */
+cap_handle_t cap_alloc(task_t *task)
 {
         cap_t *cap = NULL;
+        cap_handle_t handle;
 
         /*
@@ -277 +273 @@
          */
         if (!cap) {
-                cap = slab_alloc(cap_cache, FRAME_ATOMIC);
+                cap = slab_alloc(cap_slab, FRAME_ATOMIC);
                 if (!cap) {
                         mutex_unlock(&task->cap_info->lock);
@@ -284 +280 @@
                 uintptr_t hbase;
                 if (!ra_alloc(task->cap_info->handles, 1, 1, &hbase)) {
-                        slab_free(cap_cache, cap);
+                        slab_free(cap_slab, cap);
                         mutex_unlock(&task->cap_info->lock);
                         return ENOMEM;
@@ -293 +289 @@
 
         cap->state = CAP_STATE_ALLOCATED;
-        *handle = cap->handle;
-        mutex_unlock(&task->cap_info->lock);
-
-        return EOK;
+        handle = cap->handle;
+        mutex_unlock(&task->cap_info->lock);
+
+        return handle;
 }
 
@@ -361 +357 @@
 void cap_free(task_t *task, cap_handle_t handle)
 {
-        assert(handle >= CAPS_START);
-        assert(handle <= CAPS_LAST);
+        assert(handle >= 0);
+        assert(handle < MAX_CAPS);
 
         mutex_lock(&task->cap_info->lock);
@@ -371 +367 @@
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
         ra_free(task->cap_info->handles, handle, 1);
-        slab_free(cap_cache, cap);
+        slab_free(cap_slab, cap);
         mutex_unlock(&task->cap_info->lock);
 }