* waiter debug output

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

diff --git a/branches/sage/cephmds2/config.h b/branches/sage/cephmds2/config.h
index 9ebad69b72a4fa834e8c1426aad730768ce70240..09d3689533140e4aaa1be65962cdac05e13698c7 100644 (file)
--- a/branches/sage/cephmds2/config.h
+++ b/branches/sage/cephmds2/config.h
@@ -323,6 +323,8 @@ extern md_config_t g_debug_after_conf;
 #define dout(x)  if ((x) <= g_conf.debug) std::cout
 #define dout2(x) if ((x) <= g_conf.debug) std::cout
 
+#define pdout(x,p)  if ((x) <= (p)) std::cout
+
 /**
  * for cleaner output, bracket each line with
  * dbeginl (in the dout macro) and dendl (in place of endl).

diff --git a/branches/sage/cephmds2/mds/mdstypes.h b/branches/sage/cephmds2/mds/mdstypes.h
index c2cce988e3f940acd1953847e5cb5f29ac97bffb..cc68486b19c1bc63ccd7cea15baf4041117dbe9f 100644 (file)
--- a/branches/sage/cephmds2/mds/mdstypes.h
+++ b/branches/sage/cephmds2/mds/mdstypes.h
@@ -457,7 +457,7 @@ protected:
        if (waiting.empty())
          get(PIN_WAITER);
        waiting.insert(pair<int,Context*>(mask, c));
-       dout(10) << (mdsco_db_line_prefix(this)) 
+       pdout(10,g_conf.debug_mds) << (mdsco_db_line_prefix(this)) 
                         << "add_waiter " << mask << " " << c
                         << " on " << *this
                         << endl;
@@ -469,14 +469,14 @@ protected:
        while (it != waiting.end()) {
          if (it->first & mask) {
                ls.push_back(it->second);
-               dout(10) << (mdsco_db_line_prefix(this))
+               pdout(10,g_conf.debug_mds) << (mdsco_db_line_prefix(this))
                                 << "take_waiting mask " << mask << " took " << it->second
                                 << " tag " << it->first
                                 << " on " << *this
                                 << endl;
                waiting.erase(it++);
          } else {
-               dout(10) << "take_waiting mask " << mask << " SKIPPING " << it->second
+               pdout(10,g_conf.debug_mds) << "take_waiting mask " << mask << " SKIPPING " << it->second
                                 << " tag " << it->first
                                 << " on " << *this 
                                 << endl;