zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added colouring of output

Browse Source
This commit is contained in:
mattijs
2008-04-25 11:23:36 +01:00
parent 40d8344e4c
commit d0cf3bd706
1 changed files with 123 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
wmake/wmakeScheduler
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
@ -31,6 +31,8 @@
# - WM_HOSTS contains a list of hosts and number of concurrent processes
# eg,
# export WM_HOSTS="hostA:1 hostB:2 hostC:1"
# - WM_COLOURS contains a list of colours to cycle through
# export WM_COLOURS="black blue green cyan red magenta yellow"
#
# Sources the relevant cshrc/bashrc if not set.
#
@ -79,15 +81,19 @@ case $SHELL in
;;
esac
# check ~/.$WM_PROJECT-$WM_PROJECT_VERSION
# check <site>/etc
# check <site>/.$WM_PROJECT-$WM_PROJECT_VERSION
# check ~/.$WM_PROJECT-$WM_PROJECT_VERSION/
# check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
# check ~/.$WM_PROJECT/
# check <installedProject>/etc/
# check <installedProject/.$WM_PROJECT-$WM_PROJECT_VERSION/
if [ "$WM_PROJECT" ]; then
: ${FOAM_DOT_DIR:=.$WM_PROJECT-$WM_PROJECT_VERSION}
for i in \
$HOME/$FOAM_DOT_DIR \
$HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
$HOME/.$WM_PROJECT \
$WM_PROJECT_DIR/etc \
$WM_PROJECT_DIR/$FOAM_DOT_DIR \
;
@ -111,6 +117,32 @@ rcmd=$(echo $* | sed -e s/\"/\'\"\'/g)
## the same, without forking (not ksh, maybe not /bin/sh either)
# rcmd=$(while [ "$#" -gt 0 ]; do echo "${1//\"/'\"'}"; shift; done)
# Convert WM_COLOURS into an array
declare colours
nColours=0
for col in $WM_COLOURS
do
colours[$nColours]=$col
((nColours = $nColours + 1))
done
# Bashism: make pipe fail early. This make sure return value of compilation
# is returned and not of colouring pipe.
set -o pipefail
# Define function to colour output by argument 1
colourPipe(){
if [ "$1" ]; then
(while read line; do setterm -foreground $1; echo "$line" ; done)
else
cat
fi
}
colourIndex=0
while :
do
# 0.5 sec
@ -124,34 +156,56 @@ do
if [ "$n" = "$host" ]; then n=1; fi # missing ':'
: ${n:=1}
## echo "** slot=$slot host=$host n=$n"
i=0
while [ "$i" -lt "$n" ]
do
lock="$host:$i"
if [ ! -f "$lockDir/$lock" ]
then
if [ ! -f "$lockDir/$lock" ]; then
# Set lock
touch "$lockDir/$lock"
#echo "ssh $host cd $PWD && $*"
if [ "$host" = "$HOST" ]
then
# Set colour
colour=${colours[$colourIndex]}
#echo "** host=$host colourIndex=$colourIndex colour=$colour"
if [ "$host" = "$HOST" ]; then
if [ "$colour" ]; then
eval $* 2>&1 | colourPipe $colour
else
eval $*
elif [ -n "$JOB_ID" ]
then
fi
elif [ -n "$JOB_ID" ]; then
if [ "$colour" ]; then
qrsh -inherit -v PWD $host "$rcmd" 2>&1 | colourPipe $colour
else
qrsh -inherit -v PWD $host "$rcmd"
fi
else
if [ "$colour" ]; then
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe $colour
else
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd"
fi
fi
retval=$?
## echo "** Releasing $lock"
# Release lock
rm -f "$lockDir/$lock" 2>/dev/null
exit $retval
fi
i=$(expr $i + 1)
# Cycle through colours
colourIndex=$(expr $colourIndex + 1)
if (( $colourIndex >= $nColours )); then
colourIndex=0
fi
done
done
done
if [ "$WM_COLOURS" ]; then
setterm -foreground default
fi
#------------------------------------------------------------------------------