compile fixups for dout

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index ad82aaefafebbb55d6888534ebde10a98557f844..36017139eeda52b12d9d99aecb6eb8c1be91adea 100644 (file)
--- a/src/mds/PurgeQueue.cc
+++ b/src/mds/PurgeQueue.cc
@@ -19,6 +19,8 @@
 
 #include "PurgeQueue.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_context cct
 #define dout_subsys ceph_subsys_mds

diff --git a/src/mds/RecoveryQueue.cc b/src/mds/RecoveryQueue.cc
index aca08bbffe010512699917bc5f5a2e8b9d08e93e..7ee366da1c9d2506a404deb5d123cbda5d36aef4 100644 (file)
--- a/src/mds/RecoveryQueue.cc
+++ b/src/mds/RecoveryQueue.cc
@@ -20,6 +20,8 @@
 
 #include "RecoveryQueue.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds

diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc
index 153dc34cdf3607061fc4b0a6884f2144b2cfe425..88e8f68c7ac56d5e37c7d8afaddaa788f08c9737 100644 (file)
--- a/src/mgr/ClusterState.cc
+++ b/src/mgr/ClusterState.cc
@@ -16,6 +16,9 @@
 
 #include "mgr/ClusterState.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index ac23a9f90287959a1375b38b70752dd2cce324e8..688ce7ff1de45267cb379f3c736a31d38e539ce0 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -24,6 +24,9 @@
 #include "messages/MPGStats.h"
 #include "messages/MOSDScrub.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index 290fde6513453ebccdc2e1df74ecf17447128120..eb2e09da1ae3e6f764a3dc3672b7f04ca7961167 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -13,6 +13,9 @@
 
 #include "DaemonState.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 9df32239bd0bc04b8e6f225558a45c8139755d87..d1f91364b52ffc4eb007207020d9d3ab54451af7 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -33,6 +33,9 @@
 
 #include "Mgr.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
 #undef dout_prefix

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 0b554402bf7d4184229c0473cd4dccc1ced4815a..b2c20da06450425c88be14ef3319b2d05793782a 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -25,6 +25,9 @@
 #include "messages/MCommandReply.h"
 #include "messages/MPGStats.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_mgrc
 #undef dout_prefix
 #define dout_prefix *_dout << "mgrc " << __func__ << " "

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 73d1a110d0241c9e1b410c55c211c643eea50415..010046d30117b145267fe3460fc618884fe8979a 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -39,6 +39,8 @@
 #include "auth/AuthMethodList.h"
 #include "auth/RotatingKeyRing.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
 
 #define dout_subsys ceph_subsys_monc
 #undef dout_prefix

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 5579e34825a04ded217ec9e0fce2c17eb4dfbc9c..da8376771cfa92336a18afd47af49f1f3b93673c 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -190,6 +190,9 @@ using namespace std;
 
 #define DEBUGLVL  10    // debug level of output
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 
 void Message::encode(uint64_t features, int crcflags)

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index 6ab2862dc412a1948977d38da92142df97f38458..76e4e2ee61757215f60f79314a11993c3181781b 100644 (file)
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -14,6 +14,9 @@
 #include "msg/xio/XioMessenger.h"
 #endif
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 Messenger *Messenger::create_client_messenger(CephContext *cct, string lname)
 {
   std::string public_msgr_type = cct->_conf->ms_public_type.empty() ? cct->_conf->get_val<std::string>("ms_type") : cct->_conf->ms_public_type;

diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index 0422b4e26b7170bff4b22922c0b8343027837da1..cfd7966766932af62367701b53760338b4dbc803 100644 (file)
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -30,9 +30,11 @@
 #include "common/errno.h"
 #include "common/strtol.h"
 #include "common/dout.h"
-#include "include/assert.h"
 #include "common/simple_spin.h"
 
+// re-include our assert to clobber the system one; fix dout:
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "PosixStack "

diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc
index 2a31eccc4e5632d55878d967cdb9add7c3131ba3..e2b807c4d03d72a5474ee91297e0d185dcd2e883 100644 (file)
--- a/src/msg/async/rdma/Infiniband.cc
+++ b/src/msg/async/rdma/Infiniband.cc
@@ -19,6 +19,9 @@
 #include "common/debug.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "Infiniband "

diff --git a/src/msg/async/rdma/Infiniband.h b/src/msg/async/rdma/Infiniband.h
index 013eba055256238462ae17550702d509ae38e737..dd78bd4902db5f498649100ecd919e8a3486f5bf 100644 (file)
--- a/src/msg/async/rdma/Infiniband.h
+++ b/src/msg/async/rdma/Infiniband.h
@@ -17,11 +17,11 @@
 #ifndef CEPH_INFINIBAND_H
 #define CEPH_INFINIBAND_H
 
-#include <infiniband/verbs.h>
-
 #include <string>
 #include <vector>
 
+#include <infiniband/verbs.h>
+
 #include "include/int_types.h"
 #include "include/page.h"
 #include "common/debug.h"
@@ -30,6 +30,9 @@
 #include "msg/async/net_handler.h"
 #include "common/Mutex.h"
 
+// re-include our assert to clobber the system one; fix dout:
+#include "include/assert.h"
+
 #define HUGE_PAGE_SIZE (2 * 1024 * 1024)
 #define ALIGN_TO_PAGE_SIZE(x) \
   (((x) + HUGE_PAGE_SIZE -1) / HUGE_PAGE_SIZE * HUGE_PAGE_SIZE)

diff --git a/src/msg/async/rdma/RDMAConnectedSocketImpl.cc b/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
index 0500ec0bef87aeae4efd7c6ceb0e32ae9c8e9c2f..20c64590ea76a11b33217c92aab2abcfd027830f 100644 (file)
--- a/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
@@ -16,6 +16,9 @@
 
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << " RDMAConnectedSocketImpl "

diff --git a/src/msg/async/rdma/RDMAServerSocketImpl.cc b/src/msg/async/rdma/RDMAServerSocketImpl.cc
index 8f5fd81d3dc751eab08adf86f2a031979c1c3dd3..349719e468a382836c680a04cb64c0fd04cb28e0 100644 (file)
--- a/src/msg/async/rdma/RDMAServerSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAServerSocketImpl.cc
@@ -17,6 +17,9 @@
 #include "msg/async/net_handler.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << " RDMAServerSocketImpl "

diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
index 77cb4b7a9630209d949960cd7ab52c063043da66..eefbe4968fc88e695ef5cefc47631ecc754da7fc 100644 (file)
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -23,6 +23,9 @@
 #include "common/Tub.h"
 #include "RDMAStack.h"
 
+// reinclude our assert to clobber the system one
+#include "include/assert.h"
+
 #define dout_subsys ceph_subsys_ms
 #undef dout_prefix
 #define dout_prefix *_dout << "RDMAStack "