TestFileStoreState: Fix issues affecting proper behavior when inherited.

Fix wait_for_ready() and make the C_OnFinished class' member variables
protected instead of private (to allow proper inheritance).

Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>

diff --git a/src/test/filestore/TestFileStoreState.h b/src/test/filestore/TestFileStoreState.h
index 12eb788789508f72b963a5ccc661695779873f04..64914a06e99181021f917808eff3cbccbd0a801d 100644 (file)
--- a/src/test/filestore/TestFileStoreState.h
+++ b/src/test/filestore/TestFileStoreState.h
@@ -64,6 +64,7 @@ public:
   Cond m_finished_cond;
 
   void wait_for_ready() {
+    Mutex::Locker locker(m_finished_lock);
     while ((m_max_in_flight > 0) && (m_in_flight >= m_max_in_flight))
       m_finished_cond.Wait(m_finished_lock);
   }
@@ -110,10 +111,11 @@ public:
   coll_entry_t *coll_create(int id);
 
   class C_OnFinished: public Context {
+   protected:
     TestFileStoreState *m_state;
     ObjectStore::Transaction *m_tx;
 
-  public:
+   public:
     C_OnFinished(TestFileStoreState *state,
         ObjectStore::Transaction *t) : m_state(state), m_tx(t) { }