Changeset 286e03d in mainline

Timestamp:

2006-03-15T11:44:26Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8965838e

Parents:

91d5ad6

Message:

Added support for taskid.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• include/typedefs.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (1 diff)
• src/proc/task.c (modified) (2 diffs)
• src/syscall/syscall.c (modified) (7 diffs)

generic/include/ipc/ipc.h

@@ -84 +84 @@
         answerbox_t *callerbox;
         int flags;
+        task_t *sender;
         __native data[IPC_CALL_LEN];
 } call_t;

generic/include/proc/task.h

@@ -41 +41 @@
         link_t tasks_link;      /**< Link to other tasks within the system. */
         as_t *as;               /**< Address space. */
+        task_id_t taskid;           /**< Unique identity of task */
+
         /* IPC stuff */
         answerbox_t answerbox;  /**< Communication endpoint */

generic/include/syscall/syscall.h

@@ -38 +38 @@
         SYS_IPC_CALL_ASYNC_FAST,
         SYS_IPC_CALL_ASYNC,
+        SYS_IPC_ANSWER_FAST,
         SYS_IPC_ANSWER,
         SYS_IPC_WAIT,

generic/include/typedefs.h

@@ -38 +38 @@
 typedef unsigned long count_t;
 typedef unsigned long index_t;
+
+typedef unsigned long long task_id_t;
 
 typedef struct config config_t;

generic/src/ipc/ipc.c

@@ -62 +62 @@
         memsetb((__address)call, sizeof(*call), 0);
         call->callerbox = &TASK->answerbox;
+        call->sender = TASK;
 
         return call;

generic/src/proc/task.c

@@ -45 +45 @@
 SPINLOCK_INITIALIZE(tasks_lock);
 LIST_INITIALIZE(tasks_head);
+static task_id_t task_counter = 0;
 
 /** Initialize tasks
@@ -86 +87 @@
         ipl = interrupts_disable();
         spinlock_lock(&tasks_lock);
+
+        ta->taskid = ++task_counter;
         list_append(&ta->tasks_link, &tasks_head);
+
         spinlock_unlock(&tasks_lock);
         interrupts_restore(ipl);

generic/src/syscall/syscall.c

@@ -98 +98 @@
 
 /** Synchronous IPC call allowing to send whole message */
-static __native sys_ipc_call_sync(__native phoneid, __native *data)
+static __native sys_ipc_call_sync(__native phoneid, __native *question, 
+                                  __native *reply)
 {
         call_t call;
@@ -109 +110 @@
 
         ipc_call_init(&call);
-        copy_from_uspace(&call.data, data, sizeof(call.data));
+        copy_from_uspace(&call.data, question, sizeof(call.data));
         
         ipc_call_sync(phone, &call);
 
-        copy_to_uspace(data, &call.data, sizeof(call.data));
+        copy_to_uspace(reply, &call.data, sizeof(call.data));
 
         return 0;
@@ -185 +186 @@
 
 /** Send IPC answer */
-static __native sys_ipc_answer(__native callid, __native retval, __native arg1,
-                               __native arg2)
+static __native sys_ipc_answer_fast(__native callid, __native retval, 
+                                    __native arg1, __native arg2)
 {
         call_t *call;
@@ -203 +204 @@
 }
 
+/** Send IPC answer */
+static __native sys_ipc_answer(__native callid, __native *data)
+{
+        call_t *call;
+
+        /* Check that the user is not sending us answer callid */
+        ASSERT(! (callid & 1));
+        /* TODO: Check that the callid is in the dispatch table */
+        call = (call_t *) callid;
+        copy_from_uspace(&call->data, data, sizeof(call->data));
+        ipc_answer(&TASK->answerbox, call);
+
+        return 0;
+}
+
 /** Wait for incoming ipc call or answer
  *
@@ -209 +225 @@
  * @return Callid, if callid & 1, then the call is answer
  */
-static __native sys_ipc_wait_for_call(__native *calldata, __native flags)
+static __native sys_ipc_wait_for_call(__native *calldata, task_id_t *taskid,
+                                      __native flags)
 {
         call_t *call;
@@ -223 +240 @@
                 return ((__native)call) | IPC_CALLID_ANSWERED;
         }
+        copy_to_uspace(taskid, (void *)&TASK->taskid, sizeof(TASK->taskid));
         return (__native)call;
 }
@@ -239 +257 @@
         sys_ipc_call_async_fast,
         sys_ipc_call_async,
+        sys_ipc_answer_fast,
         sys_ipc_answer,
         sys_ipc_wait_for_call