Changeset 483 for branches/confman-1.9/confmanlib.sh.in

Timestamp:

11/11/2009 14:19:10 (3 years ago)

Author:

ccowart

Message:

Merging new locking idiom from trunk.

Resolves #87

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confmanlib.sh.in (modified) (4 diffs)

branches/confman-1.9/confmanlib.sh.in

@@ -131 +131 @@
 
 function conf_lock_wcopy {
+    local locktype
     conf_require_wcopy
-    ${LOCK} lock $$ $(conf_wcopy_lockfile) || exit 1
+
+    # If this process already has a lock on the wcopy
+    if conf_wcopy_is_locked; then
+        locktype="RECURSIVE"
+    else
+        locktype="ORIGINAL"
+    fi
+
+    ${LOCK} lock $$ $(conf_wcopy_lockfile) || die
     WCOPY_DIRTY="true"
+    echo $locktype
 }
 
 function conf_unlock_wcopy {
-    local recursive_lock="$1"
-
-    # Don't release the lock if it was grabbed recursively
-    [ -n "$recursive_lock" ] && [ "$recursive_lock" = "1" ] && return
-
-    ${LOCK} unlock $$ $(conf_wcopy_lockfile)
+    local locktype="$1"
+
+    if [ "$locktype" = "RECURSIVE" ] ; then
+        return 0
+    elif [ "$locktype" = "ORIGINAL" ] ; then
+        ${LOCK} unlock $$ $(conf_wcopy_lockfile)
+        return $?
+    else
+        echo "Invalid lock type in conf_unlock_wcopy" >&4
+        die
+    fi
 }
 
@@ -150 +165 @@
 
 function conf_lock_system {
-    ${SUDO} ${LOCK} lock $$ "$LOCKFILE" || exit 1
+    local locktype
+
+    # If this process already has a lock on the wcopy
+    if conf_system_is_locked; then
+        locktype="RECURSIVE"
+    else
+        locktype="ORIGINAL"
+    fi
+
+    ${SUDO} ${LOCK} lock $$ "$LOCKFILE" || die
+    echo $locktype
 }
 
 function conf_unlock_system {
-    ${SUDO} ${LOCK} unlock $$ "$LOCKFILE"
+    local locktype="$1"
+
+    if [ "$locktype" = "RECURSIVE" ] ; then
+        return 0
+    elif [ "$locktype" = "ORIGINAL" ] ; then
+        ${SUDO} ${LOCK} unlock $$ "$LOCKFILE"
+        return $?
+    else
+        echo "Invalid lock type in conf_unlock_system" >&2
+        die
+    fi
 }
 
 function conf_system_is_locked {
     ${LOCK} haslock $$ "$LOCKFILE"
+}
+
+function conf_lock_is_recursive {
+    local locktype="$1"
+    case "$locktype" in
+        ORIGINAL)   return 1;;
+        RECURSIVE)  return 0;;
+        *)          echo "Invalid lock type in conf_lock_is_recursive" >&2
+                    die
+                    ;;
+    esac
 }
 
@@ -1058 +1104 @@
     echo "Received a signal. Exiting cleanly." | conf_logger
         echo "Please wait until I finish cleaning up after you." >&4
-    conf_cleanExit
+    conf_cleanExit 1
 }
 
@@ -1070 +1116 @@
 
     conf_debug "Removing any system or working copy locks..." >&4
-    conf_wcopy_is_locked && conf_unlock_wcopy
-    conf_system_is_locked && conf_unlock_system
+    conf_wcopy_is_locked && conf_unlock_wcopy ORIGINAL
+    conf_system_is_locked && conf_unlock_system ORIGINAL
         
         # And this clears any locks we may have created on our working copy: