msg,common: do not include assert.h everywhere to clobber <assert.h>

* reverts c93daaf92b643a06a822558973d377733dbd9d85
* add "#include "include/assert.h" to where <cassert> or <assert.h> are
  included, or avoid including them if possible.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/Finisher.cc b/src/common/Finisher.cc
index 3cd2e9133ecb753d004c08e0fdca9c45adc8129a..5be9b04bb8836789a0c345293dfe9edd223b5d8a 100644 (file)
--- a/src/common/Finisher.cc
+++ b/src/common/Finisher.cc
@@ -3,11 +3,6 @@
 
 #include "Finisher.h"
 
-#include "common/debug.h"
-
-// re-include our assert to clobber the system one; fix dout:
-#include "include/assert.h"
-
 #define dout_subsys ceph_subsys_finisher
 #undef dout_prefix
 #define dout_prefix *_dout << "finisher(" << this << ") "

diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h
index 7de4cbf67c4671d545350a797cc7f9aad514edb2..35afc24ab17a1b5d36e9131503ddbc33c0eae1b5 100644 (file)
--- a/src/common/cmdparse.h
+++ b/src/common/cmdparse.h
@@ -3,10 +3,11 @@
 #ifndef CEPH_COMMON_CMDPARSE_H
 #define CEPH_COMMON_CMDPARSE_H
 
-#include <boost/variant.hpp>
 #include <vector>
 #include <stdexcept>
 #include <ostream>
+#include <boost/variant.hpp>
+#include "include/assert.h"    // boost clobbers this
 #include "common/Formatter.h"
 #include "common/BackTrace.h"
 

diff --git a/src/common/perf_histogram.h b/src/common/perf_histogram.h
index aa5713d0b6e032a67487812d991c0f21b2f28d7d..0d5d630542571574bcaf2588cf2dd8d1b228461b 100644 (file)
--- a/src/common/perf_histogram.h
+++ b/src/common/perf_histogram.h
@@ -18,10 +18,10 @@
 #include <array>
 #include <atomic>
 #include <memory>
-#include <cassert>
 
 #include "common/Formatter.h"
 #include "include/int_types.h"
+#include "include/assert.h"
 
 class PerfHistogramCommon {
 public:

diff --git a/src/compressor/Compressor.h b/src/compressor/Compressor.h
index 1cd6dabcb2cecb40bf408c9966b215fedb7b07ba..fec82d44c5d305ccbdfa8b57f7684dc5df66b0d7 100644 (file)
--- a/src/compressor/Compressor.h
+++ b/src/compressor/Compressor.h
@@ -16,10 +16,10 @@
 #define CEPH_COMPRESSOR_H
 
 
-#include <boost/optional.hpp>
 #include <memory>
 #include <string>
-
+#include <boost/optional.hpp>
+#include "include/assert.h"    // boost clobbers this
 #include "include/buffer.h"
 #include "include/int_types.h"
 

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index baf5ceba13f6f9a2b323643fe681cf7daa885f18..0e48b8c8f668d9ff379e8f5b61e24df5b5c40f9e 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -20,13 +20,13 @@ extern "C" {
 #include "builder.h"
 }
 
+#include "include/assert.h"
 #include "include/err.h"
 #include "include/encoding.h"
 
 
 #include "common/Mutex.h"
 
-#include "include/assert.h"
 #define BUG_ON(x) assert(!(x))
 
 namespace ceph {

diff --git a/src/include/denc.h b/src/include/denc.h
index 4febc74a75f8678560633fd1e35041600e056dce..823da640860b7ca5f09ea88b3f47708c7670203c 100644 (file)
--- a/src/include/denc.h
+++ b/src/include/denc.h
@@ -37,6 +37,7 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/optional.hpp>
 
+#include "include/assert.h"    // boost clobbers this
 #include "include/intarith.h"
 #include "include/int_types.h"
 #include "include/memory.h"

diff --git a/src/json_spirit/json_spirit_value.h b/src/json_spirit/json_spirit_value.h
index 62167e3971a09c84f3500cd5b2aef15ae3de6056..a4126369fa150d5dd3a81b00bf5b472c8f6a650d 100644 (file)
--- a/src/json_spirit/json_spirit_value.h
+++ b/src/json_spirit/json_spirit_value.h
@@ -13,7 +13,6 @@
 #include <vector>\r
 #include <map>\r
 #include <string>\r
-#include <cassert>\r
 #include <sstream>\r
 #include <stdexcept>\r
 #include <boost/config.hpp> \r

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index 36017139eeda52b12d9d99aecb6eb8c1be91adea..ad82aaefafebbb55d6888534ebde10a98557f844 100644 (file)
--- a/src/mds/PurgeQueue.cc
+++ b/src/mds/PurgeQueue.cc
@@ -19,8 +19,6 @@
 
 #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 7ee366da1c9d2506a404deb5d123cbda5d36aef4..ed7d1096bc374b43066c585a05ace4749c16c083 100644 (file)
--- a/src/mds/RecoveryQueue.cc
+++ b/src/mds/RecoveryQueue.cc
@@ -20,9 +20,6 @@
 
 #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
 #undef dout_prefix

diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc
index 4edc1d7b75f7a31597fa2605a4beb867ee56dd08..60612cb90b500a6db5f593119ed21475117642a8 100644 (file)
--- a/src/mgr/ClusterState.cc
+++ b/src/mgr/ClusterState.cc
@@ -17,9 +17,6 @@
 
 #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 faa60a77659ce45d3fd223b4284167a5b1581ba2..99d486192cdd52c74104683050d98e6b6f076844 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -25,9 +25,6 @@
 #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 eb2e09da1ae3e6f764a3dc3672b7f04ca7961167..290fde6513453ebccdc2e1df74ecf17447128120 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -13,9 +13,6 @@
 
 #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 ad1e96a2d5823566014d7942d70c1a5f8ca2109d..dc4daed1b59c840dc2f5a7380f5abbaafb74f0eb 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -33,9 +33,6 @@
 
 #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 e27fff4fffac59045241a1be4340c39ab83b6090..282bd4f37ecb0b5094f25279bcf28d58cb7137ef 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -25,9 +25,6 @@
 #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 983200e476e06c6454861316d18894db50ca846b..6f9ab9e4ad67aa1313446aa77c4bf7ca8b2bd78c 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -39,9 +39,6 @@
 #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
 #define dout_prefix *_dout << "monclient" << (_hunting() ? "(hunting)":"") << ": "

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 095350909643ddde9f77350088ac8d20945b8c00..8232ba39c438a341ae12175ca47fbe9d2712c79a 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -191,9 +191,6 @@ 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 76e4e2ee61757215f60f79314a11993c3181781b..6ab2862dc412a1948977d38da92142df97f38458 100644 (file)
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -14,9 +14,6 @@
 #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 cfd7966766932af62367701b53760338b4dbc803..cf52db9a775cb73e83bbcbc94090a080a123747a 100644 (file)
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -32,9 +32,6 @@
 #include "common/dout.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 e2b807c4d03d72a5474ee91297e0d185dcd2e883..2a31eccc4e5632d55878d967cdb9add7c3131ba3 100644 (file)
--- a/src/msg/async/rdma/Infiniband.cc
+++ b/src/msg/async/rdma/Infiniband.cc
@@ -19,9 +19,6 @@
 #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 dd78bd4902db5f498649100ecd919e8a3486f5bf..e732f08e9f397d420844e91e35f13f4c5d11d130 100644 (file)
--- a/src/msg/async/rdma/Infiniband.h
+++ b/src/msg/async/rdma/Infiniband.h
@@ -26,12 +26,9 @@
 #include "include/page.h"
 #include "common/debug.h"
 #include "common/errno.h"
+#include "common/Mutex.h"
 #include "msg/msg_types.h"
 #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) \

diff --git a/src/msg/async/rdma/RDMAConnectedSocketImpl.cc b/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
index 18a13267a8bdbd325c8260981f3cc3160b59bfce..7fa4c5ba944417e5e5ce47ba8369696c5daeec86 100644 (file)
--- a/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
@@ -16,9 +16,6 @@
 
 #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 349719e468a382836c680a04cb64c0fd04cb28e0..8f5fd81d3dc751eab08adf86f2a031979c1c3dd3 100644 (file)
--- a/src/msg/async/rdma/RDMAServerSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAServerSocketImpl.cc
@@ -17,9 +17,6 @@
 #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 eefbe4968fc88e695ef5cefc47631ecc754da7fc..77cb4b7a9630209d949960cd7ab52c063043da66 100644 (file)
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -23,9 +23,6 @@
 #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 "