Lock cs_vSend and cs_inventory in a consistent order even in TRY

TheBlueMatt · TheBlueMatt · commit fd13eca147be · 2017-02-02T20:03:46.000-05:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()
                 {
                     bool fDelete = false;
                     {
-                        TRY_LOCK(pnode->cs_vSend, lockSend);
-                        if (lockSend)
+                        TRY_LOCK(pnode->cs_inventory, lockInv);
+                        if (lockInv)
                         {
-                                TRY_LOCK(pnode->cs_inventory, lockInv);
-                                if (lockInv)
-                                    fDelete = true;
+                            TRY_LOCK(pnode->cs_vSend, lockSend);
+                            if (lockSend) {
+                                fDelete = true;
+                            }
                         }
                     }
                     if (fDelete)

Original file line number	Diff line number	Diff line change
`@@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()`
`1070`	`1070`	`{`
`1071`	`1071`	`bool fDelete = false;`
`1072`	`1072`	`{`
`1073`		`- TRY_LOCK(pnode->cs_vSend, lockSend);`
`1074`		`- if (lockSend)`
	`1073`	`+ TRY_LOCK(pnode->cs_inventory, lockInv);`
	`1074`	`+ if (lockInv)`
`1075`	`1075`	`{`
`1076`		`- TRY_LOCK(pnode->cs_inventory, lockInv);`
`1077`		`- if (lockInv)`
`1078`		`- fDelete = true;`
	`1076`	`+ TRY_LOCK(pnode->cs_vSend, lockSend);`
	`1077`	`+ if (lockSend) {`
	`1078`	`+ fDelete = true;`
	`1079`	`+ }`
`1079`	`1080`	`}`
`1080`	`1081`	`}`
`1081`	`1082`	`if (fDelete)`