diff --git a/9p b/9p index 9f5286c..8d5be72 160000 --- a/9p +++ b/9p @@ -1 +1 @@ -Subproject commit 9f5286c8b2f974906eb5c0dfee5bebee270a5bb5 +Subproject commit 8d5be7212fb9abcf540c946b4690831ac226fd3e diff --git a/core b/core index 8f856ea..10dd4ee 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8f856ea186d558597b5d8d3b0a2320ae89d73065 +Subproject commit 10dd4ee82fa0b0aeb1bd3101c21b13e856b9b142 diff --git a/scripts/b/cleanup b/scripts/s/cleanup similarity index 74% rename from scripts/b/cleanup rename to scripts/s/cleanup index 5a54e53..516fae1 100755 --- a/scripts/b/cleanup +++ b/scripts/s/cleanup @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# b/cleanup: remove all batch jobs with state "done". +# s/cleanup: remove all batch jobs with state "done". set -euo pipefail OLLIE=${OLLIE:-$HOME/mnt/ollie} -for job in "$OLLIE"/b/*/; do +for job in "$OLLIE"/s/*/; do [ -d "$job" ] || continue state=$(cat "$job/state" 2>/dev/null | tr -d '[:space:]') || continue case "$state" in diff --git a/scripts/b/job b/scripts/s/job similarity index 96% rename from scripts/b/job rename to scripts/s/job index 0269933..aea66df 100755 --- a/scripts/b/job +++ b/scripts/s/job @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# b/job: non-interactive ollie query via b/ namespace. +# s/job: non-interactive ollie query via s/ namespace. # # Usage: oq [flags] [prompt...] # echo "prompt" | oq [flags] @@ -92,7 +92,7 @@ cwd=${cwd:-$(pwd)} printf 'parallel=%s\n' "$parallel" printf -- '---\n' printf '%s\n' "$prompt" -} > "$MOUNT/b/new" || die "failed to submit job" +} > "$MOUNT/s/new" || die "failed to submit job" if [ "$bg" -eq 1 ]; then for i in $(seq 0 $((parallel - 1))); do @@ -109,7 +109,7 @@ if [ "$parallel" -gt 1 ]; then pids=() for i in $(seq 0 $((parallel - 1))); do id="${name}-${i}" - B="$MOUNT/b/$id" + B="$MOUNT/s/$id" ( exec 3< "$B/statewait" while true; do @@ -128,7 +128,7 @@ if [ "$parallel" -gt 1 ]; then echo 1 > "$abort" for j in $(seq 0 $((parallel - 1))); do jid="${name}-${j}" - [ "$jid" != "$id" ] && rm -r "$MOUNT/b/$jid" 2>/dev/null || true + [ "$jid" != "$id" ] && rm -r "$MOUNT/s/$jid" 2>/dev/null || true done fi [ "$keep" -eq 0 ] && rm -r "$B" 2>/dev/null || true @@ -153,7 +153,7 @@ if [ "$parallel" -gt 1 ]; then for pid in "${pids[@]}"; do wait "$pid" || rc=1; done else id="${name}-0" - B="$MOUNT/b/$id" + B="$MOUNT/s/$id" exec 3< "$B/statewait" while true; do diff --git a/scripts/b/q b/scripts/s/q similarity index 93% rename from scripts/b/q rename to scripts/s/q index ab21dff..5c723df 100644 --- a/scripts/b/q +++ b/scripts/s/q @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# b/q: foreground one-shot query; output goes to stdout. +# s/q: foreground one-shot query; output goes to stdout. for _arg; do [ "$_arg" = "-help" ] && cat <<'EOF' && exit 0 usage: q [flags] [prompt...] diff --git a/scripts/b/sched b/scripts/s/sched similarity index 86% rename from scripts/b/sched rename to scripts/s/sched index f823454..d10bf68 100644 --- a/scripts/b/sched +++ b/scripts/s/sched @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# b/sched: submit a background job; prints the b/ path for each job. +# s/sched: submit a background job; prints the b/ path for each job. for _arg; do [ "$_arg" = "-help" ] && cat <<'EOF' && exit 0 usage: sched [flags] [prompt...] @@ -22,5 +22,5 @@ if [ $# -eq 0 ] && [ -t 0 ]; then fi OLLIE=${OLLIE:-$HOME/mnt/ollie} "${0%/*}/job" -bg "$@" | while IFS= read -r id; do - [ -n "$id" ] && printf '%s/b/%s\n' "$OLLIE" "$id" + [ -n "$id" ] && printf '%s/s/%s\n' "$OLLIE" "$id" done diff --git a/scripts/u/optimize b/scripts/u/optimize index ea2d08c..51fffcf 100755 --- a/scripts/u/optimize +++ b/scripts/u/optimize @@ -47,7 +47,7 @@ fi [ -z "$prompt" ] && { printf 'optimize: empty prompt\n' >&2; exit 1; } -Q="${0%/*}/../b/q" +Q="${0%/*}/../s/q" c_flags=() j_flags=()