log: new logging infrastructure

- explicitly defined subsystems, and ceph_subsys_FOO enums to go with them
- modular log system with Entry object
- separate gather level and log level
- drop lots of DoutStreambuf hackery

Signed-off-by: Sage Weil <sage@newdream.net>

22 files changed, 23 insertions, 22 deletions

diff --git a/src/mds/AnchorClient.cc b/src/mds/AnchorClient.cc
index 3dad48f1f26..7900da4ce61 100644
--- a/src/mds/AnchorClient.cc
+++ b/src/mds/AnchorClient.cc
@@ -22,7 +22,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorclient "
 
diff --git a/src/mds/AnchorServer.cc b/src/mds/AnchorServer.cc
index 423a760608b..731ec9633bb 100644
--- a/src/mds/AnchorServer.cc
+++ b/src/mds/AnchorServer.cc
@@ -17,7 +17,7 @@
 #include "msg/Messenger.h"
 #include "messages/MMDSTableRequest.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorserver "
 
diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index 95e9eacedd7..ee58436123a 100644
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -26,7 +26,7 @@
 
 #include "messages/MLock.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") "
 
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 0359676853b..d6e35e55f53 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -35,7 +35,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") "
 
diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 0232e7c6ebe..70faeb81597 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -42,7 +42,7 @@
 #include "common/config.h"
 #include "global/global_context.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") "
 
diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 68ee7452aa4..57c76c49441 100644
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -81,7 +81,7 @@ struct default_file_layout {
     __u8 struct_v;
     ::decode(struct_v, bl);
     if (struct_v != 1) { //uh-oh
-      dout(0) << "got default layout I don't understand!" << dendl;
+      derr << "got default layout I don't understand!" << dendl;
       assert(0);
     }
     ::decode(layout, bl);
diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc
index a51db89e137..426b9150ea6 100644
--- a/src/mds/InoTable.cc
+++ b/src/mds/InoTable.cc
@@ -19,7 +19,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": "
 
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 2999f7974aa..72802ea7e7c 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -56,7 +56,7 @@
 #include "common/config.h"
 
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #undef DOUT_COND
 #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_locker
diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index d03c0fe192b..e39464c3b5f 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -37,7 +37,7 @@ using std::vector;
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
 #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer
 #undef dout_prefix
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index fb7fec66301..542750d86d1 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -98,7 +98,7 @@ extern struct ceph_file_layout g_default_file_layout;
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mds)
 static ostream& _prefix(std::ostream *_dout, MDS *mds) {
diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index a5c1b096578..294ad53961c 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -27,7 +27,7 @@
 #include "common/config.h"
 #include "common/errno.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
 #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log
 #undef dout_prefix
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 16ed8c8821d..8213b09e873 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -71,13 +71,12 @@
 
 #include "common/config.h"
 #include "common/errno.h"
-#include "common/DoutStreambuf.h"
 
 #include "perfglue/cpu_profiler.h"
 #include "perfglue/heap_profiler.h"
 
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << whoami << '.' << incarnation << ' '
 
diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc
index 41d69003dcf..308a9e5d65a 100644
--- a/src/mds/MDSTable.cc
+++ b/src/mds/MDSTable.cc
@@ -24,7 +24,7 @@
 #include "common/config.h"
 
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": "
 
diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc
index 675dfd66d4b..1d2c77bc4be 100644
--- a/src/mds/MDSTableClient.cc
+++ b/src/mds/MDSTableClient.cc
@@ -30,7 +30,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableclient(" << get_mdstable_name(table) << ") "
 
diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc
index bc03ca61e72..cfa308753dc 100644
--- a/src/mds/MDSTableServer.cc
+++ b/src/mds/MDSTableServer.cc
@@ -20,7 +20,7 @@
 #include "messages/MMDSTableRequest.h"
 #include "events/ETableServer.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableserver(" << get_mdstable_name(table) << ") "
 
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index c1148645c14..7301875327b 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -76,7 +76,7 @@
 #include "common/config.h"
 
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
 #define DOUT_COND(cct, l) (l <= cct->_conf->debug_mds || l <= cct->_conf->debug_mds_migrator)
 #undef dout_prefix
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 55e5a579efe..8c9d152040c 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -60,7 +60,7 @@ using namespace std;
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".server "
 
diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index 5baa43e13de..c2d348951ee 100644
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -19,7 +19,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".sessionmap "
 
diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index 5352b22c5f5..4ce1f776e3b 100644
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -25,7 +25,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".snap "
 
diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index a3cac9e46e4..0deb900f0b0 100644
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -6,6 +6,8 @@
 #include "mdstypes.h"
 #include "mds/flock.h"
 
+#define dout_subsys ceph_subsys_mds
+
 bool ceph_lock_state_t::is_waiting(ceph_filelock &fl)
 {
   multimap<uint64_t, ceph_filelock>::iterator p = waiting_locks.find(fl.start);
diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index c35a33e7219..38f8c0e7821 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -54,7 +54,7 @@
 
 #include "common/config.h"
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef DOUT_COND
 #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log \
 			      || l <= cct->_conf->debug_mds_log_expire)
diff --git a/src/mds/snap.cc b/src/mds/snap.cc
index 0b77d7c696b..fa434b79d02 100644
--- a/src/mds/snap.cc
+++ b/src/mds/snap.cc
@@ -22,7 +22,7 @@
  * SnapRealm
  */
 
-#define DOUT_SUBSYS mds
+#define dout_subsys ceph_subsys_mds
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mdcache->mds->get_nodeid(), inode, srnode.seq, this)
 static ostream& _prefix(std::ostream *_dout, int whoami, CInode *inode,