Changeset 695 for soft/giet_vm/giet_kernel/sys_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/sys_handler.c (modified) (5 diffs)

soft/giet_vm/giet_kernel/sys_handler.c

@@ -232 +232 @@
         if ( _strcmp( vspace[vspace_id].name, name ) == 0 ) 
         {
-            // check if pplication can be killed
+            // check if application can be killed
             if ( vspace[vspace_id].active ) return -2;
 
@@ -249 +249 @@
                 static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
 
-                // release private TTY terminal if required
-                if ( psched->context[ltid][CTX_TTY_ID] < NB_TTY_CHANNELS ) 
-                {
-                    psched->context[ltid][CTX_TTY_ID] = 0xFFFFFFFF;
-                    _atomic_increment( &_tty_channel_allocator , 0xFFFFFFFF );
-                }
-
-                // release private TIM channel if required
-                if ( psched->context[ltid][CTX_TIM_ID] < NB_TIM_CHANNELS ) 
-                {
-                    psched->context[ltid][CTX_TIM_ID] = 0xFFFFFFFF;
-                    _atomic_increment( &_tim_channel_allocator , 0xFFFFFFFF );
-                }
-
-                // 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;
-                    _atomic_increment( &_nic_rx_channel_allocator , 0xFFFFFFFF );
-                }
-
-                // 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;
-                    _atomic_increment( &_nic_tx_channel_allocator , 0xFFFFFFFF );
-                }
-
-                // set NORUN_MASK_TASK bit
-                unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
-                _atomic_or( ptr , NORUN_MASK_TASK );
+                // set KILL signal bit
+                _atomic_or( &psched->context[ltid][CTX_SIG_ID] , SIG_MASK_KILL );
             } 
 
 #if GIET_DEBUG_EXEC 
 if ( _get_proctime() > GIET_DEBUG_EXEC )
-_printf("\n[DEBUG EXEC] exit _sys_kill_application() : %s desactivated\n", name );
+_printf("\n[DEBUG EXEC] exit _sys_kill_application() : %s will be killed\n", name );
 #endif
 
@@ -848 +819 @@
 }
 
+/////////////////////////////////////////
+// NOTE: not a syscall
+int _sys_tty_release()
+{
+    // release one TTY terminal
+    _atomic_increment( &_tty_channel_allocator , 0xFFFFFFFF );
+
+    return 0;
+}
+
 /////////////////////////////////////////////////
 int _sys_tty_write( const char*  buffer,    
@@ -942 +923 @@
         return 0;
     }
+}
+
+////////////////////
+// NOTE: not a syscall
+int _sys_tim_release()
+{
+    // release one timer
+    _atomic_increment( &_tim_channel_allocator, 0xFFFFFFFF );
+
+    return 0;
 }
 
@@ -1225 +1216 @@
     return nic_channel;
 } // end _sys_nic_alloc()
+
+
+////////////////////////////////////////
+// NOTE: not a syscall
+int _sys_nic_release( unsigned int is_rx )
+{
+    if ( is_rx )
+        _atomic_increment( &_nic_rx_channel_allocator , 0xFFFFFFFF );
+    else
+        _atomic_increment( &_nic_tx_channel_allocator , 0xFFFFFFFF );
+
+    return 0;
+}