include/{mutex,wmutex}: Wait forever if timeout is 0 or missing

The mutex_lock() and wmutex_lock() functions return immediately if
the timeout is set to 0 or is missing. However, to be compatible with
the previous timeout-less implementations, the functions must wait
forever if no timeout was specified.
This commit changes the two functions so they wait forever if the
timeout is 0 or missing.

diff --git a/include/mutex.sh b/include/mutex.sh
index 0bb71c2808a4475dc2e90b10e4ce51a6033d5406..596a931ec5df95738ab819875076ed2de5aa813e 100644 (file)
--- a/include/mutex.sh
+++ b/include/mutex.sh
@@ -23,8 +23,12 @@ mutex_lock() {
        local lock="$1"
        local -i timeout="$2"
 
+       local -i remaining
+
+       remaining="$timeout"
+
        while ! mutex_trylock "$lock"; do
-               if (( --timeout < 0 )); then
+               if (( timeout != 0 && --remaining < 0 )); then
                        return 1
                fi
 

diff --git a/include/wmutex.sh b/include/wmutex.sh
index d4bcf99be8ee5b4effbfc26b7e3695cbb49605f9..37f508ecf0669b1a9c4620f834017e8f62a18166 100644 (file)
--- a/include/wmutex.sh
+++ b/include/wmutex.sh
@@ -23,8 +23,12 @@ wmutex_lock() {
        local lock="$1"
        local -i timeout="$2"
 
+       local -i remaining
+
+       remaining="$timeout"
+
        while ! wmutex_trylock "$lock"; do
-               if (( --timeout < 0 )); then
+               if (( timeout != 0 && --remaining < 0 )); then
                        return 1
                fi