Changeset 709 for soft/giet_vm/giet_xml/xml_driver.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_xml/xml_driver.c (modified) (6 diffs)

soft/giet_vm/giet_xml/xml_driver.c

@@ -126 +126 @@
     unsigned int pseg_id;
     unsigned int vseg_id;
-    unsigned int task_id;
+    unsigned int thread_id;
     unsigned int proc_id;
     unsigned int irq_id;
@@ -135 +135 @@
     mapping_vspace_t * vspace;
     mapping_vseg_t * vseg;
-    mapping_task_t * task;
+    mapping_thread_t * thread;
     mapping_irq_t * irq;    
     mapping_periph_t * periph;
@@ -161 +161 @@
             MAPPING_VSPACE_SIZE * header->vspaces);
 
-    // computes the base address for tasks array 
-    task = (mapping_task_t *) ((char *) header +
+    // computes the base address for threads array 
+    thread = (mapping_thread_t *) ((char *) header +
             MAPPING_HEADER_SIZE +
             MAPPING_CLUSTER_SIZE * header->x_size * header->y_size +
@@ -176 +176 @@
             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);
 
@@ -186 +186 @@
             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);
@@ -342 +342 @@
         }
 
-        //////////////////// tasks //////////////////////////////////////////////
-
-        for (task_id = vspace[vspace_id].task_offset;
-             task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks);
-             task_id++) 
+        //////////////////// threads //////////////////////////////////////////////
+
+        for (thread_id = vspace[vspace_id].thread_offset;
+             thread_id < (vspace[vspace_id].thread_offset + vspace[vspace_id].threads);
+             thread_id++) 
         {
-            unsigned int stack_vseg_id = task[task_id].stack_vseg_id; 
-            unsigned int heap_vseg_id  = task[task_id].heap_vseg_id; 
-            unsigned int cluster_id    = task[task_id].clusterid;
-
-            fprintf(fpout, "            <task name=\"%s\"", task[task_id].name);
-            fprintf(fpout, " trdid=\"%d\"", task[task_id].trdid);
+            unsigned int stack_vseg_id = thread[thread_id].stack_vseg_id; 
+            unsigned int heap_vseg_id  = thread[thread_id].heap_vseg_id; 
+            unsigned int cluster_id    = thread[thread_id].clusterid;
+
+            fprintf(fpout, "            <thread name=\"%s\"", thread[thread_id].name);
+            fprintf(fpout, " trdid=\"%d\"", thread[thread_id].trdid);
             fprintf(fpout, " x=\"%d\"", cluster[cluster_id].x);
             fprintf(fpout, " y=\"%d\"", cluster[cluster_id].y);
-            fprintf(fpout, " p=\"%d\"", task[task_id].proclocid);
+            fprintf(fpout, " p=\"%d\"", thread[thread_id].proclocid);
             fprintf(fpout, "\n                 ");      
             fprintf(fpout, " stackname=\"%s\"", vseg[stack_vseg_id].name);
             if (heap_vseg_id != -1) 
             fprintf(fpout, " heapname=\"%s\"", vseg[heap_vseg_id].name);
-            fprintf(fpout, " startid = \"%d\"", task[task_id].startid);
+            fprintf(fpout, " startid = \"%d\"", thread[thread_id].startid);
             fprintf(fpout, " />\n");
         }