diff options
Diffstat (limited to 'tools/guest-diag/gzdoom_pbuf_run.sh')
| -rwxr-xr-x | tools/guest-diag/gzdoom_pbuf_run.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/guest-diag/gzdoom_pbuf_run.sh b/tools/guest-diag/gzdoom_pbuf_run.sh index 47817b7..49c5c96 100755 --- a/tools/guest-diag/gzdoom_pbuf_run.sh +++ b/tools/guest-diag/gzdoom_pbuf_run.sh @@ -25,18 +25,20 @@ set -u GZDOOM_BIN="${GZDOOM_BIN:-/opt/gzdoom/gzdoom}" WAD="${WAD:-/usr/share/games/doom/freedoom2.wad}" -GZCAP="${GZCAP:-/tmp/gzframes.bin}" +GZCAP="${GZCAP:-/dev/shm/gzframes.bin}" GZPBUF_W="${GZPBUF_W:-640}" +GZCAP_MAXF="${GZCAP_MAXF:-1800}" GZPBUF_H="${GZPBUF_H:-480}" GZLOG="${GZLOG:-/tmp/gzdoom-pbuf.log}" TIMEOUT="${TIMEOUT:-300}" GZ_ARGS="${GZ_ARGS:-}" GZ_DETACH="${GZ_DETACH:-0}" +GZ_RCFILE="${GZ_RCFILE:-/tmp/gz-rc}" DISPLAY="${DISPLAY:-:0}" SDL_VIDEODRIVER="${SDL_VIDEODRIVER:-offscreen}" LD_PRELOAD="${LD_PRELOAD:-/tmp/sdl_cap.so /tmp/gz_pbuf.so}" -export DISPLAY SDL_VIDEODRIVER LD_PRELOAD GZCAP GZPBUF_W GZPBUF_H +export DISPLAY SDL_VIDEODRIVER LD_PRELOAD GZCAP GZCAP_MAXF GZPBUF_W GZPBUF_H GZ_RCFILE if [ ! -x "$GZDOOM_BIN" ]; then echo "gzdoom_pbuf_run: GZDOOM_BIN not executable: $GZDOOM_BIN" >&2 @@ -65,6 +67,8 @@ CMD=( -nomusic +vid_activeinbackground 1 +vid_maxfps 60 + +set gl_pipeline_depth 2 + +set gl_finishbeforeswap 0 +map MAP01 ) if [ -n "$GZ_ARGS" ]; then @@ -74,14 +78,17 @@ fi echo "gzdoom_pbuf_run: DISPLAY=$DISPLAY SDL_VIDEODRIVER=$SDL_VIDEODRIVER" echo "gzdoom_pbuf_run: LD_PRELOAD=$LD_PRELOAD" -echo "gzdoom_pbuf_run: GZCAP=$GZCAP GZPBUF_W=$GZPBUF_W GZPBUF_H=$GZPBUF_H" +echo "gzdoom_pbuf_run: GZCAP=$GZCAP GZCAP_MAXF=$GZCAP_MAXF GZPBUF_W=$GZPBUF_W GZPBUF_H=$GZPBUF_H" echo "gzdoom_pbuf_run: LOG=$GZLOG TIMEOUT=$TIMEOUT DETACH=$GZ_DETACH" printf 'CMD:' printf ' %q' "${CMD[@]}" echo if [ "$GZ_DETACH" = "1" ]; then - setsid nohup timeout -k 5 "$TIMEOUT" "${CMD[@]}" > "$GZLOG" 2>&1 < /dev/null & + RCF="${GZ_RCFILE:-/tmp/gz-rc}" + rm -f "$RCF" + setsid nohup bash -c 'timeout -k 5 "$0" "${@:1}"; echo $? > "$GZ_RCFILE"' \ + "$TIMEOUT" "${CMD[@]}" > "$GZLOG" 2>&1 < /dev/null & echo "PID=$!" echo "LOG=$GZLOG" exit 0 |
