use logger averager inc lient

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1757 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc
index f1807edddcce7322c7a2e27404c383cb5ed712af..36a317c6db20c9469d3019445da390db915cd1c1 100644 (file)
--- a/trunk/ceph/client/Client.cc
+++ b/trunk/ceph/client/Client.cc
@@ -67,11 +67,13 @@ using namespace std;
 
 
 // static logger
+Mutex client_logger_lock;
 LogType client_logtype;
 Logger  *client_logger = 0;
 
 
 
+
 class C_Client_CloseRelease : public Context {
   Client *cl;
   Inode *in;
@@ -229,6 +231,39 @@ void Client::dump_cache()
 
 void Client::init() 
 {
+  
+  // logger?
+  client_logger_lock.Lock();
+  if (client_logger == 0) {
+    client_logtype.add_inc("lsum");
+    client_logtype.add_inc("lnum");
+    client_logtype.add_inc("lwsum");
+    client_logtype.add_inc("lwnum");
+    client_logtype.add_inc("lrsum");
+    client_logtype.add_inc("lrnum");
+    client_logtype.add_inc("trsum");
+    client_logtype.add_inc("trnum");
+    client_logtype.add_inc("wrlsum");
+    client_logtype.add_inc("wrlnum");
+    client_logtype.add_inc("lstatsum");
+    client_logtype.add_inc("lstatnum");
+    client_logtype.add_inc("ldirsum");
+    client_logtype.add_inc("ldirnum");
+    client_logtype.add_inc("readdir");
+    client_logtype.add_inc("stat");
+    client_logtype.add_avg("owrlat");
+    client_logtype.add_avg("ordlat");
+    client_logtype.add_inc("owr");
+    client_logtype.add_inc("ord");
+    
+    char s[80];
+    char hostname[80];
+    gethostname(hostname, 79);
+    sprintf(s,"clients.%s.%d", hostname, getpid());
+    client_logger = new Logger(s, &client_logtype);
+  }
+  client_logger_lock.Unlock();
+
 }
 
 void Client::shutdown() 

diff --git a/trunk/ceph/newsyn.cc b/trunk/ceph/newsyn.cc
index b4c78bf7284fd04fd90a262811be27c365d5990f..6b22bbed26788a1d572a2f6a3e30e9c218773b99 100644 (file)
--- a/trunk/ceph/newsyn.cc
+++ b/trunk/ceph/newsyn.cc
@@ -265,7 +265,6 @@ int main(int argc, char **argv)
     }
   }
 
-  
   // wait for monitors to start.
   MPI_Barrier(MPI_COMM_WORLD);
 
@@ -346,30 +345,6 @@ int main(int argc, char **argv)
                           i+1);
     syn[i] = new SyntheticClient(client[i]);
     
-    // logger?
-    if (client_logger == 0) {
-      client_logtype.add_inc("lsum");
-      client_logtype.add_inc("lnum");
-      client_logtype.add_inc("lwsum");
-      client_logtype.add_inc("lwnum");
-      client_logtype.add_inc("lrsum");
-      client_logtype.add_inc("lrnum");
-      client_logtype.add_inc("trsum");
-      client_logtype.add_inc("trnum");
-      client_logtype.add_inc("wrlsum");
-      client_logtype.add_inc("wrlnum");
-      client_logtype.add_inc("lstatsum");
-      client_logtype.add_inc("lstatnum");
-      client_logtype.add_inc("ldirsum");
-      client_logtype.add_inc("ldirnum");
-      client_logtype.add_inc("readdir");
-      client_logtype.add_inc("stat");
-
-      char s[80];
-      sprintf(s,"clnode.%d", myrank);
-      client_logger = new Logger(s, &client_logtype);
-    }
-
     started++;
     nclients++;
   }