rename cond_ to notEmpty_.

chenshuo · chenshuo · commit dc40726e39d2 · 2011-06-23T16:03:18.000+08:00
diff --git a/thread/BlockingQueue.h b/thread/BlockingQueue.h
@@ -24,7 +24,7 @@ class BlockingQueue : boost::noncopyable
  public:
   BlockingQueue()
     : mutex_(),
-      cond_(mutex_),
+      notEmpty_(mutex_),
       queue_()
   {
   }
@@ -33,15 +33,15 @@ class BlockingQueue : boost::noncopyable
   {
     MutexLockGuard lock(mutex_);
     queue_.push_back(x);
-    cond_.notify();
+    notEmpty_.notify();
   }
 
   T take()
   {
     MutexLockGuard lock(mutex_);
     while (queue_.empty())
     {
-      cond_.wait();
+      notEmpty_.wait();
     }
     assert(!queue_.empty());
     T front(queue_.front());
@@ -57,7 +57,7 @@ class BlockingQueue : boost::noncopyable
 
  private:
   mutable MutexLock mutex_;
-  Condition         cond_;
+  Condition         notEmpty_;
   std::deque<T>     queue_;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class BlockingQueue : boost::noncopyable`
`24`	`24`	`public:`
`25`	`25`	`BlockingQueue()`
`26`	`26`	`: mutex_(),`
`27`		`- cond_(mutex_),`
	`27`	`+ notEmpty_(mutex_),`
`28`	`28`	`queue_()`
`29`	`29`	`{`
`30`	`30`	`}`
`@@ -33,15 +33,15 @@ class BlockingQueue : boost::noncopyable`
`33`	`33`	`{`
`34`	`34`	`MutexLockGuard lock(mutex_);`
`35`	`35`	`queue_.push_back(x);`
`36`		`- cond_.notify();`
	`36`	`+ notEmpty_.notify();`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`T take()`
`40`	`40`	`{`
`41`	`41`	`MutexLockGuard lock(mutex_);`
`42`	`42`	`while (queue_.empty())`
`43`	`43`	`{`
`44`		`- cond_.wait();`
	`44`	`+ notEmpty_.wait();`
`45`	`45`	`}`
`46`	`46`	`assert(!queue_.empty());`
`47`	`47`	`T front(queue_.front());`
`@@ -57,7 +57,7 @@ class BlockingQueue : boost::noncopyable`
`57`	`57`
`58`	`58`	`private:`
`59`	`59`	`mutable MutexLock mutex_;`
`60`		`- Condition cond_;`
	`60`	`+ Condition notEmpty_;`
`61`	`61`	`std::deque<T> queue_;`
`62`	`62`	`};`
`63`	`63`