summaryrefslogtreecommitdiffstats
path: root/LOCKS
diff options
context:
space:
mode:
authorSimon Rettberg2013-11-12 16:39:04 +0100
committerSimon Rettberg2013-11-12 16:39:04 +0100
commit080d2c7799e7d2e3a1378bc94c7d530542a75539 (patch)
tree4f1f8ce5c697f961dbc53a27669a57297f5e8ea1 /LOCKS
parent[SERVER] Fix embarrassing deadlock when deleting old images (diff)
parenttiny fix (diff)
downloaddnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.gz
dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.tar.xz
dnbd3-080d2c7799e7d2e3a1378bc94c7d530542a75539.zip
Merge branch 'simon' of dnbd3:dnbd3 into simon
Conflicts: src/server/altservers.c
Diffstat (limited to 'LOCKS')
-rw-r--r--LOCKS6
1 files changed, 4 insertions, 2 deletions
diff --git a/LOCKS b/LOCKS
index 5de521a..a108f1d 100644
--- a/LOCKS
+++ b/LOCKS
@@ -17,10 +17,12 @@ remoteCloneLock
_images_lock
_images[].lock
uplink.queueLock
-_alts_lock
+pendingLockProduce
+pendingLockConsume
+altServersLock
client.sendMutex
-If you need to lock multiple clients at once,
+If you need to lock multiple clients/images/... at once,
lock the client with the lowest array index first.
If the program logic would require to aquire the