fix bug

bg5sbk · bg5sbk · commit fdc1d8f671a0 · 2014-12-04T15:08:49.000+08:00
diff --git a/sync.go b/sync.go
@@ -71,6 +71,7 @@ func (m *mointor) wait() int32 {
 
 func (m *mointor) verify(holder int32, holderLink []int32) {
 	if m.holder != 0 {
+		// deadlock detected
 		if m.holder == holder {
 			// dump stack
 			stackBuf := new(bytes.Buffer)
@@ -89,8 +90,9 @@ func (m *mointor) verify(holder int32, holderLink []int32) {
 			}
 			panic(buf.String())
 		}
+		// the lock holder is waiting for another lock
 		if waitTarget, exists := waitTargets[m.holder]; exists {
-			waitTarget.verify(holder, append(holderLink, waitTarget.holder))
+			waitTarget.verify(holder, append(holderLink, m.holder))
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func (m *mointor) wait() int32 {`
`71`	`71`
`72`	`72`	`func (m *mointor) verify(holder int32, holderLink []int32) {`
`73`	`73`	`if m.holder != 0 {`
	`74`	`+ // deadlock detected`
`74`	`75`	`if m.holder == holder {`
`75`	`76`	`// dump stack`
`76`	`77`	`stackBuf := new(bytes.Buffer)`
`@@ -89,8 +90,9 @@ func (m *mointor) verify(holder int32, holderLink []int32) {`
`89`	`90`	`}`
`90`	`91`	`panic(buf.String())`
`91`	`92`	`}`
	`93`	`+ // the lock holder is waiting for another lock`
`92`	`94`	`if waitTarget, exists := waitTargets[m.holder]; exists {`
`93`		`- waitTarget.verify(holder, append(holderLink, waitTarget.holder))`
	`95`	`+ waitTarget.verify(holder, append(holderLink, m.holder))`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`	`}`