Changeset 709 for soft/giet_vm/giet_common/utils.c

Timestamp:

Oct 1, 2015, 4:20:46 PM (9 years ago)

Author:

alain

Message:

Major release: Change the task model to implement the POSIX threads API.

• The shell "exec" and "kill" commands can be used to activate/de-activate the applications.
• The "pause", "resume", and "context" commands can be used to stop, restart, a single thtead or to display the thread context.

This version has been tested on the following multi-threaded applications,
that have been modified to use the POSIX threads:

• classif
• convol
• transpose
• gameoflife
• raycast

File:

• soft/giet_vm/giet_common/utils.c (modified) (7 diffs)

soft/giet_vm/giet_common/utils.c

@@ -16 +16 @@
 #include <ctx_handler.h>
 
-// This variable is allocated in the boot.c file or in kernel_init.c file
-extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX];
+// This variable is allocated in boot.c file or in kernel_init.c file
+extern static_scheduler_t*  _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX];
 
 ///////////////////////////////////////////////////////////////////////////
@@ -23 +23 @@
 ///////////////////////////////////////////////////////////////////////////
 
-/////////////////////////
-unsigned int _get_sched() 
+////////////////////////////////
+static_scheduler_t* _get_sched() 
 {
     unsigned int ret;
     asm volatile( "mfc0      %0,     $4,2    \n" 
                   : "=r"(ret) );
-    return ret;
+
+    return (static_scheduler_t*)ret;
 }
 ///////////////////////
@@ -411 +412 @@
 
 ////////////////////////////////////////////////////////////////////////////
-//           Scheduler and tasks context access functions
+//           Scheduler and threads context access functions
 ////////////////////////////////////////////////////////////////////////////
 
 
-///////////////////////////////////
-unsigned int _get_current_task_id() 
-{
-    static_scheduler_t * psched = (static_scheduler_t *) _get_sched();
-    return (unsigned int) (psched->current);
+///////////////////////////////
+unsigned int _get_thread_ltid() 
+{
+    static_scheduler_t* psched = (static_scheduler_t *) _get_sched();
+    return psched->current;
+}
+
+////////////////////////////////
+unsigned int _get_thread_trdid() 
+{
+    static_scheduler_t* psched  = (static_scheduler_t *) _get_sched();
+    unsigned int        current = psched->current;
+    return psched->context[current].slot[CTX_TRDID_ID];
+}
+
+//////////////////////////////////////////////
+unsigned int _get_thread_slot( unsigned int x,
+                               unsigned int y,
+                               unsigned int p,
+                               unsigned int ltid,
+                               unsigned int slotid )
+{
+    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+    return psched->context[ltid].slot[slotid];
+}
+
+//////////////////////////////////////
+void _set_thread_slot( unsigned int x,
+                       unsigned int y,
+                       unsigned int p,
+                       unsigned int ltid,
+                       unsigned int slotid,
+                       unsigned int value )
+{
+    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
+    psched->context[ltid].slot[slotid] = value;
+}
+
+/////////////////////////////////////////////////////
+unsigned int _get_context_slot( unsigned int slotid )
+{
+    static_scheduler_t* psched  = (static_scheduler_t*)_get_sched();
+    unsigned int        ltid    = psched->current;
+    return psched->context[ltid].slot[slotid];
 }
 
 ////////////////////////////////////////////
-unsigned int _get_task_slot( unsigned int x,
-                             unsigned int y,
-                             unsigned int p,
-                             unsigned int ltid,
-                             unsigned int slot )
-{
-    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-    return psched->context[ltid][slot];
-}
-
-////////////////////////////////////
-void _set_task_slot( unsigned int x,
-                     unsigned int y,
-                     unsigned int p,
-                     unsigned int ltid,
-                     unsigned int slot,
-                     unsigned int value )
-{
-    static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-    psched->context[ltid][slot] = value;
-}
-
-///////////////////////////////////////////////////
-unsigned int _get_context_slot( unsigned int slot )
+void _set_context_slot( unsigned int slotid,
+                        unsigned int value )
 {
     static_scheduler_t* psched  = (static_scheduler_t*)_get_sched();
-    unsigned int        task_id = psched->current;
-    return psched->context[task_id][slot];
-}
-
-///////////////////////////////////////////
-void _set_context_slot( unsigned int slot,
-                       unsigned int value )
-{
-    static_scheduler_t* psched  = (static_scheduler_t*)_get_sched();
-    unsigned int        task_id = psched->current;
-    psched->context[task_id][slot] = value;
+    unsigned int        ltid    = psched->current;
+    psched->context[ltid].slot[slotid] = value;
 }
 
@@ -496 +505 @@
             MAPPING_VSPACE_SIZE * header->vspaces);
 }
-//////////////////////////////////////////////////////////
-mapping_task_t * _get_task_base(mapping_header_t * header) 
-{
-    return (mapping_task_t *) ((char *) header +
+//////////////////////////////////////////////////////////////
+mapping_thread_t * _get_thread_base(mapping_header_t * header) 
+{
+    return (mapping_thread_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
             MAPPING_CLUSTER_SIZE * X_SIZE * Y_SIZE +
@@ -515 +524 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_TASK_SIZE * header->tasks);
+            MAPPING_THREAD_SIZE * header->threads);
 }
 ///////////////////////////////////////////////////////
@@ -526 +535 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_TASK_SIZE * header->tasks +
+            MAPPING_THREAD_SIZE * header->threads +
             MAPPING_PROC_SIZE * header->procs);
 }
@@ -538 +547 @@
             MAPPING_VSPACE_SIZE * header->vspaces +
             MAPPING_VSEG_SIZE * header->vsegs +
-            MAPPING_TASK_SIZE * header->tasks +
+            MAPPING_THREAD_SIZE * header->threads +
             MAPPING_PROC_SIZE * header->procs +
             MAPPING_IRQ_SIZE * header->irqs);