From: Kefu Chai <kchai@redhat.com>
Date: Thu, 8 Jun 2017 03:21:11 +0000 (+0800)
Subject: msg,common: do not include assert.h everywhere to clobber <assert.h>
X-Git-Tag: v12.1.0~209^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28c83737345e9b9547a87105ab4d32b6f636bd4b;p=ceph.git

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 3cd2e9133ec..5be9b04bb88 100644
--- 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 7de4cbf67c4..35afc24ab17 100644
--- 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 aa5713d0b6e..0d5d6305425 100644
--- 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 1cd6dabcb2c..fec82d44c5d 100644
--- 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 baf5ceba13f..0e48b8c8f66 100644
--- 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 4febc74a75f..823da640860 100644
--- 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 62167e3971a..a4126369fa1 100644
--- a/src/json_spirit/json_spirit_value.h
+++ b/src/json_spirit/json_spirit_value.h
@@ -13,7 +13,6 @@
 #include <vector>
 #include <map>
 #include <string>
-#include <cassert>
 #include <sstream>
 #include <stdexcept>
 #include <boost/config.hpp> 
diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index 36017139eed..ad82aaefafe 100644
--- 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 7ee366da1c9..ed7d1096bc3 100644
--- 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 4edc1d7b75f..60612cb90b5 100644
--- 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 faa60a77659..99d486192cd 100644
--- 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 eb2e09da1ae..290fde65134 100644
--- 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 ad1e96a2d58..dc4daed1b59 100644
--- 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 e27fff4fffa..282bd4f37ec 100644
--- 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 983200e476e..6f9ab9e4ad6 100644
--- 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 09535090964..8232ba39c43 100644
--- 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 76e4e2ee617..6ab2862dc41 100644
--- 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 cfd79667669..cf52db9a775 100644
--- 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 e2b807c4d03..2a31eccc4e5 100644
--- 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 dd78bd4902d..e732f08e9f3 100644
--- 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 18a13267a8b..7fa4c5ba944 100644
--- 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 349719e468a..8f5fd81d3dc 100644
--- 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 eefbe4968fc..77cb4b7a963 100644
--- 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 "