Changeset 126 for trunk

Timestamp:

Jun 17, 2009, 8:10:41 PM (16 years ago)

Author:

rosiere

Message:

modif distexe script

Location:

trunk/IPs/systemC/processor/Morpheo/Script

Files:

• distexe.sh (modified) (4 diffs)
• execute.sh (modified) (2 diffs)
• execute_n.sh (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Script/distexe.sh

@@ -7 +7 @@
 VERSION="1.0"
 
-# Need : test, echo, cd, dirname, basename, ssh
+# Need : test, echo, cd, dirname, basename, ssh, ps aux
 
 #-----[ distexe_usage ]-------------------------------------
@@ -103 +103 @@
     fi;
 
+    local FILE_CPT="${PATH_EXE}/control-"$(basename ${FILE_CMD});
+    
     header;
     echo "  * {"$(my_date)"} <${HOSTNAME}> file : ${FILE_CMD}";
@@ -108 +110 @@
 
     local hosts="${DISTEXE_HOSTS}";
+    local -a commands;
+    local -i cpt=0;
 
     for line in ${hosts}; do
@@ -116 +120 @@
 
         # lunch service
-        local cmd="export MORPHEO_SCRIPT=${MORPHEO_SCRIPT};${MORPHEO_SCRIPT}/execute_n.sh ${PATH_EXE} ${FILE_CMD} ${nb_process};";
+        local cmd="export MORPHEO_SCRIPT=${MORPHEO_SCRIPT};${MORPHEO_SCRIPT}/execute_n.sh ${PATH_EXE} ${FILE_CMD} ${FILE_CPT} ${nb_process};";
         ssh ${host} ${cmd} &
+
+        commands[${cpt}]="${cmd}";
+        cpt=$((${cpt}+1));
     done;
 
     echo "  * {"$(my_date)"} <${HOSTNAME}> all hosts working";
 
+    cpt=0;
+    while test ${cpt} -lt ${#commands[*]}; do
+        local -i res=1
+
+        while test ${res} -ne 0; do
+            res=$(ps aux | grep -c "${commands[${cpt}]}");
+        done
+
+        cpt=$((${cpt}+1));
+    done;
+
+    echo "  * {"$(my_date)"} <${HOSTNAME}> all hosts is done";
+    rm ${FILE_CPT};
 }
 

trunk/IPs/systemC/processor/Morpheo/Script/execute.sh

@@ -127 +127 @@
         # Test if command is empty !
         if test ! -z "${COMMAND[${CPT}]}"; then
+#           echo "  * {"$(my_date)"} <${ID}> execute command [${CPT}] : ${COMMAND[${CPT}]}";
+            echo "  * {"$(my_date)"} <${ID}> command [${CPT}] : execute";
             local PATH_CURRENT=${PWD};
             cd    ${PATH_WORK}        &> /dev/null;
             mkdir "Task_${CPT}"       &> /dev/null;
             cd    "Task_${CPT}"       &> /dev/null;
-#           echo "  * {"$(my_date)"} <${ID}> execute command [${CPT}] : ${COMMAND[${CPT}]}";
-            echo "  * {"$(my_date)"} <${ID}> execute command [${CPT}]";
             echo "id   : ${ID}"        >  ${OUTPUT_FILE_INFO};
             echo "host : ${HOSTNAME}" >>  ${OUTPUT_FILE_INFO};
@@ -143 +143 @@
             ./${OUTPUT_FILE_CMD}      &>  ${OUTPUT_FILE_OUT};
             cd    ${PATH_CURRENT}     &> /dev/null;
+            echo "  * {"$(my_date)"} <${ID}> command [${CPT}] : done";
         fi;
     done;

trunk/IPs/systemC/processor/Morpheo/Script/execute_n.sh

@@ -27 +27 @@
 function execute_n_usage ()
 {
-    echo "Usage     : ${0} path_word file [ nb_process ]";
+    echo "Usage     : ${0} path_word file_cmd file_cpt [ nb_process ]";
     echo "Arguments : ";
     echo " * path_work  : directory to execute command";
-    echo " * file       : list of command";
+    echo " * file_cmd   : list of command";
+    echo " * file_cpt   : file to control";
     echo " * nb_process : number of process (default (and maximum) is the number of processor)";
     echo "";
@@ -45 +46 @@
 function execute_n_test_usage ()
 {
-    if test ${#} -ne 2 -a ${#} -ne 3; then
+    if test ${#} -ne 3 -a ${#} -ne 4; then
         execute_n_usage;
     fi;
@@ -76 +77 @@
     local    PATH_WORK=${1};
     local    FILE_CMD=${2};
-    local    FILE_CPT;
+    local    FILE_CPT=${3};
     local    FILE_CPU;
     local    ID="cpu-${HOSTNAME}-$$"
@@ -82 +83 @@
     execute_n_test_usage ${*};
 
-    if test ${#} -eq 3; then
-        if test ${3} -lt ${NB_PROCESS}; then
-            NB_PROCESS=${3};
+    if test ${#} -eq 4; then
+        if test ${4} -lt ${NB_PROCESS}; then
+            NB_PROCESS=${4};
         fi;    
     fi;
 
-    FILE_CPT="${PATH_WORK}/control-"$(basename ${FILE_CMD});
     FILE_CPU="${PATH_WORK}/${ID}";