Added logs and timestamp to test beam scripts.

cbm-fles · Nov 22, 2016 · 4d778ab · 4d778ab
1 parent d80903b
commit 4d778ab
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 52 deletions.
diff --git a/contrib/readout b/contrib/readout
@@ -14,14 +14,16 @@ set -m  # run all processes in a separate process group
 ROOT_DIR="$(git rev-parse --show-toplevel)"
 BINDIR=.
 LINK=(disable disable disable disable disable disable disable disable disable disable disable disable disable disable disable disable)
+OUTFILE=./
 
 case $1 in
     rec)
-        if [ -z ${2+x} ]; then
+        if [ -z "$2" ]; then
             echo "please provide filename";
             exit
 	else
-	    OUTFILE=$2
+            RECORD=true
+            OUTFILE=$2
         fi
         ;;
     *)
@@ -59,10 +61,10 @@ BASE_EQID[1]=0xF01
 
 PGEN_RATE=0.14
 
-if [ -z ${OUTFILE+x} ]; then
-    TS_PROCESSOR="./tsclient -c%i -s%s -a"
+if [ "$RECORD" = true ]; then
+    TS_PROCESSOR="./tsclient -c%i -s%s -a --output-archive-bytes 2000000000 -o ${OUTFILE}%n.tsa"
 else
-    TS_PROCESSOR="./tsclient -c%i -s%s -a --output-archive-bytes 2000000000 -o ${OUTFILE}_%n.tsa"
+    TS_PROCESSOR="./tsclient -c%i -s%s -a"
 fi
 
 FLESNET_CFG=(-l 2 --timeslice-size 100 --overlap-size 1 
@@ -128,7 +130,8 @@ $ROOT_DIR/contrib/flesnet-check
 
 echo "Configuring FLIBs ..."
 for i in 0 1; do
-$BINDIR/flib_cfg -c /dev/null -l 2 -L f${i}_cfg.log -i ${ADDR[$i]} -t 100 -r $PGEN_RATE \
+$BINDIR/flib_cfg -c /dev/null -l 2 -L ${OUTFILE}f${i}_cfg.log -i ${ADDR[$i]} \
+                 -t 100 -r $PGEN_RATE \
                  --l0_source ${LINK[0+$i*8]} --l0_eq_id ${BASE_EQID[$i]}0 \
                  --l1_source ${LINK[1+$i*8]} --l1_eq_id ${BASE_EQID[$i]}1 \
                  --l2_source ${LINK[2+$i*8]} --l2_eq_id ${BASE_EQID[$i]}2 \
@@ -142,23 +145,23 @@ done
 
 echo "Starting flib_server ..."
 if [ ${#IN_INDEX_0[@]} -ne 0 ]; then
-    $BINDIR/flib_server -c /dev/null -L f0_server.log -i ${ADDR[0]} \
+    $BINDIR/flib_server -c /dev/null -L ${OUTFILE}f0_server.log -i ${ADDR[0]} \
                     -o shm_server_f0 &
     SERVER_0_PID=$!
 fi
 if [ ${#IN_INDEX_1[@]} -ne 0 ]; then
-    $BINDIR/flib_server -c /dev/null -L f1_server.log -i ${ADDR[1]} \
+    $BINDIR/flib_server -c /dev/null -L ${OUTFILE}f1_server.log -i ${ADDR[1]} \
                     -o shm_server_f1 &
     SERVER_1_PID=$!
 fi
 
 # block till server is ready (remove if etcd is ready)
 sleep 1
-tail -f $BINDIR/f0_server.log | while read LOGLINE
+tail -f ${OUTFILE}f0_server.log | while read LOGLINE
 do
    [[ "${LOGLINE}" == *"flib server started and running"* ]] && pkill -P $$ tail
 done
-tail -f $BINDIR/f1_server.log | while read LOGLINE
+tail -f ${OUTFILE}f1_server.log | while read LOGLINE
 do
    [[ "${LOGLINE}" == *"flib server started and running"* ]] && pkill -P $$ tail
 done
@@ -171,13 +174,13 @@ FLESNET_PRIV_CFG+=("${FLESNET_CFG[@]}")
 CN_INDEX=(-c 0)
 NODES+=(-C 127.0.0.1)
 
-IN_0_CFG=(-L flesnet_in0.log --input-shm shm_server_f0)
-IN_1_CFG=(-L flesnet_in1.log --input-shm shm_server_f1)
+IN_0_CFG=(-L ${OUTFILE}flesnet_in0.log --input-shm shm_server_f0)
+IN_1_CFG=(-L ${OUTFILE}flesnet_in1.log --input-shm shm_server_f1)
 
 echo "Starting flesnet ..."
 
 # the compute node
-$BINDIR/flesnet -L flesnet_cn.log "${FLESNET_PRIV_CFG[@]}" "${NODES[@]}" "${CN_INDEX[@]}" &
+$BINDIR/flesnet -L ${OUTFILE}flesnet_cn.log "${FLESNET_PRIV_CFG[@]}" "${NODES[@]}" "${CN_INDEX[@]}" &
 FLESNET_CN_PID=$!
 
 # get flesnet group ID

diff --git a/contrib/record_data.in b/contrib/record_data.in
@@ -27,12 +27,15 @@ source $OUTDIR/RUN_STATUS
 ROOT_DIR="$(git rev-parse --show-toplevel)"
 $ROOT_DIR/contrib/flesnet-check
 
+DATE=`date -u "+%Y%m%d_%H%M"`
+
 # generate a new run number from status file
 ((RUNNR_VAR+=1))
 echo "RUNNR_VAR=$RUNNR_VAR" > $OUTDIR/RUN_STATUS
 printf -v RUNNR "%04d" $RUNNR_VAR
 
-DATAPATH=${OUTDIR}/${RUNNR}
+FILE_PREFIX=r${RUNNR}_${DATE}
+DATAPATH=${OUTDIR}/r${RUNNR}_${DATE}
 mkdir ${DATAPATH}
 
 RUNINFO=runinfo.txt
@@ -42,26 +45,26 @@ PLEDITOR=${PLEDITOR:-nano}
 echo
 echo log message editor is \"$PLEDITOR\"
 
-touch $DATAPATH/${RUNNR}_$RUNINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo put your start-of-run log message above ^^^ >> $DATAPATH/${RUNNR}_$RUNINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo You can add additional comments during the run by edditing: >> $DATAPATH/${RUNNR}_$RUNINFO
-echo $DATAPATH/${RUNNR}_$RUNINFO    >> $DATAPATH/${RUNNR}_$RUNINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo -n '# '                        >> $DATAPATH/${RUNNR}_$RUNINFO
-date                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNINFO
-echo '#'                            >> $DATAPATH/${RUNNR}_$RUNINFO
-echo '##  ' Run ${RUNNR} logbook    >> $DATAPATH/${RUNNR}_$RUNINFO
-echo '#'                            >> $DATAPATH/${RUNNR}_$RUNINFO
+touch $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo put your start-of-run log message above ^^^ >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo You can add additional comments during the run by edditing: >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo $DATAPATH/${FILE_PREFIX}_$RUNINFO    >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo -n '# '                        >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+date                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo '#'                            >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo '##  ' Run ${RUNNR} logbook    >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
+echo '#'                            >> $DATAPATH/${FILE_PREFIX}_$RUNINFO
 
-NLINES=`wc -c $DATAPATH/${RUNNR}_$RUNINFO | cut --delimiter=' ' -f 1`
+NLINES=`wc -c $DATAPATH/${FILE_PREFIX}_$RUNINFO | cut --delimiter=' ' -f 1`
 
-$PLEDITOR $DATAPATH/${RUNNR}_$RUNINFO
+$PLEDITOR $DATAPATH/${FILE_PREFIX}_$RUNINFO
 
-MLINES=`wc -c $DATAPATH/${RUNNR}_$RUNINFO | cut --delimiter=' ' -f 1`
+MLINES=`wc -c $DATAPATH/${FILE_PREFIX}_$RUNINFO | cut --delimiter=' ' -f 1`
 
 if [ $MLINES = $NLINES ]; then
   echo
@@ -76,33 +79,35 @@ fi
 # ---------------------------------------------------------
 
 # copy settings
-cp ./readout ${DATAPATH}/${RUNNR}_readout
-chmod -x ${DATAPATH}/${RUNNR}_readout
-bzip2 ${DATAPATH}/${RUNNR}_readout
+cp ./readout ${DATAPATH}/${FILE_PREFIX}_readout
+chmod -x ${DATAPATH}/${FILE_PREFIX}_readout
+bzip2 ${DATAPATH}/${FILE_PREFIX}_readout
 
 # start readout
-./readout rec ${DATAPATH}/${RUNNR}
+./readout rec ${DATAPATH}/${FILE_PREFIX}_
 
+tar -zcf ${DATAPATH}/${FILE_PREFIX}_logs.tar.gz ${DATAPATH}/${FILE_PREFIX}_*.log \
+    && rm -f ${DATAPATH}/${FILE_PREFIX}_*.log
 # ---------------------------------------------------------
 
 echo
-touch $DATAPATH/${RUNNR}_$RUNENDINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo put your end-of-run log message above ^^^ >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo -n '# '                        >> $DATAPATH/${RUNNR}_$RUNENDINFO
-date                                >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo                                >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo '#'                            >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo '##  ' Run ${RUNNR} logbook    >> $DATAPATH/${RUNNR}_$RUNENDINFO
-echo '#'                            >> $DATAPATH/${RUNNR}_$RUNENDINFO
-
-NLINES=`wc -c $DATAPATH/${RUNNR}_$RUNENDINFO | cut --delimiter=' ' -f 1`
-
-$PLEDITOR $DATAPATH/${RUNNR}_$RUNENDINFO
-
-MLINES=`wc -c $DATAPATH/${RUNNR}_$RUNENDINFO | cut --delimiter=' ' -f 1`
+touch $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo put your end-of-run log message above ^^^ >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo -n '# '                        >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+date                                >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo                                >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo '#'                            >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo '##  ' Run ${RUNNR} logbook    >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+echo '#'                            >> $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+
+NLINES=`wc -c $DATAPATH/${FILE_PREFIX}_$RUNENDINFO | cut --delimiter=' ' -f 1`
+
+$PLEDITOR $DATAPATH/${FILE_PREFIX}_$RUNENDINFO
+
+MLINES=`wc -c $DATAPATH/${FILE_PREFIX}_$RUNENDINFO | cut --delimiter=' ' -f 1`
 
 if [ $MLINES = $NLINES ]; then
   echo