Changeset 695 for soft/giet_vm/giet_kernel/ctx_handler.c

Timestamp:

Aug 7, 2015, 5:42:06 PM (9 years ago)

Author:

guerin

Message:

kernel: defer task kill to _ctx_switch()

Introduce SIG slot in task context.
Add release functions for tty, tim and nic in sys_handler.
Process signals in _ctx_switch().

File:

• soft/giet_vm/giet_kernel/ctx_handler.c (modified) (5 diffs)

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -7 +7 @@
 
 #include <ctx_handler.h>
+#include <sys_handler.h>
 #include <giet_config.h>
 #include <hard_config.h>
@@ -22 +23 @@
 // allocated in boot.c or kernel_init.c files
 extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX];
+
+//////////////////
+static void _ctx_kill_task( unsigned int ltid )
+{
+    // get scheduler address
+    static_scheduler_t* psched = (static_scheduler_t*)_get_sched();
+
+    // release private TTY terminal if required
+    if ( psched->context[ltid][CTX_TTY_ID] < NB_TTY_CHANNELS )
+    {
+        psched->context[ltid][CTX_TTY_ID] = 0xFFFFFFFF;
+        _sys_tty_release();
+    }
+
+    // release private TIM channel if required
+    if ( psched->context[ltid][CTX_TIM_ID] < NB_TIM_CHANNELS )
+    {
+        psched->context[ltid][CTX_TIM_ID] = 0xFFFFFFFF;
+        _sys_tim_release();
+    }
+
+    // release private NIC_RX channel if required
+    if ( psched->context[ltid][CTX_NIC_RX_ID] < NB_NIC_CHANNELS )
+    {
+        psched->context[ltid][CTX_NIC_RX_ID] = 0xFFFFFFFF;
+        _sys_nic_release( 1 );
+    }
+
+    // release private NIC_TX channel if required
+    if ( psched->context[ltid][CTX_NIC_TX_ID] < NB_NIC_CHANNELS )
+    {
+        psched->context[ltid][CTX_NIC_TX_ID] = 0xFFFFFFFF;
+        _sys_nic_release( 0 );
+    }
+
+    // set NORUN_MASK_TASK bit
+    _atomic_or( &psched->context[ltid][CTX_NORUN_ID], NORUN_MASK_TASK );
+}
+
 
 //////////////////////////////////
@@ -40 +80 @@
             " - CTX_SP    = %x\n"
             " - CTX_NORUN = %x\n"
+            " - CTX_SIG   = %x\n"
             "########## %s\n",
             x , y , p , ltid ,
@@ -50 +91 @@
             psched->context[ltid][CTX_SP_ID], 
             psched->context[ltid][CTX_NORUN_ID],
+            psched->context[ltid][CTX_SIG_ID],
             string );
 }  // _ctx_display()
@@ -78 +120 @@
     {
         next_task_id = tid % tasks;
+
+        // this task needs to be killed
+        if ( psched->context[next_task_id][CTX_SIG_ID] & SIG_MASK_KILL )
+        {
+            _ctx_kill_task( next_task_id );
+
+            // acknowledge signal
+            _atomic_and( &psched->context[next_task_id][CTX_SIG_ID], ~SIG_MASK_KILL );
+
+            // skip
+            continue;
+        }
+
         // test if the task is runable
         if ( psched->context[next_task_id][CTX_NORUN_ID] == 0 ) 
         {
             found = 1;
+            // TODO: don't break to process all pending signals.
             break;
         }