Various minor fixes for Extrae integration

Codes/malleability/spawn_methods/Baseline.c

@@ -43,7 +43,9 @@ int baseline_spawn(Spawn_data spawn_data, MPI_Comm comm, MPI_Comm *child) {
   if(spawn_data.myId == spawn_data.root) rootBcast = MPI_ROOT;
 
   // WORK
-  int spawn_err = MPI_Comm_spawn(spawn_data.cmd, MPI_ARGV_NULL, spawn_data.spawn_qty, spawn_data.mapping, spawn_data.root, comm, child, MPI_ERRCODES_IGNORE); 
+  char *cmd="./trace_worker.sh";
+  int spawn_err = MPI_Comm_spawn(cmd, MPI_ARGV_NULL, spawn_data.spawn_qty, spawn_data.mapping, spawn_data.root, comm, child, MPI_ERRCODES_IGNORE);
+  //int spawn_err = MPI_Comm_spawn(spawn_data.cmd, MPI_ARGV_NULL, spawn_data.spawn_qty, spawn_data.mapping, spawn_data.root, comm, child, MPI_ERRCODES_IGNORE); 
   MPI_Comm_set_name(*child, "MPI_COMM_MALL_RESIZE");
   // END WORK
 

Exec/CheckRun.sh

 #!/bin/bash
 
-dir="/home/martini/malleability_benchmark/"
+dir="/home/usuario/Documentos/malleability_benchmark"
 cores=20
 
 # Checks if all the runs in the current working directory performed under a 
@@ -32,7 +32,8 @@ iter_total_lines=$(($iter_lines_basic+$total_stages*2+1))
 exec_remove=$(($exec_lines_basic+$total_stages+$total_groups-1))
 iter_remove=$(($iter_lines_basic+$total_stages-1))
 
-if [ "$#" -lt "6" ]
+echo $#
+if [ "$#" -lt "5" ]
 then
   echo "Not enough arguments"
   echo "Usage -> bash CheckRun maxIndes total_repetitions total_groups total_stages max_iteration_time"

Exec/Extrae/extrae.xml

@@ -97,7 +97,7 @@
 
   <syscall enabled="no" />
 
-  <merge enabled="yes" 
+  <merge enabled="no" 
     synchronization="default"
     tree-fan-out="16"
     max-memory="512"

Exec/Extrae/trace_worker.sh

+#!/bin/bash
+dir="/home/usuario/Documentos/malleability_benchmark"
+codeDir="/Codes/build"
+
+export EXTRAE_CONFIG_FILE=extrae.xml
+export LD_PRELOAD=$EXTRAE_HOME/lib/libmpitrace.so
+
+$dir$codeDir/./a.out
+

Exec/generalRun.sh

@@ -28,7 +28,7 @@ configFile=$2
 use_extrae=$3
 outFileIndex=$4
 qty=1
-if [ $# -gt 5 ]
+if [ $# -ge 5 ]
 then
   qty=$5
 fi

Exec/generalRunCostum.sh

@@ -26,17 +26,17 @@ use_extrae=0
 outFileIndex=0
 qty=1
 
-if [ $# -gt 3 ]
+if [ $# -ge 3 ]
 then
   use_extrae=$3
 fi
 
-if [ $# -gt 4 ]
+if [ $# -ge 4 ]
 then
   outFileIndex=$4
 fi
 
-if [ $# -gt 5 ]
+if [ $# -ge 5 ]
 then
   qty=$5
 fi

Exec/multipleRuns.sh

 #!/bin/bash
 
-dir="/home/martini/malleability_benchmark/"
+dir="/home/usuario/Documentos/malleability_benchmark"
 codeDir="Codes/"
 execDir="Exec/"
 ResultsDir="Results/"

Exec/runAll.sh

 #!/bin/bash
 
-dir="/home/martini/malleability_benchmark"
+dir="/home/usuario/Documentos/malleability_benchmark"
 partition="P1"
 exclude="c00,c01,c02"
 cores=20

Exec/singleRun.sh

 #!/bin/bash
 
-dir="/home/martini/malleability_benchmark"
+dir="/home/usuario/Documentos/malleability_benchmark"
 partition="P1"
 exclude="c00,c01,c02"
 cores=20
@@ -18,7 +18,7 @@ codeDir="/Codes/build"
 execDir="/Exec"
 ResultsDir="/Results"
 
-if [ $# -lt 2 ]
+if [ $# -lt 1 ]
 then
   echo "Not enough arguments. Usage:"
   echo "bash singleRun.sh config.ini [outFileIndex] [Qty] [Use extrae] [Output path]"
@@ -36,26 +36,26 @@ outFileIndex=0
 qty=1
 use_extrae=0
 
-if [ $# -gt 2 ]
+if [ $# -ge 2 ]
 then
   outFileIndex=$2
 fi
-if [ $# -gt 3 ]
+if [ $# -ge 3 ]
 then
   qty=$3
 fi
-if [ $# -gt 4 ]
+if [ $# -ge 4 ]
 then
   use_extrae=$4
 fi
-if [ $# -gt 5 ]
+if [ $# -ge 5 ]
 then
   output=$5
 fi
 
 #1 - Obtain maximum number of processes for the run
 max_numP=-1
-total_groups=$(grep Total_Resizes config2.ini | cut -d '=' -f2)
+total_groups=$(grep Total_Resizes $config_file | cut -d '=' -f2)
 for ((j=0; j<total_groups; j++)); 
 do
   resize_info=$(grep "\[resize$j\]" -n $config_file | cut -d ":" -f1)

Exec/singleRunCostum.sh

 #!/bin/bash
 
-dir="/home/martini/malleability_benchmark"
+dir="/home/usuario/Documentos/malleability_benchmark"
 
 # Executes a given configuration file
 # Parameter 1: Configuration file name for the emulation.
@@ -14,15 +14,13 @@ codeDir="/Codes/build"
 execDir="/Exec"
 ResultsDir="/Results"
 
-if [ $# -lt 2 ]
+if [ $# -lt 1 ]
 then
   echo "Not enough arguments. Usage:"
   echo "singleRunCostum.sh config.ini [outFileIndex] [Qty] [Use Extrae] [Output path]"
   exit 1
 fi
 
-echo "START TEST"
-
 #$1 == configFile
 #$2 == outFileIndex
 #$3 == Qty of repetitions
@@ -34,19 +32,19 @@ outFileIndex=0
 qty=1
 use_extrae=0
 
-if [ $# -gt 2 ]
+if [ $# -ge 2 ]
 then
   outFileIndex=$2
 fi
-if [ $# -gt 3 ]
+if [ $# -ge 3 ]
 then
   qty=$3
 fi
-if [ $# -gt 4 ]
+if [ $# -ge 4 ]
 then
   use_extrae=$4
 fi
-if [ $# -gt 5 ]
+if [ $# -ge 5 ]
 then
   output=$5
 fi