Merge 1857756 into af441fc

GevArakelyan · web-flow · commit 8226d5c726cd · 2018-08-24T19:51:23.000Z
diff --git a/src/thread_manager.h b/src/thread_manager.h
@@ -22,10 +22,9 @@ class ThreadManager {
     return start_stop_barrier_.wait();
   }
 
-  void NotifyThreadComplete() EXCLUDES(end_cond_mutex_) {
+  void NotifyThreadComplete() {
     start_stop_barrier_.removeThread();
     if (--alive_threads_ == 0) {
-      MutexLock lock(end_cond_mutex_);
       end_condition_.notify_all();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,9 @@ class ThreadManager {`
`22`	`22`	`return start_stop_barrier_.wait();`
`23`	`23`	`}`
`24`	`24`
`25`		`- void NotifyThreadComplete() EXCLUDES(end_cond_mutex_) {`
	`25`	`+ void NotifyThreadComplete() {`
`26`	`26`	`start_stop_barrier_.removeThread();`
`27`	`27`	`if (--alive_threads_ == 0) {`
`28`		`- MutexLock lock(end_cond_mutex_);`
`29`	`28`	`end_condition_.notify_all();`
`30`	`29`	`}`
`31`	`30`	`}`