Changeset c70ce74 in mainline

Timestamp:

2009-11-19T21:15:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

33adc6ce

Parents:

4ca28512

Message:

Allocate the answerbox for synchronous calls dynamically.

File:

• kernel/generic/src/ipc/ipc.c (modified) (3 diffs)

kernel/generic/src/ipc/ipc.c

@@ -62 +62 @@
 
 static slab_cache_t *ipc_call_slab;
+static slab_cache_t *ipc_answerbox_slab;
 
 /** Initialize a call structure.
@@ -167 +168 @@
 int ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t sync_box; 
-
-        ipc_answerbox_init(&sync_box, TASK);
+        answerbox_t *sync_box; 
+
+        sync_box = slab_alloc(ipc_answerbox_slab, 0);
+        ipc_answerbox_init(sync_box, TASK);
 
         /* We will receive data in a special box. */
-        request->callerbox = &sync_box;
+        request->callerbox = sync_box;
 
         ipc_call(phone, request);
-        if (!ipc_wait_for_call(&sync_box, SYNCH_NO_TIMEOUT,
-            SYNCH_FLAGS_INTERRUPTIBLE))
+        if (!ipc_wait_for_call(sync_box, SYNCH_NO_TIMEOUT,
+            SYNCH_FLAGS_INTERRUPTIBLE)) {
+                /* The asnwerbox will be freed by someone else. */
                 return EINTR;
+        }
+        slab_free(ipc_answerbox_slab, sync_box);
         return EOK;
 }
@@ -580 +585 @@
         ipc_call_slab = slab_cache_create("ipc_call", sizeof(call_t), 0, NULL,
             NULL, 0);
+        ipc_answerbox_slab = slab_cache_create("ipc_answerbox",
+            sizeof(answerbox_t), 0, NULL, NULL, 0);
 }