Changeset 0dbc4e7 in mainline

Timestamp:

2006-06-06T08:26:26Z (18 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

bffa0b06

Parents:

874621f

Message:

Added possibility to interrupt task at exit from interrupt routine.

Files:

• arch/sparc64/include/interrupt.h (modified) (1 diff)
• generic/src/interrupt/interrupt.c (modified) (1 diff)
• generic/src/proc/task.c (modified) (2 diffs)
• generic/src/syscall/syscall.c (modified) (2 diffs)

arch/sparc64/include/interrupt.h

@@ -55 +55 @@
 {
         /* TODO */
+        return 0;
 }
 static inline __native istate_get_pc(istate_t *istate)
 {
         /* TODO */
+        return 0;
 }
 

generic/src/interrupt/interrupt.c

@@ -86 +86 @@
         
         exc_table[n].f(n + IVT_FIRST, istate);
+        /* This is a safe place to exit exiting thread */
+        if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
+                thread_exit();
 }
 

generic/src/proc/task.c

@@ -50 +50 @@
 #include <errno.h>
 #include <syscall/copy.h>
+#include <console/klog.h>
 
 #ifndef LOADED_PROG_STACK_PAGES_NO
@@ -402 +403 @@
         ipc_cleanup();
         futex_cleanup();
+        klog_printf("Cleanup of task %lld completed.", TASK->taskid);
 }
 

generic/src/syscall/syscall.c

@@ -48 +48 @@
 #include <sysinfo/sysinfo.h>
 #include <console/console.h>
+#include <console/klog.h>
 
 /** Print using kernel facility
@@ -92 +93 @@
 {
         __native rc;
-        ipl_t ipl;
-        bool exit = false;
 
         if (id < SYSCALL_END)
                 rc = syscall_table[id](a1,a2,a3,a4);
-        else
-                panic("Undefined syscall %d", id);
+        else {
+                klog_printf("TASK %lld: Unknown syscall id %d",TASK->taskid,id);
+                task_kill(TASK->taskid);
+                thread_exit();
+        }
                 
-        ipl = interrupts_disable();
-        spinlock_lock(&THREAD->lock);
         if (THREAD->interrupted)
-                exit = true;
-        spinlock_unlock(&THREAD->lock);
-        interrupts_restore(ipl);
-        
-        if (exit)
                 thread_exit();