Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

respect TIMEOUT, and kill all remaining processes before exiting

Browse source
This commit is contained in:
Eric House 2010-10-05 20:58:29 -07:00
parent a444786a28
commit 6c5b279946
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xwords4/linux/scripts/discon_ok2.sh
View file

@ -64,6 +64,7 @@ build_cmds() {
for DEV in $(seq $NDEVS); do for DEV in $(seq $NDEVS); do
FILE="${LOGDIR}/GAME_${GAME}_${DEV}.xwg" FILE="${LOGDIR}/GAME_${GAME}_${DEV}.xwg"
LOG=${LOGDIR}/${GAME}_${DEV}_LOG.txt LOG=${LOGDIR}/${GAME}_${DEV}_LOG.txt
touch $LOG # so greps won't show errors
CMD="./obj_linux_memdbg/xwords -C $ROOM -r ${NAMES[$DEV]} $OTHERS" CMD="./obj_linux_memdbg/xwords -C $ROOM -r ${NAMES[$DEV]} $OTHERS"
CMD="$CMD -d dict.xwd -p $PORT -a $HOST -f $FILE -z 1:3 $PLAT_PARMS" CMD="$CMD -d dict.xwd -p $PORT -a $HOST -f $FILE -z 1:3 $PLAT_PARMS"
CMDS[$COUNTER]=$CMD CMDS[$COUNTER]=$CMD
@ -86,13 +87,14 @@ close_device() {
if [ ${PIDS[$ID]} -ne 0 ]; then if [ ${PIDS[$ID]} -ne 0 ]; then
kill ${PIDS[$ID]} kill ${PIDS[$ID]}
fi fi
echo -n "closing $ID (log ${LOGS[$ID]}): "
date
unset PIDS[$ID] unset PIDS[$ID]
unset CMDS[$ID] unset CMDS[$ID]
mv ${FILES[$ID]} $DONEDIR mv ${FILES[$ID]} $DONEDIR
unset FILES[$ID] unset FILES[$ID]
mv ${LOGS[$ID]} $DONEDIR mv ${LOGS[$ID]} $DONEDIR
unset LOGS[$ID] unset LOGS[$ID]
echo "closed $ID"
} }
check_game() { check_game() {
@ -101,14 +103,14 @@ check_game() {
CONNNAME="$(connName $LOG)" CONNNAME="$(connName $LOG)"
unset OTHERS unset OTHERS
if [ -n "$CONNNAME" ]; then if [ -n "$CONNNAME" ]; then
if grep -q 'all remaining tiles' $LOG; then if grep -q '\[unused tiles\]' $LOG; then
ALL_DONE=TRUE ALL_DONE=TRUE
for INDX in ${!LOGS[*]}; do for INDX in ${!LOGS[*]}; do
[ $INDX -eq $KEY ] && continue [ $INDX -eq $KEY ] && continue
ALOG=${LOGS[$INDX]} ALOG=${LOGS[$INDX]}
CONNNAME2="$(connName $ALOG)" CONNNAME2="$(connName $ALOG)"
if [ "$CONNNAME2" = "$CONNNAME" ]; then if [ "$CONNNAME2" = "$CONNNAME" ]; then
if ! grep -q 'all remaining tiles' $ALOG; then if ! grep -q '\[unused tiles\]' $ALOG; then
unset OTHERS unset OTHERS
break break
fi fi
@ -126,9 +128,11 @@ check_game() {
} }
run_cmds() { run_cmds() {
ENDTIME=$(($(date +%s) + TIMEOUT))
while :; do while :; do
COUNT=${#CMDS[*]} COUNT=${#CMDS[*]}
[ 0 -ge $COUNT ] && break [ 0 -ge $COUNT ] && break
[ $(date +%s) -ge $ENDTIME ] && break
INDX=$(($RANDOM%COUNT)) INDX=$(($RANDOM%COUNT))
KEYS=( ${!CMDS[*]} ) KEYS=( ${!CMDS[*]} )
KEY=${KEYS[$INDX]} KEY=${KEYS[$INDX]}
@ -142,6 +146,14 @@ run_cmds() {
check_game $KEY check_game $KEY
fi fi
done done
# kill any remaining games
for PID in ${PIDS[*]}; do
if [ $PID -ne 0 ]; then
echo "$PID still alive; killing..."
kill $PID
fi
done
} }
print_stats() { print_stats() {
@ -153,3 +165,5 @@ run_cmds
print_stats print_stats
wait wait
echo -n "$0 done: "
date