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

Timestamp:

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

Author:

guerin

Message:

kernel: release WTI mailbox associated with TTY

We don't block on giet_tty_alloc() anymore when launching the same app
again and again.

File:

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

soft/giet_vm/giet_kernel/ctx_handler.c

@@ -30 +30 @@
     static_scheduler_t* psched = (static_scheduler_t*)_get_sched();
 
+    // pretend the task to kill is scheduled (required for sys_handler calls)
+    unsigned int cur_task = psched->current;
+    psched->current = ltid;
+
     // 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();
+        psched->context[ltid][CTX_TTY_ID] = -1;
     }
 
@@ -40 +44 @@
     if ( psched->context[ltid][CTX_TIM_ID] < NB_TIM_CHANNELS )
     {
-        psched->context[ltid][CTX_TIM_ID] = 0xFFFFFFFF;
         _sys_tim_release();
+        psched->context[ltid][CTX_TIM_ID] = -1;
     }
 
@@ -47 +51 @@
     if ( psched->context[ltid][CTX_NIC_RX_ID] < NB_NIC_CHANNELS )
     {
-        psched->context[ltid][CTX_NIC_RX_ID] = 0xFFFFFFFF;
         _sys_nic_release( 1 );
+        psched->context[ltid][CTX_NIC_RX_ID] = -1;
     }
 
@@ -54 +58 @@
     if ( psched->context[ltid][CTX_NIC_TX_ID] < NB_NIC_CHANNELS )
     {
-        psched->context[ltid][CTX_NIC_TX_ID] = 0xFFFFFFFF;
         _sys_nic_release( 0 );
-    }
+        psched->context[ltid][CTX_NIC_TX_ID] = -1;
+    }
+
+    // restore scheduled task
+    psched->current = cur_task;
 
     // set NORUN_MASK_TASK bit