From: Jesse Williamson Date: Wed, 24 May 2017 11:33:24 +0000 (-0700) Subject: compile fixups for dout X-Git-Tag: v12.1.0~229^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c93daaf92b643a06a822558973d377733dbd9d85;p=ceph.git compile fixups for dout Signed-off-by: Jesse Williamson --- diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index ad82aaefafe..36017139eed 100644 --- 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 aca08bbffe0..7ee366da1c9 100644 --- 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 153dc34cdf3..88e8f68c7ac 100644 --- 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 ac23a9f9028..688ce7ff1de 100644 --- 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 290fde65134..eb2e09da1ae 100644 --- 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 9df32239bd0..d1f91364b52 100644 --- 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 0b554402bf7..b2c20da0645 100644 --- 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 73d1a110d02..010046d3011 100644 --- 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 5579e34825a..da8376771cf 100644 --- 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 6ab2862dc41..76e4e2ee617 100644 --- 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("ms_type") : cct->_conf->ms_public_type; diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc index 0422b4e26b7..cfd79667669 100644 --- 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 2a31eccc4e5..e2b807c4d03 100644 --- 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 013eba05525..dd78bd4902d 100644 --- 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 - #include #include +#include + #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 0500ec0bef8..20c64590ea7 100644 --- 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 8f5fd81d3dc..349719e468a 100644 --- 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 77cb4b7a963..eefbe4968fc 100644 --- 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 "