Changeset 2ba7810 in mainline for generic/include

Timestamp:

2006-03-16T12:24:20Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b7dcabb

Parents:

d764ddc

Message:

Changed ipc to use spinlocks instead of mutexes again.
Fixed loading inits to set nameservice as the first loaded process.
Lot of TODO in ipc done.

Location:

generic/include

Files:

• errno.h (modified) (1 diff)
• ipc/ipc.h (modified) (6 diffs)
• ipc/sysipc.h (modified) (1 diff)
• syscall/syscall.h (modified) (1 diff)

generic/include/errno.h

@@ -36 +36 @@
 #define ELIMIT     -3  /* Limit exceeded */
 #define EREFUSED   -4  /* Connection refused */
+#define EFORWARD   -5  /* Forward error */
+#define EPERM      -6  /* Permission denied */
 
 #endif

generic/include/ipc/ipc.h

@@ -72 +72 @@
  * These methods have special behaviour
  */
-#define IPC_M_IAMCONNECTING   0
 /** Protocol for CONNECT - TO - ME 
  *
@@ -78 +77 @@
  * so that it can start initiating new messages.
  *
- * The protocol for negotiating is as follows:
+ * The protocol for negotiating is:
  * - sys_connecttome - sends a message IPC_M_CONNECTTOME
  * - sys_wait_for_call - upon receipt tries to allocate new phone
@@ -86 +85 @@
  *                       error is sent back to caller. Otherwise 
  *                       the call is accepted and the response is sent back.
- *                     - the allocated phoneid is passed to userspace as
- *                       ARG3 of the call.
+ *                     - the allocated phoneid is passed to userspace 
+ *                       (on the receiving sid) as ARG3 of the call.
  *                     - the caller obtains taskid of the called thread
  */
 #define IPC_M_CONNECTTOME     1
+/** Protocol for CONNECT - ME - TO
+ *
+ * Calling process asks the callee to create for him a new connection.
+ * E.g. the caller wants a name server to connect him to print server.
+ *
+ * The protocol for negotiating is:
+ * - sys_connect_me_to - send a synchronous message to name server
+ *                       indicating that it wants to be connected to some
+ *                       service
+ *   recepient         -  if ipc_answer == 0, then accept connection
+ *                     -  otherwise connection refused
+ *                     -  recepient may forward message. Forwarding
+ *                        system message 
+ *
+ */
 #define IPC_M_CONNECTMETO     2
+/* Control messages that the server sends to the processes 
+ * about their connections.
+ */
 
 
 /* Well-known methods */
-#define IPC_M_FIRST_USER      512
+#define IPC_M_LAST_SYSTEM     511
 #define IPC_M_PING            512
 /* User methods */
@@ -124 +141 @@
         task_t *task;
 
-        mutex_t mutex;
-        condvar_t cv;
+        waitq_t wq;
 
         link_t connected_phones; /**< Phones connected to this answerbox */
@@ -138 +154 @@
         link_t list;
         answerbox_t *callee;
+        int busy;
 } phone_t;
 
@@ -146 +163 @@
 extern void ipc_call_sync(phone_t *phone, call_t *request);
 extern void ipc_phone_destroy(phone_t *phone);
-extern void ipc_phone_init(phone_t *phone, answerbox_t *box);
+extern void ipc_phone_init(phone_t *phone);
+extern void ipc_phone_connect(phone_t *phone, answerbox_t *box);
 extern void ipc_call_free(call_t *call);
 extern call_t * ipc_call_alloc(void);
 extern void ipc_answerbox_init(answerbox_t *box);
-extern void ipc_phone_init(phone_t *phone, answerbox_t *box);
 extern void ipc_call_init(call_t *call);
+extern void ipc_forward(call_t *call, answerbox_t *newbox,answerbox_t *oldbox);
 
 extern answerbox_t *ipc_phone_0;

generic/include/ipc/sysipc.h

@@ -44 +44 @@
 __native sys_ipc_wait_for_call(ipc_data_t *calldata, task_id_t *taskid,
                                __native flags);
+__native sys_ipc_connect_me_to(__native phoneid, __native arg1,
+                               __native arg2);
+__native sys_ipc_forward_fast(__native callid, __native phoneid,
+                              __native method, __native arg1);
+
 
 #endif

generic/include/syscall/syscall.h

@@ -41 +41 @@
         SYS_IPC_ANSWER_FAST,
         SYS_IPC_ANSWER,
+        SYS_IPC_FORWARD_FAST,
         SYS_IPC_WAIT,
         SYS_IPC_CONNECT_TO_ME,
+        SYS_IPC_CONNECT_ME_TO,
         SYSCALL_END
 } syscall_t;