allow dout redirection to somedir/hostname.pid with --doutdir somedir

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

diff --git a/trunk/ceph/TODO b/trunk/ceph/TODO
index 90e42ea3b5a2aa3870b09e6404191178d907861c..b20a555dff8e1cf678d6a8851e98822cf17d7b85 100644 (file)
--- a/trunk/ceph/TODO
+++ b/trunk/ceph/TODO
@@ -25,8 +25,6 @@ some smallish projects:
 - ENOSPC on client, OSD
 
 
-- buffer.h needs to do COW
-
 
 
 code cleanup

diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc
index 31e4f63ea7cdcc4b9397633c06891a5df7014231..c9df200e0fc87b80df958faa31ee1dbc4fe91ea6 100644 (file)
--- a/trunk/ceph/client/Client.cc
+++ b/trunk/ceph/client/Client.cc
@@ -61,7 +61,7 @@ using namespace std;
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_client) cout << dbeginl << g_clock.now() << " client" << whoami /*<< "." << pthread_self() */ << " "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_client) *_dout << dbeginl << g_clock.now() << " client" << whoami /*<< "." << pthread_self() */ << " "
 
 #define  tout       if (g_conf.client_trace) traceout
 

diff --git a/trunk/ceph/client/FileCache.cc b/trunk/ceph/client/FileCache.cc
index 823acb4666191768de176bcf8f47bc85622b31cd..1adec4aaabee77ce3be67d1cdec18b5b87320aab 100644 (file)
--- a/trunk/ceph/client/FileCache.cc
+++ b/trunk/ceph/client/FileCache.cc
@@ -20,8 +20,8 @@
 #include "msg/Messenger.h"
 
 #include "config.h"
-#define dout(x)  if (x <= g_conf.debug_client) cout << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".filecache "
-#define derr(x)  if (x <= g_conf.debug_client) cout << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".filecache "
+#define dout(x)  if (x <= g_conf.debug_client) *_dout << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".filecache "
+#define derr(x)  if (x <= g_conf.debug_client) *_derr << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".filecache "
 
 
 

diff --git a/trunk/ceph/client/SyntheticClient.cc b/trunk/ceph/client/SyntheticClient.cc
index 8f63a4c50c468e9af17ebd9308d2f63fc76d6d8d..29510a4333a7a57232dc28341c558a647c5153d7 100644 (file)
--- a/trunk/ceph/client/SyntheticClient.cc
+++ b/trunk/ceph/client/SyntheticClient.cc
@@ -34,7 +34,7 @@ using namespace std;
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_client) cout << dbeginl << g_clock.now() << " synthetic" << client->get_nodeid() << " "
+#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_client) *_dout << dbeginl << g_clock.now() << " synthetic" << client->get_nodeid() << " "
 
 // traces
 //void trace_include(SyntheticClient *syn, Client *cl, string& prefix);

diff --git a/trunk/ceph/common/ThreadPool.h b/trunk/ceph/common/ThreadPool.h
index 06f1f46120fb5fecc1fe7b08c4a81aee19f8f621..62855a240cd0c8eb937bccb691e3e4f136bf5468 100644 (file)
--- a/trunk/ceph/common/ThreadPool.h
+++ b/trunk/ceph/common/ThreadPool.h
@@ -28,7 +28,7 @@ using std::list;
 
 // debug output
 #include "config.h"
-#define tpdout(x) if (x <= g_conf.debug) cout << myname 
+#define tpdout(x) if (x <= g_conf.debug) *_dout << myname 
 #define DBLVL 15
 
 

diff --git a/trunk/ceph/common/Timer.cc b/trunk/ceph/common/Timer.cc
index 1565e7d4154a95b674d46929f0cc703cd1e2735f..2606ee344b117830215bbc383edac1f27bf765d4 100644 (file)
--- a/trunk/ceph/common/Timer.cc
+++ b/trunk/ceph/common/Timer.cc
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "include/Context.h"
 
-#define dout(x)  if (x <= g_conf.debug_timer) cout << dbeginl << g_clock.now() << " TIMER "
-#define derr(x)  if (x <= g_conf.debug_timer) cerr << dbeginl << g_clock.now() << " TIMER "
+#define dout(x)  if (x <= g_conf.debug_timer) *_dout << dbeginl << g_clock.now() << " TIMER "
+#define derr(x)  if (x <= g_conf.debug_timer) *_derr << dbeginl << g_clock.now() << " TIMER "
 
 #define DBL 10
 

diff --git a/trunk/ceph/config.cc b/trunk/ceph/config.cc
index 604df9e36d67cc3b8e803a201de67a948bb69142..6746367b8374569db000c55ee9d02519657141e6 100644 (file)
--- a/trunk/ceph/config.cc
+++ b/trunk/ceph/config.cc
@@ -15,6 +15,7 @@
 
 #include "config.h"
 #include "include/types.h"
+#include <fstream>
 
 //#define MDS_CACHE_SIZE        4*10000   -> <20mb
 //#define MDS_CACHE_SIZE        80000         62mb
@@ -34,9 +35,12 @@ Mutex bufferlock;
 
 #include "osd/osd_types.h"
 
-// debug output lock
+// debug output
 Mutex _dout_lock;
+ostream *_dout = &std::cout;
+ostream *_derr = &std::cerr;
 
+// file layouts
 FileLayout g_OSD_FileLayout( 1<<22, 1, 1<<22, pg_t::TYPE_REP, 2 );   // 4M objects, 2x replication
 FileLayout g_OSD_MDDirLayout( 1<<22, 1, 1<<22, pg_t::TYPE_REP, 2 );  // 4M objects, 2x replication.  (a lie, just object layout policy)
 FileLayout g_OSD_MDLogLayout( 1<<20, 1, 1<<20, pg_t::TYPE_REP, 2 );  // 1M objects
@@ -444,6 +448,8 @@ void parse_config_options(std::vector<char*>& args)
 {
   std::vector<char*> nargs;
 
+  char *doutdir = 0;
+
   for (unsigned i=0; i<args.size(); i++) {
     if (strcmp(args[i],"--bind") == 0) 
       assert(parse_ip_port(args[++i], g_my_addr));
@@ -517,6 +523,11 @@ void parse_config_options(std::vector<char*>& args)
     //else if (strcmp(args[i], "--fake_osd_sync") == 0) 
     //g_conf.fake_osd_sync = atoi(args[++i]);
 
+    
+    else if (strcmp(args[i], "--doutdir") == 0) {
+      doutdir = args[++i];
+    }
+
     else if (strcmp(args[i], "--debug") == 0) 
       if (!g_conf.debug_after) 
         g_conf.debug = atoi(args[++i]);
@@ -934,5 +945,20 @@ void parse_config_options(std::vector<char*>& args)
     }
   }
 
+  // redirect dout?
+  if (doutdir) {
+    char fn[80];
+    char hostname[80];
+    gethostname(hostname, 79);
+    sprintf(fn, "%s/%s.%d", doutdir, hostname, getpid());
+    std::ofstream *out = new std::ofstream(fn, ios::trunc|ios::out);
+    if (!out->is_open()) {
+      std::cerr << "error opening output file " << fn << std::endl;
+      delete out;
+    } else {
+      _dout = out;
+    }
+  }
+
   args = nargs;
 }

diff --git a/trunk/ceph/config.h b/trunk/ceph/config.h
index e71f06d71cbcf041069ac52bb9f66e047400f5cd..45772f72a7494b632b4fb34f5826af87497ab948 100644 (file)
--- a/trunk/ceph/config.h
+++ b/trunk/ceph/config.h
@@ -367,7 +367,7 @@ struct _dendl_t { _dendl_t(int) {} };
 static const _dbeginl_t dbeginl = 0;
 static const _dendl_t dendl = 0;
 
-// intentionally conflict with endl.. users should
+// intentionally conflict with endl
 class _bad_endl_use_dendl_t { public: _bad_endl_use_dendl_t(int) {} };
 static const _bad_endl_use_dendl_t endl = 0;
 
@@ -385,11 +385,15 @@ inline ostream& operator<<(ostream& out, _bad_endl_use_dendl_t) {
   return out;
 }
 
+// the streams
+extern ostream *_dout;
+extern ostream *_derr;
+
 // generic macros
-#define generic_dout(x) if ((x) <= g_conf.debug) std::cout << dbeginl
-#define generic_derr(x) if ((x) <= g_conf.debug) std::cerr << dbeginl
+#define generic_dout(x) if ((x) <= g_conf.debug) *_dout << dbeginl
+#define generic_derr(x) if ((x) <= g_conf.debug) *_derr << dbeginl
 
-#define pdout(x,p) if ((x) <= (p)) std::cout << dbeginl
+#define pdout(x,p) if ((x) <= (p)) *_dout << dbeginl
 
 
 #endif

diff --git a/trunk/ceph/ebofs/Allocator.cc b/trunk/ceph/ebofs/Allocator.cc
index e1e5ff3fc311b0846cd015c208955c538786b082..35b0db16b84c281a2552f39c2b5ff929a950a125 100644 (file)
--- a/trunk/ceph/ebofs/Allocator.cc
+++ b/trunk/ceph/ebofs/Allocator.cc
@@ -19,7 +19,7 @@
 
 
 #undef dout
-#define dout(x) if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs(" << fs->dev.get_device_name() << ").allocator."
+#define dout(x) if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs(" << fs->dev.get_device_name() << ").allocator."
 
 
 void Allocator::dump_freelist()

diff --git a/trunk/ceph/ebofs/BlockDevice.cc b/trunk/ceph/ebofs/BlockDevice.cc
index 5c74b4fe8ac868be43f917fcc86616e14b6dfd37..99d1f3ef719d00507356b660264cd8054091c6a3 100644 (file)
--- a/trunk/ceph/ebofs/BlockDevice.cc
+++ b/trunk/ceph/ebofs/BlockDevice.cc
@@ -62,8 +62,8 @@ inline ostream& operator<<(ostream& out, BlockDevice::biovec &bio)
  * ElevatorQueue
  */
 
-#define dout(x) if (x <= g_conf.debug_bdev) cout << dbeginl << g_clock.now() << " bdev(" << dev << ").elevatorq."
-#define derr(x) if (x <= g_conf.debug_bdev) cerr << dbeginl << g_clock.now() << " bdev(" << dev << ").elevatorq."
+#define dout(x) if (x <= g_conf.debug_bdev) *_dout << dbeginl << g_clock.now() << " bdev(" << dev << ").elevatorq."
+#define derr(x) if (x <= g_conf.debug_bdev) *_derr << dbeginl << g_clock.now() << " bdev(" << dev << ").elevatorq."
 
 
 int BlockDevice::ElevatorQueue::dequeue_io(list<biovec*>& biols, 
@@ -211,7 +211,7 @@ int BlockDevice::ElevatorQueue::dequeue_io(list<biovec*>& biols,
  * BarrierQueue
  */
 #undef dout
-#define dout(x) if (x <= g_conf.debug_bdev) cout << dbeginl << g_clock.now() << " bdev(" << dev << ").barrierq."
+#define dout(x) if (x <= g_conf.debug_bdev) *_dout << dbeginl << g_clock.now() << " bdev(" << dev << ").barrierq."
 
 void BlockDevice::BarrierQueue::barrier()
 {
@@ -259,7 +259,7 @@ int BlockDevice::BarrierQueue::dequeue_io(list<biovec*>& biols,
  */
 
 #undef dout
-#define dout(x) if (x <= g_conf.debug_bdev) cout << dbeginl << g_clock.now() << " bdev(" << dev << ")."
+#define dout(x) if (x <= g_conf.debug_bdev) *_dout << dbeginl << g_clock.now() << " bdev(" << dev << ")."
 
 
 

diff --git a/trunk/ceph/ebofs/BufferCache.cc b/trunk/ceph/ebofs/BufferCache.cc
index 399d561891d0491f0272fe341eac74256394e1cc..b6317d5206d2b0695a21e90be720808271862daa 100644 (file)
--- a/trunk/ceph/ebofs/BufferCache.cc
+++ b/trunk/ceph/ebofs/BufferCache.cc
@@ -22,7 +22,7 @@
 
 
 #undef dout
-#define dout(x)  if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs.bh."
+#define dout(x)  if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs.bh."
 
 
 
@@ -33,7 +33,7 @@
 
 
 #undef dout
-#define dout(x)  if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs.oc."
+#define dout(x)  if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs.oc."
 
 
 
@@ -737,7 +737,7 @@ void ObjectCache::clone_to(Onode *other)
 /************** BufferCache ***************/
 
 #undef dout
-#define dout(x)  if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs.bc."
+#define dout(x)  if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs.bc."
 
 
 

diff --git a/trunk/ceph/ebofs/Ebofs.cc b/trunk/ceph/ebofs/Ebofs.cc
index ba4875b10345db51c630a99756ebc3284a7f863b..7aa24679b027105206d6bdfbc6739bb4aafbd9cd 100644 (file)
--- a/trunk/ceph/ebofs/Ebofs.cc
+++ b/trunk/ceph/ebofs/Ebofs.cc
@@ -29,8 +29,8 @@
 
 // *******************
 
-#define dout(x) if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs(" << dev.get_device_name() << ")."
-#define derr(x) if (x <= g_conf.debug_ebofs) cerr << dbeginl << g_clock.now() << " ebofs(" << dev.get_device_name() << ")."
+#define dout(x) if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs(" << dev.get_device_name() << ")."
+#define derr(x) if (x <= g_conf.debug_ebofs) *_derr << dbeginl << g_clock.now() << " ebofs(" << dev.get_device_name() << ")."
 
 
 char *nice_blocks(block_t b) 

diff --git a/trunk/ceph/ebofs/FileJournal.cc b/trunk/ceph/ebofs/FileJournal.cc
index 1a23256d4f97ec189de58c9f6a665b25d65a899a..35a1e6f4127b6fb8dbbda4ca98ed8f42041d74f3 100644 (file)
--- a/trunk/ceph/ebofs/FileJournal.cc
+++ b/trunk/ceph/ebofs/FileJournal.cc
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#define dout(x) if (x <= g_conf.debug_ebofs) cout << dbeginl << g_clock.now() << " ebofs(" << ebofs->dev.get_device_name() << ").journal "
-#define derr(x) if (x <= g_conf.debug_ebofs) cerr << dbeginl << g_clock.now() << " ebofs(" << ebofs->dev.get_device_name() << ").journal "
+#define dout(x) if (x <= g_conf.debug_ebofs) *_dout << dbeginl << g_clock.now() << " ebofs(" << ebofs->dev.get_device_name() << ").journal "
+#define derr(x) if (x <= g_conf.debug_ebofs) *_derr << dbeginl << g_clock.now() << " ebofs(" << ebofs->dev.get_device_name() << ").journal "
 
 
 int FileJournal::create()

diff --git a/trunk/ceph/mds/AnchorClient.cc b/trunk/ceph/mds/AnchorClient.cc
index aa9f71131cdf5d9dcbb8db7d381c27e6bbfd10bf..3ae9db25ffd2e6b8c9c74fb65914baa520334106 100644 (file)
--- a/trunk/ceph/mds/AnchorClient.cc
+++ b/trunk/ceph/mds/AnchorClient.cc
@@ -31,8 +31,8 @@ using std::cerr;
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchorclient "
-#define derr(x)  if (x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchorclient "
+#define dout(x)  if (x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchorclient "
+#define derr(x)  if (x <= g_conf.debug_mds) *_derr << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchorclient "
 
 
 void AnchorClient::dispatch(Message *m)

diff --git a/trunk/ceph/mds/AnchorTable.cc b/trunk/ceph/mds/AnchorTable.cc
index fb062375ce12e50bb61fc0af69a39cc0edfd5be0..72ad51b0eaa88daf853fc10d91e73bf60d95c5cb 100644 (file)
--- a/trunk/ceph/mds/AnchorTable.cc
+++ b/trunk/ceph/mds/AnchorTable.cc
@@ -27,8 +27,8 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchortable "
-#define derr(x)  if (x <= g_conf.debug_mds) cerr << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchortable "
+#define dout(x)  if (x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchortable "
+#define derr(x)  if (x <= g_conf.debug_mds) *_derr << dbeginl << g_clock.now() << " " << mds->messenger->get_myname() << ".anchortable "
 
 
 void AnchorTable::dump()

diff --git a/trunk/ceph/mds/CDentry.cc b/trunk/ceph/mds/CDentry.cc
index 79faf69802762ab35b87886b625221b0306ed5bf..e0c0650393ad7ac3c508e82b4cb0866487fc3bca 100644 (file)
--- a/trunk/ceph/mds/CDentry.cc
+++ b/trunk/ceph/mds/CDentry.cc
@@ -26,7 +26,7 @@
 
 #include <cassert>
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") "
 
 
 

diff --git a/trunk/ceph/mds/CDir.cc b/trunk/ceph/mds/CDir.cc
index d6bf3d1bcddf2eca5ec110429b5bea4f85e4cc97..4a7abebecf26f5e9f38d55ecf388c5f252240a26 100644 (file)
--- a/trunk/ceph/mds/CDir.cc
+++ b/trunk/ceph/mds/CDir.cc
@@ -32,8 +32,7 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") "
-//#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << cache->mds->get_nodeid() << ".cache." << *this << " "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") "
 
 
 

diff --git a/trunk/ceph/mds/CInode.cc b/trunk/ceph/mds/CInode.cc
index cea6babfdd7c4befbd19b49e65411d38bd39befa..e90f3f83f3e5d6c387447679de08d430929d3390 100644 (file)
--- a/trunk/ceph/mds/CInode.cc
+++ b/trunk/ceph/mds/CInode.cc
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") "
 
 
 //int cinode_pins[CINODE_NUM_PINS];  // counts

diff --git a/trunk/ceph/mds/ClientMap.cc b/trunk/ceph/mds/ClientMap.cc
index db977615354d1074f3723697d983df28ccfd34bd..26f105d7ae1a6449f27eaa190e92ff001dc32897 100644 (file)
--- a/trunk/ceph/mds/ClientMap.cc
+++ b/trunk/ceph/mds/ClientMap.cc
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".clientmap "
+#define dout(x)  if (x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".clientmap "
 
 
 

diff --git a/trunk/ceph/mds/IdAllocator.cc b/trunk/ceph/mds/IdAllocator.cc
index 6377bce17285f305ad994c3c84a5b8067bcc5a3a..3a490c48c263d2b7db7b00c0bc720ebd50f8d835 100644 (file)
--- a/trunk/ceph/mds/IdAllocator.cc
+++ b/trunk/ceph/mds/IdAllocator.cc
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".idalloc: "
+#define dout(x)  if (x <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".idalloc: "
 
 
 void IdAllocator::init_inode()

diff --git a/trunk/ceph/mds/Locker.cc b/trunk/ceph/mds/Locker.cc
index 25859409cfaf8d9f874eb1bba76362c6ed0d245d..52f3aef49ca0ec6d1c56dabc618d5bfc1b5302f1 100644 (file)
--- a/trunk/ceph/mds/Locker.cc
+++ b/trunk/ceph/mds/Locker.cc
@@ -51,7 +51,7 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".locker "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".locker "
 
 
 

diff --git a/trunk/ceph/mds/MDBalancer.cc b/trunk/ceph/mds/MDBalancer.cc
index da2f084976c2d41c7e61032c5ea961c39acd2d86..0feeb66d9d26d18c6217d5103f8cb70e3f0b3560 100644 (file)
--- a/trunk/ceph/mds/MDBalancer.cc
+++ b/trunk/ceph/mds/MDBalancer.cc
@@ -33,7 +33,7 @@ using std::vector;
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug_mds || l<=g_conf.debug_mds_balancer) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".bal "
+#define  dout(l)    if (l<=g_conf.debug_mds || l<=g_conf.debug_mds_balancer) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".bal "
 
 #define MIN_LOAD    50   //  ??
 #define MIN_REEXPORT 5  // will automatically reexport

diff --git a/trunk/ceph/mds/MDCache.cc b/trunk/ceph/mds/MDCache.cc
index fe1b334676fe54c83adf95f99d66dfcbf7c43fb0..530d049d7994f1242ef04ed41d3af4c9028214d6 100644 (file)
--- a/trunk/ceph/mds/MDCache.cc
+++ b/trunk/ceph/mds/MDCache.cc
@@ -84,7 +84,7 @@ using namespace std;
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".cache "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".cache "
 
 
 

diff --git a/trunk/ceph/mds/MDLog.cc b/trunk/ceph/mds/MDLog.cc
index a197326086e66c3bd15de60a937581c8f9dad5d6..04181c368be41b1772836e00a93d3ac7cb61b12a 100644 (file)
--- a/trunk/ceph/mds/MDLog.cc
+++ b/trunk/ceph/mds/MDLog.cc
@@ -24,8 +24,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".log "
-#define  derr(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".log "
+#define  dout(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".log "
+#define  derr(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) *_derr << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".log "
 
 // cons/des
 

diff --git a/trunk/ceph/mds/MDS.cc b/trunk/ceph/mds/MDS.cc
index 5c9b6c135aa7f279f14fb00f0211eabf5ba495a4..eabe17a556867253f1ae6acdd62615f9834e5e6b 100644 (file)
--- a/trunk/ceph/mds/MDS.cc
+++ b/trunk/ceph/mds/MDS.cc
@@ -61,8 +61,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << whoami << " "
-#define  derr(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << whoami << " "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << whoami << " "
+#define  derr(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_derr << dbeginl << g_clock.now() << " mds" << whoami << " "
 
 
 

diff --git a/trunk/ceph/mds/Migrator.cc b/trunk/ceph/mds/Migrator.cc
index b227f25bd6e44600e7161e595c8df86655493546..d84caa51f02c4ccfc351932ee5dc144580a1fd91 100644 (file)
--- a/trunk/ceph/mds/Migrator.cc
+++ b/trunk/ceph/mds/Migrator.cc
@@ -49,7 +49,7 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds || l <= g_conf.debug_mds_migrator) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".migrator "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds || l <= g_conf.debug_mds_migrator) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".migrator "
 
 
 

diff --git a/trunk/ceph/mds/Server.cc b/trunk/ceph/mds/Server.cc
index ce7233a6de3e9ece374d97c9b79eece5055a9764..2741cb234afec02a54202943fa29006135c0a8f5 100644 (file)
--- a/trunk/ceph/mds/Server.cc
+++ b/trunk/ceph/mds/Server.cc
@@ -56,8 +56,8 @@ using namespace std;
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".server "
-#define  derr(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".server "
+#define  dout(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".server "
+#define  derr(l)    if (l<=g_conf.debug || l <= g_conf.debug_mds) *_derr << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".server "
 
 
 void Server::reopen_logger()

diff --git a/trunk/ceph/mds/journal.cc b/trunk/ceph/mds/journal.cc
index 83707fdfbfc828aa180ea6539e441daa5ca35550..1af4feae08c9413c63b24c2df661cf59dedbd459 100644 (file)
--- a/trunk/ceph/mds/journal.cc
+++ b/trunk/ceph/mds/journal.cc
@@ -43,8 +43,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".journal "
-#define  derr(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) cout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".journal "
+#define  dout(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".journal "
+#define  derr(l)    if (l<=g_conf.debug_mds || l <= g_conf.debug_mds_log) *_dout << dbeginl << g_clock.now() << " mds" << mds->get_nodeid() << ".journal "
 
 
 // -----------------------

diff --git a/trunk/ceph/mon/ClientMonitor.cc b/trunk/ceph/mon/ClientMonitor.cc
index a2080c0431d1f143cc3eb4fe895d5b1651a02f19..329548c0091e84ec411020bdbf56e257b1541faa 100644 (file)
--- a/trunk/ceph/mon/ClientMonitor.cc
+++ b/trunk/ceph/mon/ClientMonitor.cc
@@ -26,8 +26,8 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".client "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".client "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".client "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".client "
 
 
 

diff --git a/trunk/ceph/mon/Elector.cc b/trunk/ceph/mon/Elector.cc
index d962525bcc515d832552bc8bac3e3621472154ac..4a09b58ab507359037a12cb61e05b8a7381db34e 100644 (file)
--- a/trunk/ceph/mon/Elector.cc
+++ b/trunk/ceph/mon/Elector.cc
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".elector(" << epoch << ") "
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".elector(" << epoch << ") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".elector(" << epoch << ") "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".elector(" << epoch << ") "
 
 
 void Elector::init()

diff --git a/trunk/ceph/mon/MDSMonitor.cc b/trunk/ceph/mon/MDSMonitor.cc
index 35f60f044a4f51e541e83e2318e77b9bd57816b1..89c92f0bbba30240b090e2835003c2cb8c5e9713 100644 (file)
--- a/trunk/ceph/mon/MDSMonitor.cc
+++ b/trunk/ceph/mon/MDSMonitor.cc
@@ -34,8 +34,8 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".mds e" << mdsmap.get_epoch() << " "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".mds e" << mdsmap.get_epoch() << " "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".mds e" << mdsmap.get_epoch() << " "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".mds e" << mdsmap.get_epoch() << " "
 
 
 

diff --git a/trunk/ceph/mon/Monitor.cc b/trunk/ceph/mon/Monitor.cc
index 28d580d5fe0b204a37aa20375759a80543dc6731..1db23b0270e577cf72ccedff26dde4c81d41129c 100644 (file)
--- a/trunk/ceph/mon/Monitor.cc
+++ b/trunk/ceph/mon/Monitor.cc
@@ -41,8 +41,8 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << whoami << (is_starting() ? (const char*)"(starting)":(is_leader() ? (const char*)"(leader)":(is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << " "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << whoami << (is_starting() ? (const char*)"(starting)":(is_leader() ? (const char*)"(leader)":(is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << " "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << whoami << (is_starting() ? (const char*)"(starting)":(is_leader() ? (const char*)"(leader)":(is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << " "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << whoami << (is_starting() ? (const char*)"(starting)":(is_leader() ? (const char*)"(leader)":(is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << " "
 
 
 

diff --git a/trunk/ceph/mon/MonitorStore.cc b/trunk/ceph/mon/MonitorStore.cc
index d41436524bfd12da223605aecaa5ac1815483b2f..30eb4796a538314692e67d78ffa6291416d925ae 100644 (file)
--- a/trunk/ceph/mon/MonitorStore.cc
+++ b/trunk/ceph/mon/MonitorStore.cc
@@ -17,8 +17,8 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " store(" << dir <<") "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " store(" << dir <<") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " store(" << dir <<") "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " store(" << dir <<") "
 
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/trunk/ceph/mon/OSDMonitor.cc b/trunk/ceph/mon/OSDMonitor.cc
index a82e6525d93be300518e91e6d2762437ca3e42cc..9b543e5066816b420e1efda4b4e3bd7ad97bd1c2 100644 (file)
--- a/trunk/ceph/mon/OSDMonitor.cc
+++ b/trunk/ceph/mon/OSDMonitor.cc
@@ -37,8 +37,8 @@
 #include "config.h"
 
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".osd(e" << osdmap.get_epoch() << ") "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".osd(e" << osdmap.get_epoch() << ") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".osd(e" << osdmap.get_epoch() << ") "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".osd(e" << osdmap.get_epoch() << ") "
 
 
 // FAKING

diff --git a/trunk/ceph/mon/PGMonitor.cc b/trunk/ceph/mon/PGMonitor.cc
index 1babdc677232cc8d578bc274cfd22e2e17b50ddd..69efdda8fa3b268f1fae98018b58afe950c6e088 100644 (file)
--- a/trunk/ceph/mon/PGMonitor.cc
+++ b/trunk/ceph/mon/PGMonitor.cc
@@ -28,8 +28,8 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".pg "
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".pg "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".pg "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) *_derr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".pg "
 
 
 

diff --git a/trunk/ceph/mon/Paxos.cc b/trunk/ceph/mon/Paxos.cc
index 75601ab0a277621f136d032d9474253347bb0ce8..c1f4472059ff50dbf17a752c725770282c549219 100644 (file)
--- a/trunk/ceph/mon/Paxos.cc
+++ b/trunk/ceph/mon/Paxos.cc
@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cerr << dbeginl << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cout << dbeginl << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) *_dout << dbeginl << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) *_derr << dbeginl << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
 
 
 void Paxos::init()

diff --git a/trunk/ceph/mon/PaxosService.cc b/trunk/ceph/mon/PaxosService.cc
index 0f7868a657ca60a1a023341dd8aee6950f164040..95d0b4d486e45dc4d21def175cc56e3b9e29b9f6 100644 (file)
--- a/trunk/ceph/mon/PaxosService.cc
+++ b/trunk/ceph/mon/PaxosService.cc
@@ -20,8 +20,7 @@
 
 #include "config.h"
 
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxosservice(" << get_paxos_name(paxos->machine_id) << ") "
-//#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << "." << get_paxos_name(paxos->machine_id) << " "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) *_dout << dbeginl << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxosservice(" << get_paxos_name(paxos->machine_id) << ") "
 
 
 

diff --git a/trunk/ceph/msg/FakeMessenger.cc b/trunk/ceph/msg/FakeMessenger.cc
index fb7514e49458b3091d6f67bd1f44aedc43b2da72..2bef38f7af658a09212bbb3134d9218721dcf6cf 100644 (file)
--- a/trunk/ceph/msg/FakeMessenger.cc
+++ b/trunk/ceph/msg/FakeMessenger.cc
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#define dout(x) if ((x) <= g_conf.debug_ms) cout << dbeginl << g_clock.now() << " "
+#define dout(x) if ((x) <= g_conf.debug_ms) *_dout << dbeginl << g_clock.now() << " "
 
 
 

diff --git a/trunk/ceph/msg/Message.cc b/trunk/ceph/msg/Message.cc
index bcc519af9b95e866aced9f9bbd6eef4eceb72c0f..07867cf2b7d91519d2e4461d64f02b1b990ff89a 100644 (file)
--- a/trunk/ceph/msg/Message.cc
+++ b/trunk/ceph/msg/Message.cc
@@ -95,7 +95,7 @@ using namespace std;
 
 #include "config.h"
 
-#define dout(l)    if (l<=g_conf.debug) cout << dbeginl << g_clock.now() << " MESSENGER: "
+#define dout(l)    if (l<=g_conf.debug) *_dout << dbeginl << g_clock.now() << " MESSENGER: "
 #define DEBUGLVL  10    // debug level of output
 
 

diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc
index 0dcfbda552092ffca72f2133687c30eaab505a8a..f830718aaec517efb7b7882f393762a5c8045c8f 100644 (file)
--- a/trunk/ceph/msg/SimpleMessenger.cc
+++ b/trunk/ceph/msg/SimpleMessenger.cc
@@ -29,8 +29,8 @@
 #include <iostream>
 #include <fstream>
 
-#define dout(l)  if (l<=g_conf.debug_ms) cout << dbeginl << g_clock.now() << " " << pthread_self() << " -- " << rank.my_addr << " "
-#define derr(l)  if (l<=g_conf.debug_ms) cerr << dbeginl << g_clock.now() << " " << pthread_self() << " -- " << rank.my_addr << " "
+#define dout(l)  if (l<=g_conf.debug_ms) *_dout << dbeginl << g_clock.now() << " " << pthread_self() << " -- " << rank.my_addr << " "
+#define derr(l)  if (l<=g_conf.debug_ms) *_derr << dbeginl << g_clock.now() << " " << pthread_self() << " -- " << rank.my_addr << " "
 
 
 

diff --git a/trunk/ceph/osbdb/OSBDB.cc b/trunk/ceph/osbdb/OSBDB.cc
index f6c8f37c86c61813f08acdb40b5237e1627fba6c..a5ed2bf0ece33cabdc4ac8e29a61d1c32282f009 100644 (file)
--- a/trunk/ceph/osbdb/OSBDB.cc
+++ b/trunk/ceph/osbdb/OSBDB.cc
@@ -19,8 +19,8 @@ Foundation.  See file COPYING. */
 
 using namespace std;
 
-#define dout(x) if (x <= g_conf.debug || x <= g_conf.debug_bdbstore) cout << dbeginl << "bdbstore(" << device << ")@" << __LINE__ << "."
-#define derr(x) if (x <= g_conf.debug || x <= g_conf.debug_bdbstore) cerr << dbeginl << "bdbstore(" << device << ")@" << __LINE__ << "."
+#define dout(x) if (x <= g_conf.debug || x <= g_conf.debug_bdbstore) *_dout << dbeginl << "bdbstore(" << device << ")@" << __LINE__ << "."
+#define derr(x) if (x <= g_conf.debug || x <= g_conf.debug_bdbstore) *_derr << dbeginl << "bdbstore(" << device << ")@" << __LINE__ << "."
 
 #define CLEANUP(onsafe) do { \
     dout(6) << "DELETE " << hex << onsafe << dec << dendl; \

diff --git a/trunk/ceph/osd/FakeStore.cc b/trunk/ceph/osd/FakeStore.cc
index a47919c95b0994dc6b6836ad008befcb62a55db0..336383e236b91819ccdde35ed0fea34e2f30b98f 100644 (file)
--- a/trunk/ceph/osd/FakeStore.cc
+++ b/trunk/ceph/osd/FakeStore.cc
@@ -41,8 +41,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug) cout << dbeginl << g_clock.now() << " osd" << whoami << ".fakestore "
-#define  derr(l)    if (l<=g_conf.debug) cerr << dbeginl << g_clock.now() << " osd" << whoami << ".fakestore "
+#define  dout(l)    if (l<=g_conf.debug) *_dout << dbeginl << g_clock.now() << " osd" << whoami << ".fakestore "
+#define  derr(l)    if (l<=g_conf.debug) *_derr << dbeginl << g_clock.now() << " osd" << whoami << ".fakestore "
 
 #include "include/buffer.h"
 

diff --git a/trunk/ceph/osd/OSD.cc b/trunk/ceph/osd/OSD.cc
index 75de0b4ad4bb7d58a8494cb71e1092e9472abd06..1d836429d7969c5faf198f34dc8adeec662dbce2 100644 (file)
--- a/trunk/ceph/osd/OSD.cc
+++ b/trunk/ceph/osd/OSD.cc
@@ -69,8 +69,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cout << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
-#define  derr(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cerr << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
+#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_dout << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
+#define  derr(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_derr << dbeginl << g_clock.now() << " osd" << whoami << " " << (osdmap ? osdmap->get_epoch():0) << " "
 
 char *osd_base_path = "./osddata";
 char *ebofs_base_path = "./dev";

diff --git a/trunk/ceph/osd/ObjectStore.cc b/trunk/ceph/osd/ObjectStore.cc
index 14d9b62eaebca146d1d914ad406164c3589fa4a5..7aeab1d063d4d3dc9c8272e38527a1bb87348243 100644 (file)
--- a/trunk/ceph/osd/ObjectStore.cc
+++ b/trunk/ceph/osd/ObjectStore.cc
@@ -6,7 +6,7 @@
 #include "config.h"
 #include "common/Clock.h"
 
-#define dout(x) if (x < g_conf.debug) cout << dbeginl << g_clock.now() << " ager: " 
+#define dout(x) if (x < g_conf.debug) *_dout << dbeginl << g_clock.now() << " ager: " 
 
 object_t ObjectStore::age_get_oid() {
     if (!age_free_oids.empty()) {

diff --git a/trunk/ceph/osd/PG.cc b/trunk/ceph/osd/PG.cc
index d49fcad38199a219891564feeb3f1d0f6494e549..5fcc1a76bfc98eee56f666326f9c4441478756a9 100644 (file)
--- a/trunk/ceph/osd/PG.cc
+++ b/trunk/ceph/osd/PG.cc
@@ -26,7 +26,7 @@
 #include "messages/MOSDPGRemove.h"
 #include "messages/MOSDPGActivateSet.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cout << dbeginl << g_clock.now() << " osd" << osd->whoami << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
+#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_dout << dbeginl << g_clock.now() << " osd" << osd->whoami << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
 
 
 /******* PGLog ********/

diff --git a/trunk/ceph/osd/RAID4PG.cc b/trunk/ceph/osd/RAID4PG.cc
index 6d1003ae0a1e20c000838615a4fc7c8df19c71a5..0a91fedd312a16f6ffbd07d53ae3c97210a55d62 100644 (file)
--- a/trunk/ceph/osd/RAID4PG.cc
+++ b/trunk/ceph/osd/RAID4PG.cc
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cout << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
+#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_dout << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
 
 #include <errno.h>
 #include <sys/stat.h>

diff --git a/trunk/ceph/osd/ReplicatedPG.cc b/trunk/ceph/osd/ReplicatedPG.cc
index 8649484b213b9f1708b1b3b15f3e56852edc1b37..cb268ab8f54a61f785367304f178c59481b11390 100644 (file)
--- a/trunk/ceph/osd/ReplicatedPG.cc
+++ b/trunk/ceph/osd/ReplicatedPG.cc
@@ -25,8 +25,8 @@
 
 #include "config.h"
 
-#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cout << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
-#define  derr(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) cerr << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
+#define  dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_dout << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
+#define  derr(l)    if (l<=g_conf.debug || l<=g_conf.debug_osd) *_derr << dbeginl << g_clock.now() << " osd" << osd->get_nodeid() << " " << (osd->osdmap ? osd->osdmap->get_epoch():0) << " " << *this << " "
 
 #include <errno.h>
 #include <sys/stat.h>

diff --git a/trunk/ceph/osdc/Filer.cc b/trunk/ceph/osdc/Filer.cc
index b3c56dca574bfa63079bb5032b997eb23c84146c..5d13174d559525766a8bc2a2e9241faf31cc90fa 100644 (file)
--- a/trunk/ceph/osdc/Filer.cc
+++ b/trunk/ceph/osdc/Filer.cc
@@ -32,7 +32,7 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_filer) cout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".filer "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_filer) *_dout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".filer "
 
 
 class Filer::C_Probe : public Context {

diff --git a/trunk/ceph/osdc/Journaler.cc b/trunk/ceph/osdc/Journaler.cc
index 7fd5230f0408adbf97072b3cae1027be5311cb72..10db924701a28657cee76badc2d2ea39291f7fd4 100644 (file)
--- a/trunk/ceph/osdc/Journaler.cc
+++ b/trunk/ceph/osdc/Journaler.cc
@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_journaler) cout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".journaler "
-#define derr(x)  if (x <= g_conf.debug || x <= g_conf.debug_journaler) cerr << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".journaler "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_journaler) *_dout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".journaler "
+#define derr(x)  if (x <= g_conf.debug || x <= g_conf.debug_journaler) *_derr << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".journaler "
 
 
 

diff --git a/trunk/ceph/osdc/ObjectCacher.cc b/trunk/ceph/osdc/ObjectCacher.cc
index 864e187c40c4e503f15d35d6072aeb123ad4317a..d5f347d3863cbf9c1366393f9812e2d230a2cc7b 100644 (file)
--- a/trunk/ceph/osdc/ObjectCacher.cc
+++ b/trunk/ceph/osdc/ObjectCacher.cc
@@ -12,7 +12,7 @@
 
 /*** ObjectCacher::Object ***/
 
-#define dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_objectcacher) cout << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".objectcacher.object(" << oid << ") "
+#define dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_objectcacher) *_dout << dbeginl << g_clock.now() << " " << oc->objecter->messenger->get_myname() << ".objectcacher.object(" << oid << ") "
 
 
 ObjectCacher::BufferHead *ObjectCacher::Object::split(BufferHead *left, off_t off)
@@ -369,7 +369,7 @@ void ObjectCacher::Object::truncate(off_t s)
 /*** ObjectCacher ***/
 
 #undef dout
-#define dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_objectcacher) cout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".objectcacher "
+#define dout(l)    if (l<=g_conf.debug || l<=g_conf.debug_objectcacher) *_dout << dbeginl << g_clock.now() << " " << objecter->messenger->get_myname() << ".objectcacher "
 
 
 

diff --git a/trunk/ceph/osdc/Objecter.cc b/trunk/ceph/osdc/Objecter.cc
index 6894f5eea4d2c8a1fb1efbbbb734bd7add491f74..1826cabe04a0e2b0d41c58645737db7a00458c13 100644 (file)
--- a/trunk/ceph/osdc/Objecter.cc
+++ b/trunk/ceph/osdc/Objecter.cc
@@ -30,8 +30,8 @@
 
 #include "config.h"
 
-#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_objecter) cout << dbeginl << g_clock.now() << " " << messenger->get_myname() << ".objecter "
-#define derr(x)  if (x <= g_conf.debug || x <= g_conf.debug_objecter) cerr << dbeginl << g_clock.now() << " " << messenger->get_myname() << ".objecter "
+#define dout(x)  if (x <= g_conf.debug || x <= g_conf.debug_objecter) *_dout << dbeginl << g_clock.now() << " " << messenger->get_myname() << ".objecter "
+#define derr(x)  if (x <= g_conf.debug || x <= g_conf.debug_objecter) *_derr << dbeginl << g_clock.now() << " " << messenger->get_myname() << ".objecter "
 
 
 // messages ------------------------------