Changeset 37c57f2 in mainline

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.

Files:

• arch/amd64/src/interrupt.c (modified) (2 diffs)
• generic/include/ipc/ipc.h (modified) (2 diffs)
• generic/src/console/cmd.c (modified) (4 diffs)
• generic/src/ipc/sysipc.c (modified) (8 diffs)
• generic/src/proc/task.c (modified) (2 diffs)
• generic/src/proc/thread.c (modified) (1 diff)

arch/amd64/src/interrupt.c

@@ -46 +46 @@
 {
         char *symbol;
-        __u64 *x = &istate->stack[0];
+/*      __u64 *x = &istate->stack[0]; */
 
         if (!(symbol=get_symtab_entry(istate->rip)))
@@ -61 +61 @@
         printf("%%r14=%Q, %%r15=%Q, %%rsp=%Q\n",istate->r14,istate->r15,&istate->stack[0]);
         printf("%%rbp=%Q\n",istate->rbp);
+/*      
         printf("stack: %Q, %Q, %Q\n", x[5], x[6], x[7]);
         printf("       %Q, %Q, %Q\n", x[8], x[9], x[10]);
         printf("       %Q, %Q, %Q\n", x[11], x[12], x[13]);
         printf("       %Q, %Q, %Q\n", x[14], x[15], x[16]);
+*/
 }
 

generic/include/ipc/ipc.h

@@ -100 +100 @@
  *                       indicating that it wants to be connected to some
  *                       service
+ *                     - arg1/2 are user specified, arg3 contains
+ *                       address of the phone that should be connected
+ *                       (TODO: it leaks to userspace)
  *   recepient         -  if ipc_answer == 0, then accept connection
  *                     -  otherwise connection refused
@@ -171 +174 @@
 extern void ipc_call_init(call_t *call);
 extern void ipc_forward(call_t *call, answerbox_t *newbox,answerbox_t *oldbox);
+extern void task_print_list(void);
 
 extern answerbox_t *ipc_phone_0;

generic/src/console/cmd.c

@@ -54 +54 @@
 #include <proc/scheduler.h>
 #include <proc/thread.h>
+#include <proc/task.h>
 
 /** Data and methods for 'help' command. */
@@ -254 +255 @@
 };
 
+static int cmd_tasks(cmd_arg_t *argv);
+static cmd_info_t tasks_info = {
+        .name = "tasks",
+        .description = "List all tasks",
+        .func = cmd_tasks,
+        .argc = 0
+};
+
 
 static int cmd_sched(cmd_arg_t *argv);
@@ -339 +348 @@
         &sched_info,
         &threads_info,
+        &tasks_info,
         &tlb_info,
         &version_info,
@@ -629 +639 @@
 }
 
+/** Command for listings Task information
+ *
+ * @param argv Ignores
+ *
+ * @return Always 1
+ */
+int cmd_tasks(cmd_arg_t * argv) {
+        task_print_list();
+        return 1;
+}
+
 /** Command for listings Thread information
  *

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) {

generic/src/proc/task.c

@@ -39 +39 @@
 #include <ipc/ipc.h>
 #include <memstr.h>
+#include <print.h>
 
 #include <elf.h>
@@ -132 +133 @@
         return task;
 }
+
+/** Print task list */
+void task_print_list(void)
+{
+        link_t *cur;
+        task_t *t;
+        ipl_t ipl;
+        int i;
+        
+        /* Messing with thread structures, avoid deadlock */
+        ipl = interrupts_disable();
+        spinlock_lock(&tasks_lock);
+
+        for (cur=tasks_head.next; cur!=&tasks_head; cur=cur->next) {
+                t = list_get_instance(cur, task_t, tasks_link);
+                spinlock_lock(&t->lock);
+                printf("Task: %Q ActiveCalls: %d", t->taskid, 
+                       atomic_get(&t->active_calls));
+                for (i=0; i < IPC_MAX_PHONES; i++) {
+                        if (t->phones[i].callee)
+                                printf(" Ph(%d): %P ", i,t->phones[i].callee);
+                }
+                printf("\n");
+                spinlock_unlock(&t->lock);
+        }
+
+        spinlock_unlock(&tasks_lock);
+        interrupts_restore(ipl);
+        
+}

generic/src/proc/thread.c

@@ -413 +413 @@
                 if (t->cpu)
                         printf("cpu%d ", t->cpu->id);
-                
                 printf("\n");
         }
 
         spinlock_unlock(&threads_lock);
-        interrupts_enable();
-}
+        interrupts_restore(ipl);
+}