Fix mistakenly swapped "previous" and "current" lock orders

hebasto · hebasto · commit 35599344c886 · 2020-06-22T18:12:26.000+03:00
diff --git a/src/sync.cpp b/src/sync.cpp
@@ -105,7 +105,7 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac
 {
     LogPrintf("POTENTIAL DEADLOCK DETECTED\n");
     LogPrintf("Previous lock order was:\n");
-    for (const LockStackItem& i : s2) {
+    for (const LockStackItem& i : s1) {
         if (i.first == mismatch.first) {
             LogPrintf(" (1)"); /* Continued */
         }
@@ -115,7 +115,7 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac
         LogPrintf(" %s\n", i.second.ToString());
     }
     LogPrintf("Current lock order is:\n");
-    for (const LockStackItem& i : s1) {
+    for (const LockStackItem& i : s2) {
         if (i.first == mismatch.first) {
             LogPrintf(" (1)"); /* Continued */
         }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac`
`105`	`105`	`{`
`106`	`106`	`LogPrintf("POTENTIAL DEADLOCK DETECTED\n");`
`107`	`107`	`LogPrintf("Previous lock order was:\n");`
`108`		`- for (const LockStackItem& i : s2) {`
	`108`	`+ for (const LockStackItem& i : s1) {`
`109`	`109`	`if (i.first == mismatch.first) {`
`110`	`110`	`LogPrintf(" (1)"); /* Continued */`
`111`	`111`	`}`
`@@ -115,7 +115,7 @@ static void potential_deadlock_detected(const LockPair& mismatch, const LockStac`
`115`	`115`	`LogPrintf(" %s\n", i.second.ToString());`
`116`	`116`	`}`
`117`	`117`	`LogPrintf("Current lock order is:\n");`
`118`		`- for (const LockStackItem& i : s1) {`
	`118`	`+ for (const LockStackItem& i : s2) {`
`119`	`119`	`if (i.first == mismatch.first) {`
`120`	`120`	`LogPrintf(" (1)"); /* Continued */`
`121`	`121`	`}`