Changeset 37c57f2 in mainline for generic/src/ipc/sysipc.c

Timestamp:

2006-03-16T20:56:22Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ff14c520

Parents:

6a22fcb

Message:

Added task_print.
Fixed ipc to support connect_me_to.

File:

• generic/src/ipc/sysipc.c (modified) (8 diffs)

generic/src/ipc/sysipc.c

@@ -36 +36 @@
 #include <ipc/ipc.h>
 #include <ipc/sysipc.h>
+
+
 #include <print.h>
+#include <arch.h>
+#include <proc/thread.h>
 
 /* TODO: multi-threaded connect-to-me can cause race condition
@@ -138 +142 @@
 {
         if (IPC_GET_METHOD(call->data) == IPC_M_CONNECTTOME)
+                return 1;
+        if (IPC_GET_METHOD(call->data) == IPC_M_CONNECTMETO)
                 return 1;
         return 0;
@@ -156 +162 @@
                         phone_connect(phoneid,&answer->sender->answerbox);
                 }
+        } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECTMETO) {
+                /* If the users accepted call, connect */
+                if (!IPC_GET_RETVAL(answer->data)) {
+                        printf("Connecting Phone %P\n",IPC_GET_ARG3(*olddata));
+                        ipc_phone_connect((phone_t *)IPC_GET_ARG3(*olddata),
+                                          &TASK->answerbox);
+                }
         }
 }
@@ -319 +332 @@
  *
  * The arg1 and arg2 are changed in the forwarded message
+ *
+ * Warning: If implementing non-fast version, make sure that
+ *          arg3 is not rewritten for certain system IPC
  */
 __native sys_ipc_forward_fast(__native callid, __native phoneid,
@@ -437 +453 @@
                                &phone->callee->task->taskid,
                                sizeof(TASK->taskid));
+
         return IPC_GET_RETVAL(call.data);
 }
@@ -449 +466 @@
         call_t call;
         phone_t *phone;
+        int newphid;
 
         phone = get_phone(phoneid);
         if (!phone)
                 return ENOENT;
+
+        newphid = phone_alloc();
+        if (newphid < 0)
+                return ELIMIT;
 
         ipc_call_init(&call);
@@ -458 +480 @@
         IPC_SET_ARG1(call.data, arg1);
         IPC_SET_ARG2(call.data, arg2);
+        IPC_SET_ARG3(call.data, (__native)&TASK->phones[newphid]);
 
         ipc_call_sync(phone, &call);
-        if (!IPC_GET_RETVAL(call.data)) {
-                /* Everybody accepted, we should be connected by now */
-        }
-
-        return 0;
+
+        if (IPC_GET_RETVAL(call.data)) { /* Connection failed */
+                phone_dealloc(newphid);
+                return IPC_GET_RETVAL(call.data);
+        }
+
+        return newphid;
 }
 
@@ -486 +511 @@
 restart:        
         call = ipc_wait_for_call(&TASK->answerbox, flags);
-        printf("Received call %P from sender: %P\n", call, call->sender);
 
         if (call->flags & IPC_CALL_ANSWERED) {