os: instrument submit lock, apply lock, queue_lock, write_lock

Adds Mutex perfcounter tracking to mutexes of interest.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h
index cad5dc7e3714b575f910225bc4f22e1048696ae7..5b3e6ee9544ac9b1ffbac0f876fcb4f519f6c293 100644 (file)
--- a/src/os/FileJournal.h
+++ b/src/os/FileJournal.h
@@ -292,7 +292,7 @@ private:
  public:
   FileJournal(uuid_d fsid, Finisher *fin, Cond *sync_cond, const char *f, bool dio=false, bool ai=true) : 
     Journal(fsid, fin, sync_cond),
-    queue_lock("FileJournal::queue_lock"),
+    queue_lock("FileJournal::queue_lock", false, true, false, g_ceph_context),
     journaled_seq(0),
     plug_journal_completions(false),
     fn(f),
@@ -312,7 +312,7 @@ private:
     writing_seq(0),
     throttle_ops(g_ceph_context, "filestore_ops"),
     throttle_bytes(g_ceph_context, "filestore_bytes"),
-    write_lock("FileJournal::write_lock"),
+    write_lock("FileJournal::write_lock", false, true, false, g_ceph_context),
     write_stop(false),
     write_thread(this),
     write_finish_thread(this) { }

diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h
index 5bfa86b8f9f9281b3009456ffed4f5d91e470185..dff49d43cbbe26688cb3d88538195dd19a248d7d 100644 (file)
--- a/src/os/JournalingObjectStore.h
+++ b/src/os/JournalingObjectStore.h
@@ -31,7 +31,7 @@ protected:
     list<uint64_t> ops_submitting;
   public:
     SubmitManager() :
-      lock("JOS::SubmitManager::lock"),
+      lock("JOS::SubmitManager::lock", false, true, false, g_ceph_context),
       op_seq(0)
     {}
     uint64_t op_submit_start();
@@ -65,11 +65,11 @@ protected:
   public:
     ApplyManager(Journal *&j, Finisher &f) :
       journal(j), finisher(f),
-      apply_lock("JOS::ApplyManager::apply_lock"),
+      apply_lock("JOS::ApplyManager::apply_lock", false, true, false, g_ceph_context),
       blocked(false),
       open_ops(0),
       applied_seq(0),
-      com_lock("JOS::ApplyManager::com_lock"),
+      com_lock("JOS::ApplyManager::com_lock", false, true, false, g_ceph_context),
       committing_seq(0), committed_seq(0) {}
     void add_waiter(uint64_t, Context*);
     uint64_t op_apply_start(uint64_t op);