Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add locking and traps for gtags_update.sh, and really do locking #361

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add locking and traps for gtags_update.sh, and really do locking #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb1db0c
Add locking to the gtags update script, like ctags has already
smemsh Jun 4, 2024
0a6a1a2
Add error trap for gtags that removes temporary files on early quit
smemsh Jun 6, 2024
668ef5a
Quote the arg given to shell command, in case it has spaces, etc
smemsh Jun 6, 2024
f6a5507
Set noclobber in update scripts, otherwise lock file is useless
smemsh Jun 7, 2024
5cc72ea
Do lock before trap to avoid removing prior run cscope file
smemsh Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 21 additions & 1 deletion plat/unix/update_gtags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ set -e
PROG_NAME=$0
GTAGS_EXE=gtags
FILE_LIST_CMD=
TAGS_FILES="GTAGS GPATH GRTAGS"
GTAGS_PATHARG="${!#}" # last arg is always the path
LOCKFILE="$GTAGS_PATHARG/gtags.lock"

ShowUsage() {
echo "Usage:"
Expand All @@ -30,7 +33,7 @@ while [[ $# -ne 0 ]]; do
shift 2
;;
*)
GTAGS_ARGS="$GTAGS_ARGS $1"
GTAGS_ARGS="$GTAGS_ARGS $(printf %q "$1")"
shift
;;
esac
Expand All @@ -42,7 +45,24 @@ else
CMD="$GTAGS_EXE $GTAGS_ARGS"
fi

echo "Locking gtags files..."
set -C
echo $$ > "$LOCKFILE"

# Remove lock and any partial files on script exit
trap '\
errorcode=$?; \
for f in $TAGS_FILES; \
do f="$GTAGS_PATHARG/$f"; test -s "$f" && continue || rm -f "$f"; done; \
rm -f "$LOCKFILE"; \
exit $errorcode; \
' INT QUIT TERM EXIT

echo "Running gtags:"
echo "$CMD"
eval "$CMD"

echo "Unlocking gtags file..."
rm -f "$LOCKFILE"

echo "Done."
1 change: 1 addition & 0 deletions plat/unix/update_pyscopedb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ if [ "$1" != "" ]; then
fi

echo "Locking pycscope DB file..."
set -C
echo $$ > "$DB_FILE.lock"

# Remove lock and temp file if script is stopped unexpectedly.
Expand Down
7 changes: 4 additions & 3 deletions plat/unix/update_scopedb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ if [ "$1" != "" ]; then
exit 1
fi

echo "Locking cscope DB file..."
echo $$ > "$DB_FILE.lock"

# Remove lock and temp file if script is stopped unexpectedly.
CleanUp() {
rm -f "$DB_FILE.lock" "$DB_FILE.files" "$DB_FILE.temp"
Expand All @@ -65,6 +62,10 @@ CleanUp() {
fi
}

echo "Locking cscope DB file..."
set -C
echo $$ > "$DB_FILE.lock"

trap CleanUp INT QUIT TERM EXIT

PREVIOUS_DIR=$(pwd)
Expand Down
1 change: 1 addition & 0 deletions plat/unix/update_tags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ if [ "$1" != "" ]; then
fi

echo "Locking tags file..."
set -C
echo $$ > "$TAGS_FILE.lock"

# Remove lock and temp file if script is stopped unexpectedly.
Expand Down