]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
WorkQueue: The variable name is corrected.
authorSomnath Roy <somnath.roy@sandisk.com>
Sat, 31 May 2014 02:07:10 +0000 (19:07 -0700)
committerSomnath Roy <somnath.roy@sandisk.com>
Sat, 31 May 2014 02:07:10 +0000 (19:07 -0700)
Modified the variable name from shardedpol_cond->shardedpool_cond

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
src/common/WorkQueue.cc
src/common/WorkQueue.h

index 52508324dd9ab732dffcebd116a972753dbb2f0c..11cb526dc4ed260feb54afcfe7a9a55b515faff4 100644 (file)
@@ -275,7 +275,7 @@ void ShardedThreadPool::shardedthreadpool_worker(uint32_t thread_index)
       wait_cond.Signal();
       while(pause_threads.read()) {
        cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-       shardedpol_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
+       shardedpool_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
       }
       --num_paused;
       shardedpool_lock.Unlock();
@@ -287,7 +287,7 @@ void ShardedThreadPool::shardedthreadpool_worker(uint32_t thread_index)
         wait_cond.Signal();
         while (drain_threads.read()) {
           cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-          shardedpol_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
+          shardedpool_cond.WaitInterval(cct, shardedpool_lock, utime_t(2, 0));
         }
         --num_drained;
       }
@@ -374,7 +374,7 @@ void ShardedThreadPool::unpause()
   ldout(cct,10) << "unpause" << dendl;
   shardedpool_lock.Lock();
   pause_threads.set(0);
-  shardedpol_cond.Signal();
+  shardedpool_cond.Signal();
   shardedpool_lock.Unlock();
   ldout(cct,10) << "unpaused" << dendl;
 }
@@ -390,6 +390,7 @@ void ShardedThreadPool::drain()
     wait_cond.Wait(shardedpool_lock);
   }
   drain_threads.set(0);
+  shardedpool_cond.Signal();
   shardedpool_lock.Unlock();
   ldout(cct,10) << "drained" << dendl;
 }
index b27ff847895ca7af78151261407148d3a014c280..8288c1890fc3595bd74bd92bc2fa93c142382533 100644 (file)
@@ -435,7 +435,7 @@ class ShardedThreadPool {
   string name;
   string lockname;
   Mutex shardedpool_lock;
-  Cond shardedpol_cond;
+  Cond shardedpool_cond;
   Cond wait_cond;
   uint32_t num_threads;
   atomic_t stop_threads;