Merge pull request #876 from nodegit/fix-mutex-cleanup-race

johnhaley81 · johnhaley81 · commit 69d83c05f996 · 2016-01-21T14:54:17.000-07:00
Decrement the mutex use count after we've unlocked them.
diff --git a/generate/templates/manual/src/lock_master.cc b/generate/templates/manual/src/lock_master.cc
@@ -188,9 +188,13 @@ void LockMasterImpl::Lock(bool acquireMutexes) {
 }
 
 void LockMasterImpl::Unlock(bool releaseMutexes) {
-  std::vector<uv_mutex_t *> objectMutexes = GetMutexes(releaseMutexes * -1);
+  // Get the mutexes but don't decrement their use count until after we've
+  // unlocked them all.
+  std::vector<uv_mutex_t *> objectMutexes = GetMutexes(0);
 
   std::for_each(objectMutexes.begin(), objectMutexes.end(), uv_mutex_unlock);
+
+  GetMutexes(releaseMutexes * -1);
 }
 
 void LockMasterImpl::CleanupMutexes() {

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,13 @@ void LockMasterImpl::Lock(bool acquireMutexes) {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`void LockMasterImpl::Unlock(bool releaseMutexes) {`
`191`		`- std::vector<uv_mutex_t > objectMutexes = GetMutexes(releaseMutexes -1);`
	`191`	`+ // Get the mutexes but don't decrement their use count until after we've`
	`192`	`+ // unlocked them all.`
	`193`	`+ std::vector<uv_mutex_t *> objectMutexes = GetMutexes(0);`
`192`	`194`
`193`	`195`	`std::for_each(objectMutexes.begin(), objectMutexes.end(), uv_mutex_unlock);`
	`196`	`+`
	`197`	`+ GetMutexes(releaseMutexes * -1);`
`194`	`198`	`}`
`195`	`199`
`196`	`200`	`void LockMasterImpl::CleanupMutexes() {`