mirror of
				https://github.com/tmux-plugins/tmux-continuum.git
				synced 2025-11-04 00:07:32 +00:00 
			
		
		
		
	continuum_save.sh: Improvements to locking code
* moved the locking to a separate function "acquire_lock" * changed $[ ] to $(( )), for consistency with the rest of the file * taking the lock only after checking all other preconditions (they are non-mutating and thread-safe)
This commit is contained in:
		@@ -34,22 +34,27 @@ fetch_and_run_tmux_resurrect_save_script() {
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main() {
 | 
			
		||||
acquire_lock() {
 | 
			
		||||
	# Sometimes tmux starts multiple saves in parallel. We want only one
 | 
			
		||||
	# save to be running, otherwise we can get corrupted saved state.
 | 
			
		||||
	local lockdir_prefix="/tmp/tmux-continuum-$(current_tmux_server_pid)-lock-"
 | 
			
		||||
	# The following implements a lock that auto-expires after 100...200s.
 | 
			
		||||
	local lock_generation=$[ `date +%s` / 100 ]
 | 
			
		||||
	local lock_generation=$((`date +%s` / 100))
 | 
			
		||||
	local lockdir1="${lockdir_prefix}${lock_generation}"
 | 
			
		||||
	local lockdir2="${lockdir_prefix}$[ $lock_generation + 1 ]"
 | 
			
		||||
	local lockdir2="${lockdir_prefix}$(($lock_generation + 1))"
 | 
			
		||||
	if mkdir "$lockdir1"; then
 | 
			
		||||
		trap "rmdir "$lockdir1"" EXIT
 | 
			
		||||
		if mkdir "$lockdir2"; then
 | 
			
		||||
			trap "rmdir "$lockdir1" "$lockdir2"" EXIT
 | 
			
		||||
			if supported_tmux_version_ok && auto_save_not_disabled && enough_time_since_last_run_passed; then
 | 
			
		||||
			return 0
 | 
			
		||||
		fi
 | 
			
		||||
	fi
 | 
			
		||||
	return 1  # Someone else has the lock.
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main() {
 | 
			
		||||
	if supported_tmux_version_ok && auto_save_not_disabled && enough_time_since_last_run_passed && acquire_lock; then
 | 
			
		||||
		fetch_and_run_tmux_resurrect_save_script
 | 
			
		||||
	fi
 | 
			
		||||
		fi
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
main
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user