Changeset 629 for soft/giet_vm/giet_kernel/sys_handler.c

Timestamp:

Jul 18, 2015, 3:00:42 PM (9 years ago)

Author:

alain

Message:

Modify the task activation/desactivation mechanism
to support the _kill_application() and _exec_application() system functions.
The RUN Boolean in task context has been replaced by the NORUN bit-vector.

File:

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

soft/giet_vm/giet_kernel/sys_handler.c

@@ -81 +81 @@
 extern unsigned int _tty_rx_buf[NB_TTY_CHANNELS];
 
+// allocated in kernel_init.c file
+extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
+
 ////////////////////////////////////////////////////////////////////////////
 //     Channel allocators for peripherals
@@ -158 +161 @@
     &_sys_tim_start,                 /* 0x15 */ 
     &_sys_tim_stop,                  /* 0x16 */
-    &_sys_ukn,                       /* 0x17 */
-    &_sys_ukn,                       /* 0x18 */   
+    &_sys_kill_application,          /* 0x17 */
+    &_sys_exec_application,          /* 0x18 */   
     &_sys_context_switch,            /* 0x19 */
     &_sys_vseg_get_vbase,            /* 0x1A */
@@ -495 +498 @@
         _it_disable( &save_sr ); 
 
-        // reset runnable 
-        _set_task_slot( x, y, p, ltid, CTX_RUN_ID, 0 );  
+        // set NORUN_MASK_COPROC bit
+        static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+        unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
+        _atomic_or( ptr , NORUN_MASK_COPROC );
 
         // start coprocessor
@@ -1785 +1790 @@
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
     unsigned int x          = cluster_xy >> Y_WIDTH;
-    unsigned int lpid       = gpid & ((1<<P_WIDTH)-1);
-
-    unsigned int task_id    = _get_context_slot(CTX_LTID_ID);
+    unsigned int p          = gpid & ((1<<P_WIDTH)-1);
+
+    unsigned int ltid       = _get_context_slot(CTX_LTID_ID);
 
     // print exit message
     _printf("\n[GIET] Exit task %d on processor[%d,%d,%d] at cycle %d"
             "\n       Cause : %s\n\n",
-            task_id, x, y, lpid, date, string );
-
-    // goes to sleeping state
-    _set_context_slot(CTX_RUN_ID, 0);
+            ltid, x, y, p, date, string );
+
+    // set NORUN_MASK_TASK bit (non runnable state)
+    static_scheduler_t*  psched  = (static_scheduler_t*)_schedulers[x][y][p];
+    unsigned int*        ptr     = &psched->context[ltid][CTX_NORUN_ID];
+    _atomic_or( ptr , NORUN_MASK_TASK );
 
     // deschedule
@@ -1803 +1810 @@
 } 
 
+///////////////////////////////////////
+int _sys_kill_application( char* name )
+{
+    mapping_header_t * header  = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
+    mapping_vspace_t * vspace  = _get_vspace_base(header);
+    mapping_task_t   * task    = _get_task_base(header);
+
+    unsigned int vspace_id;
+    unsigned int task_id;
+    unsigned int y_size = header->y_size;
+
+    // scan vspaces
+    for (vspace_id = 0; vspace_id < header->vspaces; vspace_id++) 
+    {
+        if ( _strcmp( vspace[vspace_id].name, name ) == 0 ) 
+        {
+            // scan tasks in vspace
+            for (task_id = vspace[vspace_id].task_offset; 
+                 task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks); 
+                 task_id++) 
+            {
+                unsigned int cid   = task[task_id].clusterid;
+                unsigned int x     = cid / y_size;
+                unsigned int y     = cid % y_size;
+                unsigned int p     = task[task_id].proclocid;
+                unsigned int ltid  = task[task_id].ltid;
+
+                // set NORUN_MASK_TASK bit
+                static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+                unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
+                _atomic_or( ptr , NORUN_MASK_TASK );
+            } 
+            return 0;
+        }
+    } 
+    return -1;    // not found 
+}
+    
+///////////////////////////////////////
+int _sys_exec_application( char* name )
+{
+    mapping_header_t * header  = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
+    mapping_vspace_t * vspace  = _get_vspace_base(header);
+    mapping_task_t   * task    = _get_task_base(header);
+    mapping_vseg_t   * vseg    = _get_vseg_base(header);
+
+    unsigned int vspace_id;
+    unsigned int task_id;
+    unsigned int vseg_id;
+
+    unsigned int y_size = header->y_size;
+
+    // scan vspaces
+    for (vspace_id = 0 ; vspace_id < header->vspaces ; vspace_id++) 
+    {
+        if ( _strcmp( vspace[vspace_id].name, name ) == 0 ) 
+        {
+            // scan tasks in vspace
+            for (task_id = vspace[vspace_id].task_offset; 
+                 task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks); 
+                 task_id++) 
+            {
+                unsigned int cid   = task[task_id].clusterid;
+                unsigned int x     = cid / y_size;
+                unsigned int y     = cid % y_size;
+                unsigned int p     = task[task_id].proclocid;
+                unsigned int ltid  = task[task_id].ltid;
+
+                // compute stack pointer value (sp_value)
+                vseg_id = task[task_id].stack_vseg_id;
+                unsigned int sp_value = vseg[vseg_id].vbase + vseg[vseg_id].length;
+
+                // compute task entry point value (epc_value)
+                vseg_id = vspace[vspace_id].start_vseg_id;     
+                unsigned int* vaddr = (unsigned int*)( vseg[vseg_id].vbase + 
+                                                       ((task[task_id].startid)<<2) );
+                unsigned int  epc_value = *vaddr;
+
+                // compute reurn address value (ra_value)
+                unsigned int ra_value = (unsigned int)(&_ctx_eret);
+
+                // get scheduler pointer 
+                static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+
+                // initialise task context: RA / SR / EPC / SP / NORUN slots
+                psched->context[ltid][CTX_RA_ID]    = ra_value;
+                psched->context[ltid][CTX_SR_ID]    = GIET_SR_INIT_VALUE;
+                psched->context[ltid][CTX_SP_ID]    = sp_value;
+                psched->context[ltid][CTX_EPC_ID]   = epc_value;
+                psched->context[ltid][CTX_NORUN_ID] = 0;
+            } 
+            return 0;
+        }
+    }
+    return -1;    // not found 
+}
+    
 /////////////////////////
 int _sys_context_switch()