Changeset 132ab5d1 in mainline for kernel/generic/src/cap/cap.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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