Changeset 232 for soft/giet_vm/xml

Timestamp:

Mar 5, 2013, 4:00:09 PM (12 years ago)

Author:

meunier

Message:

Ajout du malloc dans le Giet.

Location:

soft/giet_vm/xml

Files:

• mapping_info.h (modified) (2 diffs)
• xml_driver.c (modified) (2 diffs)
• xml_parser.c (modified) (8 diffs)

soft/giet_vm/xml/mapping_info.h

@@ -178 +178 @@
     unsigned int clusterid;      // physical cluster index
     unsigned int proclocid;      // processor local index (inside cluster)
-    unsigned int vobjlocid;      // stack vobj index in vspace
+    unsigned int stack_vobjid;   // stack vobj index in vspace
+    unsigned int heap_vobjid;    // heap vobj index in vspace
     unsigned int startid;        // index in start_vector 
     unsigned int use_tty;        // TTY terminal required (global)
@@ -229 +230 @@
     unsigned int direction;      // TO_COPROC == 0 / FROM_COPROC == 1
     unsigned int vspaceid;       // index of the vspace containing the MWMR channel
-    unsigned int vobjlocid;      // local index of the vobj containing the MWMR channel
+    unsigned int mwmr_vobjid;      // local index of the vobj containing the MWMR channel
 } mapping_cp_port_t;
 

soft/giet_vm/xml/xml_driver.c

@@ -271 +271 @@
                     port_id < coproc[coproc_id].port_offset + coproc[coproc_id].ports;
                     port_id++) {
-                unsigned int vobj_id = cp_port[port_id].vobjlocid + vspace[cp_port[port_id].vspaceid].vobj_offset; 
+                unsigned int vobj_id = cp_port[port_id].mwmr_vobjid + vspace[cp_port[port_id].vspaceid].vobj_offset; 
                 fprintf(fpout, "             <port direction = \"%s\" ",  port_direction[cp_port[port_id].direction]);
                 fprintf(fpout, " vspacename = \"%s\" ", vspace[cp_port[port_id].vspaceid].name);
@@ -353 +353 @@
                 task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks);
                 task_id++) {
-            unsigned int vobj_id = task[task_id].vobjlocid + vspace[vspace_id].vobj_offset; 
+            unsigned int stack_vobj_id = task[task_id].stack_vobjid + vspace[vspace_id].vobj_offset; 
+            unsigned int heap_vobj_id = task[task_id].heap_vobjid + vspace[vspace_id].vobj_offset; 
 
             fprintf(fpout, "            <task name = \"%s\" ", task[task_id].name);
             fprintf(fpout, "clusterid = \"%d\" ", task[task_id].clusterid);
             fprintf(fpout, "proclocid = \"%d\" ", task[task_id].proclocid);
-            fprintf(fpout, "stackname = \"%s\" ", vobj[vobj_id].name);
+            fprintf(fpout, "stackname = \"%s\" ", vobj[stack_vobj_id].name);
+            if (heap_vobj_id != -1) {
+                fprintf(fpout, "heapname = \"%s\" ", vobj[heap_vobj_id].name);
+            }
             fprintf(fpout, "startid = \"%d\" ", task[task_id].startid);
             fprintf(fpout, "usetty = \"%d\" ", task[task_id].use_tty);

soft/giet_vm/xml/xml_parser.c

@@ -109 +109 @@
 unsigned int cluster_y            = 0;
 unsigned int cluster_x            = 0; 
-unsigned int nb_proc_max          = 0; // max number of processors per cluster 
+unsigned int nb_proc_max          = 0; // max number of processors per cluste 
+
+unsigned int nb_tasks_max         = 0; // max number of tasks (for all vspaces)
 unsigned int nb_timer_channel_max = 0; // max number of user timer
 unsigned int nb_dma_channel_max   = 0;
@@ -350 +352 @@
             printf("      stackid   = %d\n", index);
 #endif
-            task[task_index]->vobjlocid = index;
+            task[task_index]->stack_vobjid = index;
         }
         else {
@@ -363 +365 @@
         exit(1);
     }
+
+    ////////// get heap attribute
+    str = getStringValue(reader, "heapname", &ok);
+    if (ok) {
+        int index = getVobjLocId(vspace_index, str, vobj_loc_index);
+        if (index >= 0) {
+#if XML_PARSER_DEBUG
+            printf("      heapname = %s\n", str);
+            printf("      heapid   = %d\n", index);
+#endif
+            task[task_index]->heap_vobjid = index;
+        }
+        else {
+            printf("[XML ERROR] illegal or missing <heapname> for task (%d,%d)\n", vspace_index, task_loc_index);
+            exit(1);
+        }
+    }  
+    else {
+        task[task_index]->heap_vobjid = -1;
+    }
+
 
     ////////// get startid  attribute
@@ -715 +738 @@
     char * str;
     unsigned int ok;
+    unsigned int nb_task_vspace = 0;
 
     vobj_loc_index = 0;
@@ -782 +806 @@
         else if (strcmp(tag, "task") == 0) {
             taskNode(reader);
+            nb_task_vspace++;
         }
         else if (strcmp(tag, "#text")    == 0) { }
@@ -818 +843 @@
             }
 
+            nb_tasks_max += nb_task_vspace;
             vspace_index++;
             return;
@@ -1934 +1960 @@
             printf("      vobj_index   = %d\n", vobj_id);
 #endif
-            cp_port[i]->vobjlocid = vobj_id;
+            cp_port[i]->mwmr_vobjid = vobj_id;
 
             assert((vobj[ vspace[vspace_id]->vobj_offset + vobj_id]->type == VOBJ_TYPE_MWMR)
@@ -1990 +2016 @@
     def_int_write(fdout, "NB_IOCS"      , nb_ioc_channel);
     def_int_write(fdout, "NB_NICS"      , nb_nic_channel);
+    def_int_write(fdout, "NB_TASKS"     , nb_tasks_max);
 
     file_write(fdout, "\n");