Changeset 79872cd in mainline

Timestamp:

2008-08-27T21:01:22Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

69145dae

Parents:

ddb0df5

Message:

Synchronous IPC must be interruptible.

Location:

kernel/generic

Files:

• include/errno.h (modified) (1 diff)
• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/include/errno.h

@@ -57 +57 @@
 #define EBUSY           -14     /* Resource is busy */
 #define EOVERFLOW       -15     /* The result does not fit its size. */
+#define EINTR           -16     /* Operation was interrupted. */
 
 #endif

kernel/generic/include/ipc/ipc.h

@@ -294 +294 @@
 extern void ipc_answer(answerbox_t *, call_t *);
 extern int ipc_call(phone_t *, call_t *);
-extern void ipc_call_sync(phone_t *, call_t *);
+extern int ipc_call_sync(phone_t *, call_t *);
 extern void ipc_phone_init(phone_t *);
 extern void ipc_phone_connect(phone_t *, answerbox_t *);

kernel/generic/src/ipc/ipc.c

@@ -172 +172 @@
  * @param phone         Destination kernel phone structure.
  * @param request       Call structure with request.
- */
-void ipc_call_sync(phone_t *phone, call_t *request)
+ *
+ * @return              EOK on success or EINTR if the sleep was interrupted.
+ */
+int ipc_call_sync(phone_t *phone, call_t *request)
 {
         answerbox_t sync_box; 
@@ -183 +185 @@
 
         ipc_call(phone, request);
-        ipc_wait_for_call(&sync_box, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
+        if (!ipc_wait_for_call(&sync_box, SYNCH_NO_TIMEOUT,
+            SYNCH_FLAGS_INTERRUPTIBLE))
+                return EINTR;
+        return EOK;
 }
 

kernel/generic/src/ipc/sysipc.c

@@ -443 +443 @@
 
         if (!(res = request_preprocess(&call))) {
-                ipc_call_sync(phone, &call);
+                rc = ipc_call_sync(phone, &call);
+                if (rc != EOK)
+                        return rc;
                 process_answer(&call);
         } else {
@@ -481 +483 @@
 
         if (!(res = request_preprocess(&call))) {
-                ipc_call_sync(phone, &call);
+                rc = ipc_call_sync(phone, &call);
+                if (rc != EOK)
+                        return rc;
                 process_answer(&call);
         } else