Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Script

Timestamp:

Jun 26, 2009, 10:43:23 AM (16 years ago)

Author:

rosiere

Message:

1) Correct bug in link two signal
2) Fix error detected with valgrind
3) modif distexe script

Location:

trunk/IPs/systemC/processor/Morpheo/Script

Files:

• distexe.sh (modified) (3 diffs)
• execute.sh (modified) (5 diffs)

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

@@ -5 +5 @@
 #-----------------------------------------------------------
 
-VERSION="1.0"
+declare    VERSION="1.0"
+declare -i SLEEP=3
 
 # Need : test, echo, cd, dirname, basename, ssh, ps aux
@@ -106 +107 @@
     
     header;
-    echo "  * {"$(my_date)"} <${HOSTNAME}> file : ${FILE_CMD}";
-    echo "  * {"$(my_date)"} <${HOSTNAME}> path : ${PATH_EXE}";
+
+    echo "  * {"$(my_date)"} <${HOSTNAME}> file  : ${FILE_CMD}";
+    echo "  * {"$(my_date)"} <${HOSTNAME}> path  : ${PATH_EXE}";
+    echo "  * {"$(my_date)"} <${HOSTNAME}> sleep : ${SLEEP}";
 
     local hosts="${DISTEXE_HOSTS}";
@@ -133 +136 @@
         local -i res=1
 
-        while test ${res} -ne 0; do
+        while true; do
             res=$(ps aux | grep -c "${commands[${cpt}]}");
+
+            if test ${res} -eq 0; then
+                break;
+            fi;
+
+            # wait (to not have 100% cpu)
+            sleep ${SLEEP};
         done
 

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

@@ -89 +89 @@
 
     local -i NB_DIGIT=0;
-    local -i x=${#COMMAND[*]};
+    local -i NB_COMMAND=${#COMMAND[*]};
+    local -i x=${NB_COMMAND};
 
     while test ${x} -ne 0; do
@@ -113 +114 @@
 
         # test if this number is valid
-        if test ${CPT} -ge ${#COMMAND[*]}; then
-            CPT=${#COMMAND[*]};
+        if test ${CPT} -ge ${NB_COMMAND}; then
+            CPT=${NB_COMMAND};
         fi;
 
@@ -129 +130 @@
 
         # test if this number is valid
-        if test ${CPT} -eq ${#COMMAND[*]}; then
+        if test ${CPT} -eq ${NB_COMMAND}; then
             break;
         fi;
@@ -138 +139 @@
 
 #           echo "  * {"$(my_date)"} <${ID}> execute command [${NUM}] : ${COMMAND[${CPT}]}";
-            echo "  * {"$(my_date)"} <${ID}> command [${NUM}] : execute";
+            echo "  * {"$(my_date)"} <${ID}> command [${NUM}/${NB_COMMAND}] : execute";
             local PATH_CURRENT=${PWD};
 
@@ -154 +155 @@
             ./${OUTPUT_FILE_CMD}      &>  ${OUTPUT_FILE_OUT};
             cd    ${PATH_CURRENT}     &> /dev/null;
-            echo "  * {"$(my_date)"} <${ID}> command [${NUM}] : done";
+            echo "  * {"$(my_date)"} <${ID}> command [${NUM}/${NB_COMMAND}] : done";
         fi;
     done;