From: Brad Hubbard Date: Fri, 14 Sep 2018 04:22:00 +0000 (+1000) Subject: Rename "include/assert.h" X-Git-Tag: v14.0.1~264^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24098%2Fhead;p=ceph.git Rename "include/assert.h" This conflicts with the system assert.h so rename and change includes to reflect the new name. Fixes: http://tracker.ceph.com/issues/35682 Signed-off-by: Brad Hubbard --- diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index b94b7949f44a..bd0ee383d87f 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -20,7 +20,7 @@ # include #endif -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Clock.h" #include "common/armor.h" #include "common/ceph_context.h" diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 9e5d49960545..010a441d7d59 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -47,7 +47,7 @@ #include "perfglue/heap_profiler.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index eb0152d7f51d..adee3ec31822 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -43,7 +43,7 @@ #include "perfglue/heap_profiler.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_mon diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3974792382fd..0cd40fa5dc94 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -45,7 +45,7 @@ #include "perfglue/heap_profiler.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Preforker.h" diff --git a/src/client/Client.cc b/src/client/Client.cc index 6d177a715789..52e7adc266ca 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -93,7 +93,7 @@ #include "ObjecterWriteback.h" #include "posix_acl.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stat.h" #include "include/cephfs/ceph_statx.h" diff --git a/src/client/Inode.h b/src/client/Inode.h index b3b5b6e4be0b..41c4e611025a 100644 --- a/src/client/Inode.h +++ b/src/client/Inode.h @@ -6,7 +6,7 @@ #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/types.h" #include "include/xlist.h" diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc index ed74923a7291..f511168386f7 100644 --- a/src/client/SyntheticClient.cc +++ b/src/client/SyntheticClient.cc @@ -35,7 +35,7 @@ #include #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/cephfs/ceph_statx.h" #define dout_context g_ceph_context diff --git a/src/client/barrier.cc b/src/client/barrier.cc index 3f2937c2063e..260384499b99 100644 --- a/src/client/barrier.cc +++ b/src/client/barrier.cc @@ -18,7 +18,7 @@ #include "include/Context.h" #include "Client.h" #include "barrier.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #undef dout_prefix #define dout_prefix *_dout << "client." << whoami << " " diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc index b112ec7488ce..47140c784dab 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -32,7 +32,7 @@ #include "Fh.h" #include "ioctl.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/cephfs/ceph_statx.h" #include "fuse_ll.h" diff --git a/src/common/Graylog.h b/src/common/Graylog.h index 70cd770504eb..6e5a22972470 100644 --- a/src/common/Graylog.h +++ b/src/common/Graylog.h @@ -8,7 +8,7 @@ #include #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this struct uuid_d; class LogEntry; diff --git a/src/common/Mutex.h b/src/common/Mutex.h index b02ac3e38ab9..2784319295f5 100644 --- a/src/common/Mutex.h +++ b/src/common/Mutex.h @@ -15,7 +15,7 @@ #ifndef CEPH_MUTEX_H #define CEPH_MUTEX_H -#include "include/assert.h" +#include "include/ceph_assert.h" #include "lockdep.h" #include diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc index bbee667f329f..9752ce318cc2 100644 --- a/src/common/OutputDataSocket.cc +++ b/src/common/OutputDataSocket.cc @@ -22,7 +22,7 @@ #include // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_asok #undef dout_prefix diff --git a/src/common/Preforker.h b/src/common/Preforker.h index f9e1de170f3e..a4d7af8f9a00 100644 --- a/src/common/Preforker.h +++ b/src/common/Preforker.h @@ -8,7 +8,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/safe_io.h" #include "common/errno.h" diff --git a/src/common/PrioritizedQueue.h b/src/common/PrioritizedQueue.h index aade0b91b4f7..2e86d1069ff4 100644 --- a/src/common/PrioritizedQueue.h +++ b/src/common/PrioritizedQueue.h @@ -15,7 +15,7 @@ #ifndef PRIORITY_QUEUE_H #define PRIORITY_QUEUE_H -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Formatter.h" #include "common/OpQueue.h" diff --git a/src/common/RWLock.h b/src/common/RWLock.h index 8a5a0e820764..94ba7a001164 100644 --- a/src/common/RWLock.h +++ b/src/common/RWLock.h @@ -19,7 +19,7 @@ #include #include -#include +#include "include/ceph_assert.h" #include "acconfig.h" #include "lockdep.h" #include "common/valgrind.h" diff --git a/src/common/RefCountedObj.h b/src/common/RefCountedObj.h index 510a6682f988..e840e4082d65 100644 --- a/src/common/RefCountedObj.h +++ b/src/common/RefCountedObj.h @@ -23,7 +23,7 @@ #include // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" struct RefCountedObject { private: diff --git a/src/common/SubProcess.cc b/src/common/SubProcess.cc index 1190e6df70ce..2bc1cf413a12 100644 --- a/src/common/SubProcess.cc +++ b/src/common/SubProcess.cc @@ -9,7 +9,7 @@ #include #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" SubProcess::SubProcess(const char *cmd_, std_fd_op stdin_op_, std_fd_op stdout_op_, std_fd_op stderr_op_) : cmd(cmd_), diff --git a/src/common/TextTable.h b/src/common/TextTable.h index c60ba5f4490e..53ae4b9f38ad 100644 --- a/src/common/TextTable.h +++ b/src/common/TextTable.h @@ -17,7 +17,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" /** * TextTable: diff --git a/src/common/Throttle.cc b/src/common/Throttle.cc index 3186d8a22cba..4dac8fb7444f 100644 --- a/src/common/Throttle.cc +++ b/src/common/Throttle.cc @@ -9,7 +9,7 @@ // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_throttle diff --git a/src/common/WeightedPriorityQueue.h b/src/common/WeightedPriorityQueue.h index 9ab8875ee246..877187d8015e 100644 --- a/src/common/WeightedPriorityQueue.h +++ b/src/common/WeightedPriorityQueue.h @@ -21,7 +21,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" namespace bi = boost::intrusive; diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc index a4567120aca4..decb8c3b8f54 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -25,7 +25,7 @@ // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_asok #undef dout_prefix diff --git a/src/common/async/detail/shared_mutex.h b/src/common/async/detail/shared_mutex.h index 1a79a69d4e14..8e5436350cfd 100644 --- a/src/common/async/detail/shared_mutex.h +++ b/src/common/async/detail/shared_mutex.h @@ -23,7 +23,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/async/completion.h" diff --git a/src/common/autovector.h b/src/common/autovector.h index 503e239ce773..f52a585f2a08 100644 --- a/src/common/autovector.h +++ b/src/common/autovector.h @@ -13,7 +13,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" // A vector that leverages pre-allocated stack-based array to achieve better // performance for array with small amount of items. diff --git a/src/common/bit_str.cc b/src/common/bit_str.cc index 5f72d9983f7f..f14b2daad9c5 100644 --- a/src/common/bit_str.cc +++ b/src/common/bit_str.cc @@ -13,7 +13,7 @@ */ #include "common/bit_str.h" #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" static void _dump_bit_str( uint64_t bits, diff --git a/src/common/bit_vector.hpp b/src/common/bit_vector.hpp index a07dc83b5322..8c6fab4452fc 100644 --- a/src/common/bit_vector.hpp +++ b/src/common/bit_vector.hpp @@ -12,7 +12,7 @@ #define BIT_VECTOR_HPP #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/encoding.h" #include diff --git a/src/common/bounded_key_counter.h b/src/common/bounded_key_counter.h index e146a31f8763..ee7fa304a191 100644 --- a/src/common/bounded_key_counter.h +++ b/src/common/bounded_key_counter.h @@ -22,7 +22,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" /** * BoundedKeyCounter diff --git a/src/common/buffer.cc b/src/common/buffer.cc index d5bf6703228b..35e8c84d7117 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -18,7 +18,7 @@ #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/types.h" #include "include/buffer_raw.h" #include "include/compat.h" diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h index 909044208016..2234e9c05819 100644 --- a/src/common/ceph_crypto.h +++ b/src/common/ceph_crypto.h @@ -19,7 +19,7 @@ // the crypto operations. We don't want to contaminate too much code // with error checking, and just say these really should never fail. // This assert MUST NOT be compiled out, even on non-debug builds. -# include "include/assert.h" +# include "include/ceph_assert.h" namespace ceph { namespace crypto { diff --git a/src/common/ceph_time.h b/src/common/ceph_time.h index 79f410095423..8b300e215894 100644 --- a/src/common/ceph_time.h +++ b/src/common/ceph_time.h @@ -20,7 +20,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #if defined(__APPLE__) #include diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h index 761d468b5277..ee3844fb8fbd 100644 --- a/src/common/cmdparse.h +++ b/src/common/cmdparse.h @@ -7,7 +7,7 @@ #include #include #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this #include "common/Formatter.h" #include "common/BackTrace.h" diff --git a/src/common/convenience.h b/src/common/convenience.h index 3989c70d1043..c230288675f7 100644 --- a/src/common/convenience.h +++ b/src/common/convenience.h @@ -23,7 +23,7 @@ #include "common/shunique_lock.h" -#include "include/assert.h" // I despise you. Not you the reader, I'm talking +#include "include/ceph_assert.h" // I despise you. Not you the reader, I'm talking // to the include file. diff --git a/src/common/dout.h b/src/common/dout.h index a98dcfa3e1ef..e8ec17338330 100644 --- a/src/common/dout.h +++ b/src/common/dout.h @@ -18,7 +18,7 @@ #include -#include "include/assert.h" +#include "include/ceph_assert.h" #ifdef WITH_SEASTAR #include #include "crimson/common/log.h" diff --git a/src/common/fork_function.h b/src/common/fork_function.h index 137d9e6373d6..6f533c87f934 100644 --- a/src/common/fork_function.h +++ b/src/common/fork_function.h @@ -11,7 +11,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/errno.h" static void _fork_function_dummy_sighandler(int sig) {} diff --git a/src/common/hobject.h b/src/common/hobject.h index b9f277bc8ef2..e04c378c85cc 100644 --- a/src/common/hobject.h +++ b/src/common/hobject.h @@ -19,7 +19,7 @@ #include "include/cmp.h" #include "json_spirit/json_spirit_value.h" -#include "include/assert.h" // spirit clobbers it! +#include "include/ceph_assert.h" // spirit clobbers it! #include "reverse.h" diff --git a/src/common/mClockPriorityQueue.h b/src/common/mClockPriorityQueue.h index 1e07ba92d4a4..5a87de35f515 100644 --- a/src/common/mClockPriorityQueue.h +++ b/src/common/mClockPriorityQueue.h @@ -27,7 +27,7 @@ // the following is done to unclobber _ASSERT_H so it returns to the // way ceph likes it -#include "include/assert.h" +#include "include/ceph_assert.h" namespace ceph { diff --git a/src/common/mutex_debug.h b/src/common/mutex_debug.h index e19344e88445..d4a60f7181bf 100644 --- a/src/common/mutex_debug.h +++ b/src/common/mutex_debug.h @@ -20,7 +20,7 @@ #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "ceph_time.h" #include "likely.h" diff --git a/src/common/perf_histogram.h b/src/common/perf_histogram.h index dc4832e36499..3052106be20f 100644 --- a/src/common/perf_histogram.h +++ b/src/common/perf_histogram.h @@ -21,7 +21,7 @@ #include "common/Formatter.h" #include "include/int_types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class PerfHistogramCommon { public: diff --git a/src/common/shared_cache.hpp b/src/common/shared_cache.hpp index e728984d6a2f..5aa4963722d0 100644 --- a/src/common/shared_cache.hpp +++ b/src/common/shared_cache.hpp @@ -25,7 +25,7 @@ #include "include/unordered_map.h" // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" template diff --git a/src/compressor/Compressor.h b/src/compressor/Compressor.h index d09c916f377f..a696521ad674 100644 --- a/src/compressor/Compressor.h +++ b/src/compressor/Compressor.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this #include "include/buffer.h" #include "include/int_types.h" #ifdef HAVE_QATZIP diff --git a/src/crimson/common/assert.cc b/src/crimson/common/assert.cc index 9b34cb529029..9ed6b7e3bc37 100644 --- a/src/crimson/common/assert.cc +++ b/src/crimson/common/assert.cc @@ -3,7 +3,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "crimson/common/log.h" diff --git a/src/crimson/thread/ThreadPool.cc b/src/crimson/thread/ThreadPool.cc index 0154344c212c..9df849b54c79 100644 --- a/src/crimson/thread/ThreadPool.cc +++ b/src/crimson/thread/ThreadPool.cc @@ -4,7 +4,7 @@ #include "crimson/net/Config.h" #include "include/intarith.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace ceph::thread { diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index ba43e296dda3..74e23065b761 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -20,7 +20,7 @@ extern "C" { #include "builder.h" } -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/err.h" #include "include/encoding.h" #include "include/mempool.h" diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc index cf8e5cadd1cb..fec86a9ac2ce 100644 --- a/src/erasure-code/isa/ErasureCodeIsa.cc +++ b/src/erasure-code/isa/ErasureCodeIsa.cc @@ -19,7 +19,7 @@ #include "common/debug.h" #include "ErasureCodeIsa.h" #include "xor_op.h" -#include "include/assert.h" +#include "include/ceph_assert.h" using namespace std; // ----------------------------------------------------------------------------- diff --git a/src/erasure-code/isa/xor_op.cc b/src/erasure-code/isa/xor_op.cc index 5ddcced8c796..2b56e977c7fd 100644 --- a/src/erasure-code/isa/xor_op.cc +++ b/src/erasure-code/isa/xor_op.cc @@ -16,7 +16,7 @@ #include #include "arch/intel.h" -#include "include/assert.h" +#include "include/ceph_assert.h" // ----------------------------------------------------------------------------- diff --git a/src/erasure-code/lrc/ErasureCodeLrc.cc b/src/erasure-code/lrc/ErasureCodeLrc.cc index 772704522774..2526774c38ac 100644 --- a/src/erasure-code/lrc/ErasureCodeLrc.cc +++ b/src/erasure-code/lrc/ErasureCodeLrc.cc @@ -29,7 +29,7 @@ #include "ErasureCodeLrc.h" // re-include our assert to clobber boost's -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd diff --git a/src/global/global_init.h b/src/global/global_init.h index 2c4bf2ebbc63..fe6f557bb253 100644 --- a/src/global/global_init.h +++ b/src/global/global_init.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/code_environment.h" #include "common/common_init.h" diff --git a/src/include/Context.h b/src/include/Context.h index b5e582702f60..050a7fdfbb9c 100644 --- a/src/include/Context.h +++ b/src/include/Context.h @@ -23,7 +23,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define mydout(cct, v) lgeneric_subdout(cct, context, v) diff --git a/src/include/assert.h b/src/include/assert.h deleted file mode 100644 index 5fb985503ad9..000000000000 --- a/src/include/assert.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef CEPH_ASSERT_H -#define CEPH_ASSERT_H - -#include -#include - -#if defined(__linux__) -#include - -#ifndef __STRING -# define __STRING(x) #x -#endif - -#elif defined(__FreeBSD__) -#include -#define __GNUC_PREREQ(minor, major) __GNUC_PREREQ__(minor, major) -#elif defined(__sun) || defined(_AIX) -#include "include/compat.h" -#include -#endif - -#ifdef __CEPH__ -# include "acconfig.h" -#endif - -class CephContext; - -namespace ceph { - -struct BackTrace; - -/* - * For GNU, test specific version features. Otherwise (e.g. LLVM) we'll use - * the defaults selected below. - */ -#ifdef __GNUC_PREREQ - -/* - * Version 2.4 and later of GCC define a magical variable - * `__PRETTY_FUNCTION__' which contains the name of the function currently - * being defined. This is broken in G++ before version 2.6. C9x has a - * similar variable called __func__, but prefer the GCC one since it demangles - * C++ function names. We define __CEPH_NO_PRETTY_FUNC if we want to avoid - * broken versions of G++. - */ -# if defined __cplusplus ? !__GNUC_PREREQ (2, 6) : !__GNUC_PREREQ (2, 4) -# define __CEPH_NO_PRETTY_FUNC -# endif - -#endif - -/* - * Select a function-name variable based on compiler tests, and any compiler - * specific overrides. - */ -#if defined(HAVE_PRETTY_FUNC) && !defined(__CEPH_NO_PRETTY_FUNC) -# define __CEPH_ASSERT_FUNCTION __PRETTY_FUNCTION__ -#elif defined(HAVE_FUNC) -# define __CEPH_ASSERT_FUNCTION __func__ -#else -# define __CEPH_ASSERT_FUNCTION ((__const char *) 0) -#endif - -extern void register_assert_context(CephContext *cct); - -struct assert_data { - const char *assertion; - const char *file; - const int line; - const char *function; -}; - -extern void __ceph_assert_fail(const char *assertion, const char *file, int line, const char *function) - __attribute__ ((__noreturn__)); -extern void __ceph_assert_fail(const assert_data &ctx) - __attribute__ ((__noreturn__)); - -extern void __ceph_assertf_fail(const char *assertion, const char *file, int line, const char *function, const char* msg, ...) - __attribute__ ((__noreturn__)); -extern void __ceph_assert_warn(const char *assertion, const char *file, int line, const char *function); - -[[noreturn]] void __ceph_abort(const char *file, int line, const char *func, - const std::string& msg); - -[[noreturn]] void __ceph_abortf(const char *file, int line, const char *func, - const char* msg, ...); - -#define _CEPH_ASSERT_VOID_CAST static_cast - -#define assert_warn(expr) \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION)) - -} - -using namespace ceph; - - -/* - * ceph_abort aborts the program with a nice backtrace. - * - * Currently, it's the same as assert(0), but we may one day make assert a - * debug-only thing, like it is in many projects. - */ -#define ceph_abort(msg, ...) \ - __ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, "abort() called") - -#define ceph_abort_msg(msg) \ - __ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, msg) - -#define ceph_abort_msgf(...) \ - __ceph_abortf( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__) - -#define ceph_assert(expr) \ - do { static const ceph::assert_data assert_data_ctx = \ - {__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION}; \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assert_fail(assert_data_ctx)); } while(false) - -// this variant will *never* get compiled out to NDEBUG in the future. -// (ceph_assert currently doesn't either, but in the future it might.) -#define ceph_assert_always(expr) \ - do { static const ceph::assert_data assert_data_ctx = \ - {__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION}; \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assert_fail(assert_data_ctx)); } while(false) - -// Named by analogy with printf. Along with an expression, takes a format -// string and parameters which are printed if the assertion fails. -#define assertf(expr, ...) \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) -#define ceph_assertf(expr, ...) \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) - -// this variant will *never* get compiled out to NDEBUG in the future. -// (ceph_assertf currently doesn't either, but in the future it might.) -#define ceph_assertf_always(expr, ...) \ - ((expr) \ - ? _CEPH_ASSERT_VOID_CAST (0) \ - : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) - -#endif diff --git a/src/include/btree_map.h b/src/include/btree_map.h index 28949849a89e..1f42ea41414f 100644 --- a/src/include/btree_map.h +++ b/src/include/btree_map.h @@ -6,7 +6,7 @@ #include "include/cpp-btree/btree.h" #include "include/cpp-btree/btree_map.h" -#include "include/assert.h" // cpp-btree uses system assert, blech +#include "include/ceph_assert.h" // cpp-btree uses system assert, blech #include "include/encoding.h" template diff --git a/src/include/buffer.h b/src/include/buffer.h index 0fdbec51ac9d..3f866e39d2c4 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -55,7 +55,7 @@ #include "buffer_fwd.h" #ifdef __CEPH__ -# include "include/assert.h" +# include "include/ceph_assert.h" #else # include #endif diff --git a/src/include/ceph_assert.h b/src/include/ceph_assert.h new file mode 100644 index 000000000000..5fb985503ad9 --- /dev/null +++ b/src/include/ceph_assert.h @@ -0,0 +1,149 @@ +#ifndef CEPH_ASSERT_H +#define CEPH_ASSERT_H + +#include +#include + +#if defined(__linux__) +#include + +#ifndef __STRING +# define __STRING(x) #x +#endif + +#elif defined(__FreeBSD__) +#include +#define __GNUC_PREREQ(minor, major) __GNUC_PREREQ__(minor, major) +#elif defined(__sun) || defined(_AIX) +#include "include/compat.h" +#include +#endif + +#ifdef __CEPH__ +# include "acconfig.h" +#endif + +class CephContext; + +namespace ceph { + +struct BackTrace; + +/* + * For GNU, test specific version features. Otherwise (e.g. LLVM) we'll use + * the defaults selected below. + */ +#ifdef __GNUC_PREREQ + +/* + * Version 2.4 and later of GCC define a magical variable + * `__PRETTY_FUNCTION__' which contains the name of the function currently + * being defined. This is broken in G++ before version 2.6. C9x has a + * similar variable called __func__, but prefer the GCC one since it demangles + * C++ function names. We define __CEPH_NO_PRETTY_FUNC if we want to avoid + * broken versions of G++. + */ +# if defined __cplusplus ? !__GNUC_PREREQ (2, 6) : !__GNUC_PREREQ (2, 4) +# define __CEPH_NO_PRETTY_FUNC +# endif + +#endif + +/* + * Select a function-name variable based on compiler tests, and any compiler + * specific overrides. + */ +#if defined(HAVE_PRETTY_FUNC) && !defined(__CEPH_NO_PRETTY_FUNC) +# define __CEPH_ASSERT_FUNCTION __PRETTY_FUNCTION__ +#elif defined(HAVE_FUNC) +# define __CEPH_ASSERT_FUNCTION __func__ +#else +# define __CEPH_ASSERT_FUNCTION ((__const char *) 0) +#endif + +extern void register_assert_context(CephContext *cct); + +struct assert_data { + const char *assertion; + const char *file; + const int line; + const char *function; +}; + +extern void __ceph_assert_fail(const char *assertion, const char *file, int line, const char *function) + __attribute__ ((__noreturn__)); +extern void __ceph_assert_fail(const assert_data &ctx) + __attribute__ ((__noreturn__)); + +extern void __ceph_assertf_fail(const char *assertion, const char *file, int line, const char *function, const char* msg, ...) + __attribute__ ((__noreturn__)); +extern void __ceph_assert_warn(const char *assertion, const char *file, int line, const char *function); + +[[noreturn]] void __ceph_abort(const char *file, int line, const char *func, + const std::string& msg); + +[[noreturn]] void __ceph_abortf(const char *file, int line, const char *func, + const char* msg, ...); + +#define _CEPH_ASSERT_VOID_CAST static_cast + +#define assert_warn(expr) \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION)) + +} + +using namespace ceph; + + +/* + * ceph_abort aborts the program with a nice backtrace. + * + * Currently, it's the same as assert(0), but we may one day make assert a + * debug-only thing, like it is in many projects. + */ +#define ceph_abort(msg, ...) \ + __ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, "abort() called") + +#define ceph_abort_msg(msg) \ + __ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, msg) + +#define ceph_abort_msgf(...) \ + __ceph_abortf( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__) + +#define ceph_assert(expr) \ + do { static const ceph::assert_data assert_data_ctx = \ + {__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION}; \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assert_fail(assert_data_ctx)); } while(false) + +// this variant will *never* get compiled out to NDEBUG in the future. +// (ceph_assert currently doesn't either, but in the future it might.) +#define ceph_assert_always(expr) \ + do { static const ceph::assert_data assert_data_ctx = \ + {__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION}; \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assert_fail(assert_data_ctx)); } while(false) + +// Named by analogy with printf. Along with an expression, takes a format +// string and parameters which are printed if the assertion fails. +#define assertf(expr, ...) \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) +#define ceph_assertf(expr, ...) \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) + +// this variant will *never* get compiled out to NDEBUG in the future. +// (ceph_assertf currently doesn't either, but in the future it might.) +#define ceph_assertf_always(expr, ...) \ + ((expr) \ + ? _CEPH_ASSERT_VOID_CAST (0) \ + : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__)) + +#endif diff --git a/src/include/cpp-btree/btree.h b/src/include/cpp-btree/btree.h index 22872b6ba30e..0a40e0e18088 100644 --- a/src/include/cpp-btree/btree.h +++ b/src/include/cpp-btree/btree.h @@ -114,7 +114,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" namespace btree { diff --git a/src/include/denc.h b/src/include/denc.h index b1bd7802ddb6..c8d79f888689 100644 --- a/src/include/denc.h +++ b/src/include/denc.h @@ -38,7 +38,7 @@ #include #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this #include "include/intarith.h" #include "include/int_types.h" diff --git a/src/include/frag.h b/src/include/frag.h index 09cb6e4867e1..8c841ef4fee4 100644 --- a/src/include/frag.h +++ b/src/include/frag.h @@ -25,7 +25,7 @@ #include "ceph_frag.h" #include "include/encoding.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/dout.h" diff --git a/src/include/mempool.h b/src/include/mempool.h index e03a1f907146..155ec18d4382 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -28,7 +28,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compact_map.h" #include "include/compact_set.h" diff --git a/src/include/on_exit.h b/src/include/on_exit.h index 1642c6820405..c412ab33e083 100644 --- a/src/include/on_exit.h +++ b/src/include/on_exit.h @@ -4,7 +4,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" /* * Create a static instance at the file level to get callbacks called when the * process exits via main() or exit(). diff --git a/src/include/xlist.h b/src/include/xlist.h index 0204155e169c..69c6e1c640c0 100644 --- a/src/include/xlist.h +++ b/src/include/xlist.h @@ -19,7 +19,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" template class xlist { diff --git a/src/journal/Future.cc b/src/journal/Future.cc index c2eaa967ac90..89f7fd326e9b 100644 --- a/src/journal/Future.cc +++ b/src/journal/Future.cc @@ -3,7 +3,7 @@ #include "journal/Future.h" #include "journal/FutureImpl.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace journal { diff --git a/src/journal/Future.h b/src/journal/Future.h index 1ddb60656328..fef0015651c8 100644 --- a/src/journal/Future.h +++ b/src/journal/Future.h @@ -8,7 +8,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class Context; diff --git a/src/journal/FutureImpl.h b/src/journal/FutureImpl.h index f44f0e08913e..1f56a4ad5670 100644 --- a/src/journal/FutureImpl.h +++ b/src/journal/FutureImpl.h @@ -12,7 +12,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class Context; diff --git a/src/journal/JournalMetadata.h b/src/journal/JournalMetadata.h index ed063b0237f4..393d20297d83 100644 --- a/src/journal/JournalMetadata.h +++ b/src/journal/JournalMetadata.h @@ -22,7 +22,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class SafeTimer; diff --git a/src/journal/Journaler.h b/src/journal/Journaler.h index c5194ced5124..1424cb757612 100644 --- a/src/journal/Journaler.h +++ b/src/journal/Journaler.h @@ -14,7 +14,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class ContextWQ; class SafeTimer; diff --git a/src/journal/ObjectPlayer.h b/src/journal/ObjectPlayer.h index a3cbe807332f..b9062b832b0d 100644 --- a/src/journal/ObjectPlayer.h +++ b/src/journal/ObjectPlayer.h @@ -16,7 +16,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class SafeTimer; diff --git a/src/journal/ObjectRecorder.cc b/src/journal/ObjectRecorder.cc index bc7b927b8c86..f39ca981cc0c 100644 --- a/src/journal/ObjectRecorder.cc +++ b/src/journal/ObjectRecorder.cc @@ -4,7 +4,7 @@ #include "journal/ObjectRecorder.h" #include "journal/Future.h" #include "journal/Utils.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Timer.h" #include "cls/journal/cls_journal_client.h" diff --git a/src/journal/ObjectRecorder.h b/src/journal/ObjectRecorder.h index 2b754e5be3fe..8d250e5f0423 100644 --- a/src/journal/ObjectRecorder.h +++ b/src/journal/ObjectRecorder.h @@ -16,7 +16,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class SafeTimer; diff --git a/src/json_spirit/json_spirit_reader_template.h b/src/json_spirit/json_spirit_reader_template.h index c0d3b90f0721..59a8a0512653 100644 --- a/src/json_spirit/json_spirit_reader_template.h +++ b/src/json_spirit/json_spirit_reader_template.h @@ -37,7 +37,7 @@ #define spirit_namespace boost::spirit #endif -#include "include/assert.h" +#include "include/ceph_assert.h" namespace json_spirit { diff --git a/src/json_spirit/json_spirit_writer_template.h b/src/json_spirit/json_spirit_writer_template.h index 4eec0b4ea663..2e34268a2c01 100644 --- a/src/json_spirit/json_spirit_writer_template.h +++ b/src/json_spirit/json_spirit_writer_template.h @@ -17,7 +17,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" namespace json_spirit { diff --git a/src/krbd.cc b/src/krbd.cc index 74163c7edddb..d9fa1727d6db 100644 --- a/src/krbd.cc +++ b/src/krbd.cc @@ -33,7 +33,7 @@ #include "common/safe_io.h" #include "common/secret.h" #include "common/TextTable.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "include/krbd.h" #include "mon/MonMap.h" diff --git a/src/kv/KineticStore.h b/src/kv/KineticStore.h index b7c669a66913..b22d4f0218f5 100644 --- a/src/kv/KineticStore.h +++ b/src/kv/KineticStore.h @@ -14,7 +14,7 @@ #include #include "common/errno.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Formatter.h" #include "common/ceph_context.h" diff --git a/src/kv/LevelDBStore.cc b/src/kv/LevelDBStore.cc index fdad594bba32..bdd76e431835 100644 --- a/src/kv/LevelDBStore.cc +++ b/src/kv/LevelDBStore.cc @@ -13,7 +13,7 @@ using std::string; #include "common/perf_counters.h" // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context cct #define dout_subsys ceph_subsys_leveldb diff --git a/src/kv/LevelDBStore.h b/src/kv/LevelDBStore.h index 9700de62f78e..34fdb7a6935b 100644 --- a/src/kv/LevelDBStore.h +++ b/src/kv/LevelDBStore.h @@ -22,14 +22,14 @@ #include #include "common/errno.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Formatter.h" #include "common/Cond.h" #include "common/ceph_context.h" // reinclude our assert to clobber the system one -# include "include/assert.h" +# include "include/ceph_assert.h" class PerfCounters; diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc index cadda26d5716..c648dd9fb515 100644 --- a/src/kv/MemDB.cc +++ b/src/kv/MemDB.cc @@ -22,7 +22,7 @@ #include "KeyValueDB.h" #include "MemDB.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/debug.h" #include "common/errno.h" #include "include/compat.h" diff --git a/src/kv/RocksDBStore.h b/src/kv/RocksDBStore.h index 08477dded929..041474138c1c 100644 --- a/src/kv/RocksDBStore.h +++ b/src/kv/RocksDBStore.h @@ -19,7 +19,7 @@ #include #include "common/errno.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Formatter.h" #include "common/Cond.h" #include "common/ceph_context.h" diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h index 94b76b422a97..0cf9819f8686 100644 --- a/src/kv/rocksdb_cache/BinnedLRUCache.h +++ b/src/kv/rocksdb_cache/BinnedLRUCache.h @@ -16,7 +16,7 @@ #include "ShardedCache.h" #include "common/autovector.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace rocksdb_cache { diff --git a/src/libcephfs.cc b/src/libcephfs.cc index 8773005b0141..1f6ba5cb92b5 100644 --- a/src/libcephfs.cc +++ b/src/libcephfs.cc @@ -29,7 +29,7 @@ #include "include/str_list.h" #include "messages/MMonMap.h" #include "msg/Messenger.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "mds/MDSMap.h" #include "include/cephfs/libcephfs.h" diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index 41ef8f547aa0..cd93c44a9528 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -19,7 +19,7 @@ #include "librados/AioCompletionImpl.h" #include "librados/PoolAsyncCompletionImpl.h" #include "librados/RadosClient.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/valgrind.h" #include "common/EventTrace.h" diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 51d3b9f2cebb..65966ade4a0e 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -47,7 +47,7 @@ #include "PoolAsyncCompletionImpl.h" #include "RadosClient.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/EventTrace.h" #define dout_subsys ceph_subsys_rados diff --git a/src/librbd/BlockGuard.h b/src/librbd/BlockGuard.h index 46c91b44b66a..062f1901d61b 100644 --- a/src/librbd/BlockGuard.h +++ b/src/librbd/BlockGuard.h @@ -11,7 +11,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/LibrbdWriteback.cc b/src/librbd/LibrbdWriteback.cc index da44fbf82d48..b19dd5a741ba 100644 --- a/src/librbd/LibrbdWriteback.cc +++ b/src/librbd/LibrbdWriteback.cc @@ -24,7 +24,7 @@ #include "librbd/io/ObjectDispatcher.h" #include "librbd/io/ReadResult.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc index 42d84dc59c27..a340019e81b4 100644 --- a/src/librbd/WatchNotifyTypes.cc +++ b/src/librbd/WatchNotifyTypes.cc @@ -3,7 +3,7 @@ #include "cls/rbd/cls_rbd_types.h" #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "librbd/WatchNotifyTypes.h" #include "librbd/watcher/Utils.h" diff --git a/src/librbd/Watcher.cc b/src/librbd/Watcher.cc index 45de8d7eb445..7d1a67ebdfe7 100644 --- a/src/librbd/Watcher.cc +++ b/src/librbd/Watcher.cc @@ -11,7 +11,7 @@ #include // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd diff --git a/src/librbd/image/CloneRequest.cc b/src/librbd/image/CloneRequest.cc index b90c777c1e67..1889481ba988 100644 --- a/src/librbd/image/CloneRequest.cc +++ b/src/librbd/image/CloneRequest.cc @@ -5,7 +5,7 @@ #include "cls/rbd/cls_rbd_types.h" #include "common/dout.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/ImageState.h" #include "librbd/image/CloneRequest.h" #include "librbd/image/CreateRequest.h" diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc index 782259c6e80a..08abc6831f5d 100644 --- a/src/librbd/image/CreateRequest.cc +++ b/src/librbd/image/CreateRequest.cc @@ -5,7 +5,7 @@ #include "common/dout.h" #include "common/errno.h" #include "cls/rbd/cls_rbd_client.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/Utils.h" #include "common/ceph_context.h" #include "osdc/Striper.h" diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc index 6e47b7bf724d..113e5d622694 100644 --- a/src/librbd/image/OpenRequest.cc +++ b/src/librbd/image/OpenRequest.cc @@ -12,7 +12,7 @@ #include "librbd/image/RefreshRequest.h" #include "librbd/image/SetSnapRequest.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc index 717648a47212..a5289a6dc520 100644 --- a/src/librbd/image/RefreshRequest.cc +++ b/src/librbd/image/RefreshRequest.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/image/RefreshRequest.h" #include "common/dout.h" diff --git a/src/librbd/image/SetFlagsRequest.cc b/src/librbd/image/SetFlagsRequest.cc index 71a864244d2e..a18c749948a8 100644 --- a/src/librbd/image/SetFlagsRequest.cc +++ b/src/librbd/image/SetFlagsRequest.cc @@ -7,7 +7,7 @@ #include "cls/rbd/cls_rbd_client.h" #include "librbd/ImageCtx.h" #include "librbd/Utils.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 3285fcab4e05..d7d26066d4e8 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -56,7 +56,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/io/AsyncOperation.cc b/src/librbd/io/AsyncOperation.cc index fddb621e220c..e2bdc3b30601 100644 --- a/src/librbd/io/AsyncOperation.cc +++ b/src/librbd/io/AsyncOperation.cc @@ -5,7 +5,7 @@ #include "librbd/ImageCtx.h" #include "common/dout.h" #include "common/WorkQueue.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/io/AsyncOperation.h b/src/librbd/io/AsyncOperation.h index 1f22e72db816..8a01e5c742e3 100644 --- a/src/librbd/io/AsyncOperation.h +++ b/src/librbd/io/AsyncOperation.h @@ -4,7 +4,7 @@ #ifndef LIBRBD_IO_ASYNC_OPERATION_H #define LIBRBD_IO_ASYNC_OPERATION_H -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/xlist.h" #include diff --git a/src/librbd/journal/CreateRequest.cc b/src/librbd/journal/CreateRequest.cc index 68fd088c1024..4f10ec6571c1 100644 --- a/src/librbd/journal/CreateRequest.cc +++ b/src/librbd/journal/CreateRequest.cc @@ -3,7 +3,7 @@ #include "common/dout.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/Utils.h" #include "common/Timer.h" #include "common/WorkQueue.h" diff --git a/src/librbd/journal/RemoveRequest.cc b/src/librbd/journal/RemoveRequest.cc index aa2d13e8652c..6ed5f54c3b53 100644 --- a/src/librbd/journal/RemoveRequest.cc +++ b/src/librbd/journal/RemoveRequest.cc @@ -6,7 +6,7 @@ #include "common/Timer.h" #include "common/WorkQueue.h" #include "journal/Settings.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/Utils.h" #include "librbd/journal/RemoveRequest.h" diff --git a/src/librbd/journal/ResetRequest.cc b/src/librbd/journal/ResetRequest.cc index 4fb5fa4dd795..9b67f3e452ce 100644 --- a/src/librbd/journal/ResetRequest.cc +++ b/src/librbd/journal/ResetRequest.cc @@ -8,7 +8,7 @@ #include "common/WorkQueue.h" #include "journal/Journaler.h" #include "journal/Settings.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/Journal.h" #include "librbd/Utils.h" #include "librbd/journal/CreateRequest.h" diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc index 03e62660bc61..75e71a21e034 100644 --- a/src/librbd/journal/Types.cc +++ b/src/librbd/journal/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "librbd/journal/Types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "include/types.h" #include "common/Formatter.h" diff --git a/src/librbd/managed_lock/Utils.cc b/src/librbd/managed_lock/Utils.cc index 89ac6aae5648..0b4f908dd688 100644 --- a/src/librbd/managed_lock/Utils.cc +++ b/src/librbd/managed_lock/Utils.cc @@ -1,7 +1,7 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "include/assert.h" +#include "include/ceph_assert.h" #include "librbd/managed_lock/Utils.h" #include diff --git a/src/librbd/mirroring_watcher/Types.cc b/src/librbd/mirroring_watcher/Types.cc index b723ba87ac8c..3226b6352f79 100644 --- a/src/librbd/mirroring_watcher/Types.cc +++ b/src/librbd/mirroring_watcher/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "librbd/mirroring_watcher/Types.h" #include "librbd/watcher/Utils.h" diff --git a/src/librbd/object_map/CreateRequest.cc b/src/librbd/object_map/CreateRequest.cc index f4eee5594fa9..a2b9d8f60d67 100644 --- a/src/librbd/object_map/CreateRequest.cc +++ b/src/librbd/object_map/CreateRequest.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "librbd/object_map/CreateRequest.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/dout.h" #include "common/errno.h" #include "cls/rbd/cls_rbd_client.h" diff --git a/src/librbd/object_map/RemoveRequest.cc b/src/librbd/object_map/RemoveRequest.cc index ee6e27464095..a7db0c030611 100644 --- a/src/librbd/object_map/RemoveRequest.cc +++ b/src/librbd/object_map/RemoveRequest.cc @@ -8,7 +8,7 @@ #include "librbd/ImageCtx.h" #include "librbd/ObjectMap.h" #include "librbd/Utils.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/trash_watcher/Types.cc b/src/librbd/trash_watcher/Types.cc index f3e338140ce9..c95ea223b936 100644 --- a/src/librbd/trash_watcher/Types.cc +++ b/src/librbd/trash_watcher/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "librbd/trash_watcher/Types.h" #include "librbd/watcher/Utils.h" diff --git a/src/log/Log.cc b/src/log/Log.cc index c1f8e76562a4..be57c6d52579 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -12,7 +12,7 @@ #include "common/Graylog.h" #include "common/valgrind.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compat.h" #include "include/on_exit.h" diff --git a/src/log/LogClock.h b/src/log/LogClock.h index 14bddbd2537b..5cd4e77d8fe8 100644 --- a/src/log/LogClock.h +++ b/src/log/LogClock.h @@ -9,7 +9,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/ceph_time.h" namespace ceph { diff --git a/src/log/SubsystemMap.h b/src/log/SubsystemMap.h index 9df9c9132d18..4d33ab3b1aa8 100644 --- a/src/log/SubsystemMap.h +++ b/src/log/SubsystemMap.h @@ -11,7 +11,7 @@ #include "common/likely.h" #include "common/subsys_types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace ceph { namespace logging { diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index 7efeab7398bb..d63236643db0 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -35,7 +35,7 @@ #include "osdc/Objecter.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compat.h" #define dout_context g_ceph_context diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index ac08db1a866f..ad7b3eb9cd9d 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -40,7 +40,7 @@ #include "common/config.h" #include "global/global_context.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "mds/MDSContinuation.h" #include "mds/InoTable.h" diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 462bd2957f18..2eef3ded9fc2 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -71,7 +71,7 @@ #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 94d933bfd98c..5990693e6e54 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -29,7 +29,7 @@ #include "common/config.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/mds/MDSCacheObject.h b/src/mds/MDSCacheObject.h index 27f20349476b..c69ca9d9d071 100644 --- a/src/mds/MDSCacheObject.h +++ b/src/mds/MDSCacheObject.h @@ -6,7 +6,7 @@ #include "common/config.h" #include "include/Context.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/mempool.h" #include "include/types.h" #include "include/xlist.h" diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index bc575033019a..8af30ac54715 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -25,7 +25,7 @@ #include "common/errno.h" #include "common/Finisher.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context diff --git a/src/mds/Server.cc b/src/mds/Server.cc index aad94d4d8a03..9825066adbfb 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -13,7 +13,7 @@ */ #include -#include "include/assert.h" // lexical_cast includes system assert.h +#include "include/ceph_assert.h" // lexical_cast includes system assert.h #include #include diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index 838899f60ce9..8d54bd6d3070 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -22,7 +22,7 @@ #include "common/config.h" #include "common/errno.h" #include "common/DecayCounter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #define dout_context g_ceph_context diff --git a/src/mds/SnapClient.cc b/src/mds/SnapClient.cc index e4fcbbba172d..88237424c87c 100644 --- a/src/mds/SnapClient.cc +++ b/src/mds/SnapClient.cc @@ -19,7 +19,7 @@ #include "SnapClient.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index 16b42e9ae4ef..27611f4af147 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -25,7 +25,7 @@ #include "msg/Messenger.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index 6d72bd4e19e9..12a6ab4165a2 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -28,7 +28,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include #define CEPH_FS_ONDISK_MAGIC "ceph fs volume v011" diff --git a/src/mgr/PyFormatter.h b/src/mgr/PyFormatter.h index 9c7d54eebbc4..d65e14167e97 100644 --- a/src/mgr/PyFormatter.h +++ b/src/mgr/PyFormatter.h @@ -25,7 +25,7 @@ #include #include "common/Formatter.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class PyFormatter : public ceph::Formatter { diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc index 90333629a60d..cd97f4b52860 100644 --- a/src/mgr/PyModule.cc +++ b/src/mgr/PyModule.cc @@ -32,7 +32,7 @@ std::string PyModule::config_prefix = "mgr/"; // Courtesy of http://stackoverflow.com/questions/1418015/how-to-get-python-exception-text #include #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this // decode a Python exception into a string std::string handle_pyerror() { diff --git a/src/mgr/StandbyPyModules.cc b/src/mgr/StandbyPyModules.cc index 0113ae1cf30f..f2d1eeb45b8d 100644 --- a/src/mgr/StandbyPyModules.cc +++ b/src/mgr/StandbyPyModules.cc @@ -21,7 +21,7 @@ #include -#include "include/assert.h" // boost clobbers this +#include "include/ceph_assert.h" // boost clobbers this // For ::config_prefix #include "PyModuleRegistry.h" diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 37640888696e..dd8d5dcbbbfc 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -31,7 +31,7 @@ #include "auth/AuthServiceHandler.h" #include "auth/KeyRing.h" #include "include/stringify.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "mds/MDSAuthCaps.h" #include "osd/OSDCap.h" diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc index 05c38ec4f764..38a22d16496e 100644 --- a/src/mon/ConfigKeyService.cc +++ b/src/mon/ConfigKeyService.cc @@ -23,7 +23,7 @@ #include "common/errno.h" #include "include/stringify.h" -#include "include/assert.h" // re-clobber ceph_assert() +#include "include/ceph_assert.h" // re-clobber ceph_assert() #define dout_subsys ceph_subsys_mon #undef dout_prefix #define dout_prefix _prefix(_dout, mon, this) diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index c95ad3f20335..ae97dd6caba0 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -20,7 +20,7 @@ #include "messages/MMonElection.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index 699794441073..93d209c4a556 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/HealthMonitor.cc @@ -17,7 +17,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "mon/Monitor.h" diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 446ca1d2fb00..14ab4c8d110f 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -27,7 +27,7 @@ #include "common/Graylog.h" #include "common/errno.h" #include "common/strtol.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/str_list.h" #include "include/str_map.h" #include "include/compat.h" diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index f127833d6a4b..4017b860ba98 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -33,7 +33,7 @@ #include "messages/MMonCommand.h" #include "messages/MGenericMessage.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/str_list.h" #include "include/stringify.h" #include "mds/mdstypes.h" diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc index 545f64bd2c57..ab87ab42edc7 100644 --- a/src/mon/MgrStatMonitor.cc +++ b/src/mon/MgrStatMonitor.cc @@ -11,7 +11,7 @@ #include "messages/MStatfsReply.h" #include "messages/MServiceMap.h" -#include "include/assert.h" // re-clobber assert +#include "include/ceph_assert.h" // re-clobber assert #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index 1724a10ae529..1465d4824653 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -29,7 +29,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" static inline bool is_not_alnum_space(char c) { diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d1283834a17b..b03f68e727e0 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -81,7 +81,7 @@ #include "mon/ConfigKeyService.h" #include "common/config.h" #include "common/cmdparse.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compat.h" #include "perfglue/heap_profiler.h" diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index e037ee44d868..abc06f9ea461 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -23,7 +23,7 @@ #include #include "kv/KeyValueDB.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Formatter.h" #include "common/Finisher.h" #include "common/errno.h" diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index a7612aef101f..667fdf2d4a19 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -23,7 +23,7 @@ #include "common/config.h" #include "common/cmdparse.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #define dout_subsys ceph_subsys_mon diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 31a975fa3d25..f611fcad7e6e 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -69,7 +69,7 @@ #include "common/Checksummer.h" #include "include/compat.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "include/util.h" #include "common/cmdparse.h" diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 492e2ce6de8c..8c6ecb864da5 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -44,7 +44,7 @@ class MOSDMap; #include "mon/MonOpRequest.h" #include // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" /// information about a particular peer's failure reports for one osd struct failure_reporter_t { diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index bd0f80224445..ff58212af763 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -19,7 +19,7 @@ #include "mon/mon_types.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "common/Timer.h" #include "messages/PaxosServiceMessage.h" diff --git a/src/mon/PaxosFSMap.h b/src/mon/PaxosFSMap.h index 0c8d5d75d746..f7f8a380a6fa 100644 --- a/src/mon/PaxosFSMap.h +++ b/src/mon/PaxosFSMap.h @@ -18,7 +18,7 @@ #include "mds/FSMap.h" #include "mds/MDSMap.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class PaxosFSMap { public: diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index 7d3ff2c7b987..06776635f949 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -16,7 +16,7 @@ #include "common/Clock.h" #include "common/config.h" #include "include/stringify.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "mon/MonOpRequest.h" #define dout_subsys ceph_subsys_paxos diff --git a/src/msg/Connection.h b/src/msg/Connection.h index 7d0f39385282..03375a4dc8ce 100644 --- a/src/msg/Connection.h +++ b/src/msg/Connection.h @@ -23,7 +23,7 @@ #include "common/RefCountedObj.h" #include "common/config.h" #include "common/debug.h" -#include "include/assert.h" // Because intusive_ptr clobbers our assert... +#include "include/ceph_assert.h" // Because intusive_ptr clobbers our assert... #include "include/buffer.h" #include "include/types.h" #include "msg/MessageRef.h" diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h index 30e6b654f66d..2d90d82c433a 100644 --- a/src/msg/DispatchQueue.h +++ b/src/msg/DispatchQueue.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Throttle.h" #include "common/Mutex.h" #include "common/Cond.h" diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h index c5f19736cda1..4596abade810 100644 --- a/src/msg/Dispatcher.h +++ b/src/msg/Dispatcher.h @@ -18,7 +18,7 @@ #include #include "include/buffer_fwd.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "msg/MessageRef.h" class Messenger; diff --git a/src/msg/Message.h b/src/msg/Message.h index 29c04645a7c7..02d1e95ed966 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -25,7 +25,7 @@ #include "common/config.h" #include "common/debug.h" #include "common/zipkin_trace.h" -#include "include/assert.h" // Because intrusive_ptr clobbers our assert... +#include "include/ceph_assert.h" // Because intrusive_ptr clobbers our assert... #include "include/buffer.h" #include "include/types.h" #include "msg/Connection.h" diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h index d349bab221d0..27c228ed9955 100644 --- a/src/msg/async/AsyncMessenger.h +++ b/src/msg/async/AsyncMessenger.h @@ -35,7 +35,7 @@ #include "AsyncConnection.h" #include "Event.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class AsyncMessenger; diff --git a/src/msg/async/Stack.cc b/src/msg/async/Stack.cc index ef6ead8a419d..8e2d1ec13ac8 100644 --- a/src/msg/async/Stack.cc +++ b/src/msg/async/Stack.cc @@ -28,7 +28,7 @@ #endif #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_ms #undef dout_prefix diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc index 5fc2cf938d14..278efe9ed071 100644 --- a/src/msg/async/dpdk/DPDK.cc +++ b/src/msg/async/dpdk/DPDK.cc @@ -43,7 +43,7 @@ #include "common/Cycles.h" #include "common/dout.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc index fabfb024129f..9954e6701b20 100644 --- a/src/msg/async/dpdk/DPDKStack.cc +++ b/src/msg/async/dpdk/DPDKStack.cc @@ -47,7 +47,7 @@ #include "TCP-Stack.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Cond.h" #define dout_subsys ceph_subsys_dpdk diff --git a/src/msg/async/dpdk/EventDPDK.cc b/src/msg/async/dpdk/EventDPDK.cc index 0a80bc7a02d5..5d291716c719 100644 --- a/src/msg/async/dpdk/EventDPDK.cc +++ b/src/msg/async/dpdk/EventDPDK.cc @@ -19,7 +19,7 @@ #include "EventDPDK.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_ms diff --git a/src/msg/async/dpdk/IP.cc b/src/msg/async/dpdk/IP.cc index 2ad9dadcf5a5..f730cded9e12 100644 --- a/src/msg/async/dpdk/IP.cc +++ b/src/msg/async/dpdk/IP.cc @@ -41,7 +41,7 @@ #include "toeplitz.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/dpdk/TCP.cc b/src/msg/async/dpdk/TCP.cc index dec159b6cc1f..c6397709b1a7 100644 --- a/src/msg/async/dpdk/TCP.cc +++ b/src/msg/async/dpdk/TCP.cc @@ -26,7 +26,7 @@ #include "DPDKStack.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/dpdk/UserspaceEvent.cc b/src/msg/async/dpdk/UserspaceEvent.cc index fce6588757cf..282dcef12f60 100644 --- a/src/msg/async/dpdk/UserspaceEvent.cc +++ b/src/msg/async/dpdk/UserspaceEvent.cc @@ -16,7 +16,7 @@ #include "UserspaceEvent.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/dpdk/UserspaceEvent.h b/src/msg/async/dpdk/UserspaceEvent.h index 01ef0dc6643e..7e89517df873 100644 --- a/src/msg/async/dpdk/UserspaceEvent.h +++ b/src/msg/async/dpdk/UserspaceEvent.h @@ -23,7 +23,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/int_types.h" #include "common/Tub.h" diff --git a/src/msg/async/dpdk/ethernet.h b/src/msg/async/dpdk/ethernet.h index 858df89a4737..b007425fe925 100644 --- a/src/msg/async/dpdk/ethernet.h +++ b/src/msg/async/dpdk/ethernet.h @@ -26,7 +26,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "byteorder.h" struct ethernet_address { diff --git a/src/msg/async/dpdk/net.cc b/src/msg/async/dpdk/net.cc index 29e341195d2c..6e361f182d15 100644 --- a/src/msg/async/dpdk/net.cc +++ b/src/msg/async/dpdk/net.cc @@ -33,7 +33,7 @@ #include "DPDKStack.h" #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/rdma/Infiniband.h b/src/msg/async/rdma/Infiniband.h index 319130ff8617..974db59b1fa1 100644 --- a/src/msg/async/rdma/Infiniband.h +++ b/src/msg/async/rdma/Infiniband.h @@ -19,7 +19,7 @@ #include // need this because boost messes with ceph log/assert definitions -#include +#include "include/ceph_assert.h" #include #include diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h index 0292f6c7684e..c522ba39565f 100644 --- a/src/msg/simple/SimpleMessenger.h +++ b/src/msg/simple/SimpleMessenger.h @@ -33,7 +33,7 @@ #include "msg/SimplePolicyMessenger.h" #include "msg/Message.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "msg/DispatchQueue.h" #include "Pipe.h" diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc index abe270a41dbc..97516f4bc6a8 100644 --- a/src/msg/xio/XioConnection.cc +++ b/src/msg/xio/XioConnection.cc @@ -20,7 +20,7 @@ #include "msg/msg_types.h" #include "auth/none/AuthNoneProtocol.h" // XXX -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/dout.h" extern struct xio_mempool *xio_msgr_mpool; diff --git a/src/msg/xio/XioPortal.h b/src/msg/xio/XioPortal.h index ad9d4df0b4d0..7a0afee41931 100644 --- a/src/msg/xio/XioPortal.h +++ b/src/msg/xio/XioPortal.h @@ -29,7 +29,7 @@ extern "C" { #include "include/spinlock.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/dout.h" #ifndef CACHE_LINE_SIZE diff --git a/src/os/bluestore/Allocator.h b/src/os/bluestore/Allocator.h index 8d821116d68e..763e6f25d6e4 100644 --- a/src/os/bluestore/Allocator.h +++ b/src/os/bluestore/Allocator.h @@ -13,7 +13,7 @@ #define CEPH_OS_BLUESTORE_ALLOCATOR_H #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "os/bluestore/bluestore_types.h" class Allocator { diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h index c34fde385854..462891ca7005 100644 --- a/src/os/bluestore/BlockDevice.h +++ b/src/os/bluestore/BlockDevice.h @@ -30,7 +30,7 @@ #ifdef HAVE_LIBAIO #include "aio.h" #endif -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/buffer.h" #include "include/interval_set.h" #define SPDK_PREFIX "spdk:" diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 837282b63110..058541a30edb 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -9,7 +9,7 @@ #include "common/perf_counters.h" #include "BlockDevice.h" #include "Allocator.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context cct #define dout_subsys ceph_subsys_bluefs diff --git a/src/os/bluestore/BlueRocksEnv.h b/src/os/bluestore/BlueRocksEnv.h index 909e1b1c174a..486d16432062 100644 --- a/src/os/bluestore/BlueRocksEnv.h +++ b/src/os/bluestore/BlueRocksEnv.h @@ -9,7 +9,7 @@ #include "rocksdb/status.h" #include "rocksdb/utilities/env_mirror.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class BlueFS; diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index bf65f6efb5dc..cfa9cd74cd0e 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -29,7 +29,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/unordered_map.h" #include "include/mempool.h" #include "common/bloom_filter.hpp" diff --git a/src/os/bluestore/fastbmap_allocator_impl.h b/src/os/bluestore/fastbmap_allocator_impl.h index 88fbf584ccfd..0ad3f9a7ad61 100755 --- a/src/os/bluestore/fastbmap_allocator_impl.h +++ b/src/os/bluestore/fastbmap_allocator_impl.h @@ -31,7 +31,7 @@ struct interval_t typedef std::vector interval_vector_t; typedef std::vector slot_vector_t; #else -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/likely.h" #include "os/bluestore/bluestore_types.h" #include "include/mempool.h" diff --git a/src/os/filestore/BtrfsFileStoreBackend.cc b/src/os/filestore/BtrfsFileStoreBackend.cc index 8718432ec671..4f1c60db028f 100644 --- a/src/os/filestore/BtrfsFileStoreBackend.cc +++ b/src/os/filestore/BtrfsFileStoreBackend.cc @@ -26,7 +26,7 @@ #include "include/linux_fiemap.h" #include "include/color.h" #include "include/buffer.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #ifndef __CYGWIN__ #include "os/fs/btrfs_ioctl.h" diff --git a/src/os/filestore/DBObjectMap.cc b/src/os/filestore/DBObjectMap.cc index eee34c90f2a5..cfba6dad59dc 100644 --- a/src/os/filestore/DBObjectMap.cc +++ b/src/os/filestore/DBObjectMap.cc @@ -16,7 +16,7 @@ #include "common/debug.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context cct #define dout_subsys ceph_subsys_filestore diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h index 81d75d835882..a9af1a64b41f 100644 --- a/src/os/filestore/FileJournal.h +++ b/src/os/filestore/FileJournal.h @@ -34,7 +34,7 @@ using std::deque; #endif // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" /** * Implements journaling on top of block device or file. diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index 9532ca5ae5d8..4040c7f006aa 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -76,7 +76,7 @@ #include "common/ceph_crypto.h" using ceph::crypto::SHA1; -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/config.h" #include "common/blkdev.h" diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h index eb9c57de087c..77a60447fb8d 100644 --- a/src/os/filestore/FileStore.h +++ b/src/os/filestore/FileStore.h @@ -28,7 +28,7 @@ #include "include/unordered_map.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "os/ObjectStore.h" #include "JournalingObjectStore.h" diff --git a/src/os/filestore/JournalThrottle.cc b/src/os/filestore/JournalThrottle.cc index 4a100c6b39fb..8475bbbfd1fa 100644 --- a/src/os/filestore/JournalThrottle.cc +++ b/src/os/filestore/JournalThrottle.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "JournalThrottle.h" -#include "include/assert.h" +#include "include/ceph_assert.h" bool JournalThrottle::set_params( double _low_threshhold, diff --git a/src/os/filestore/XfsFileStoreBackend.cc b/src/os/filestore/XfsFileStoreBackend.cc index 8a236851603c..1081d146aa25 100644 --- a/src/os/filestore/XfsFileStoreBackend.cc +++ b/src/os/filestore/XfsFileStoreBackend.cc @@ -25,7 +25,7 @@ #include "common/errno.h" #include "common/linux_version.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compat.h" #define dout_context cct() diff --git a/src/os/filestore/ZFSFileStoreBackend.cc b/src/os/filestore/ZFSFileStoreBackend.cc index 1a6b63bbd7fd..e85dbd52636c 100644 --- a/src/os/filestore/ZFSFileStoreBackend.cc +++ b/src/os/filestore/ZFSFileStoreBackend.cc @@ -16,7 +16,7 @@ #include "include/linux_fiemap.h" #include "include/color.h" #include "include/buffer.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include #include diff --git a/src/os/filestore/chain_xattr.cc b/src/os/filestore/chain_xattr.cc index 8d63f1d37ad0..e4dedd2933d2 100644 --- a/src/os/filestore/chain_xattr.cc +++ b/src/os/filestore/chain_xattr.cc @@ -6,14 +6,14 @@ #include // for size_t, snprintf #include // for free, malloc #include // for strcpy, strlen -#include "include/assert.h" // for assert +#include "include/ceph_assert.h" // for assert #include "include/buffer.h" #if defined(__linux__) #include #endif -#include "include/assert.h" +#include "include/ceph_assert.h" /* * chaining xattrs diff --git a/src/os/filestore/chain_xattr.h b/src/os/filestore/chain_xattr.h index ce7c5582490b..a2d17fa64afc 100644 --- a/src/os/filestore/chain_xattr.h +++ b/src/os/filestore/chain_xattr.h @@ -8,7 +8,7 @@ #include #include #include "common/xattr.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/buffer_fwd.h" #if defined(__linux__) diff --git a/src/os/kstore/KStore.h b/src/os/kstore/KStore.h index 100604209c2b..72aad200148a 100644 --- a/src/os/kstore/KStore.h +++ b/src/os/kstore/KStore.h @@ -23,7 +23,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/unordered_map.h" #include "common/Finisher.h" #include "common/RWLock.h" diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h index 1d184ee8b343..6b78c1c6a737 100644 --- a/src/os/memstore/MemStore.h +++ b/src/os/memstore/MemStore.h @@ -25,7 +25,7 @@ #include "common/RWLock.h" #include "os/ObjectStore.h" #include "PageSet.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class MemStore : public ObjectStore { public: diff --git a/src/osd/ECUtil.h b/src/osd/ECUtil.h index e843d83c4579..8e980e27ebcd 100644 --- a/src/osd/ECUtil.h +++ b/src/osd/ECUtil.h @@ -18,7 +18,7 @@ #include #include "erasure-code/ErasureCodeInterface.h" #include "include/buffer_fwd.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/encoding.h" #include "common/Formatter.h" diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 57f6d9fa0631..e33160546c54 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -148,7 +148,7 @@ #include "include/str_list.h" #include "include/util.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/config.h" #include "common/EventTrace.h" diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc index 1e8c6dbcdb59..d595b1bc9ab0 100644 --- a/src/osd/OpRequest.cc +++ b/src/osd/OpRequest.cc @@ -10,7 +10,7 @@ #include "messages/MOSDOp.h" #include "messages/MOSDRepOp.h" #include "messages/MOSDRepOpReply.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "osd/osd_types.h" #ifdef WITH_LTTNG diff --git a/src/osd/PG.h b/src/osd/PG.h index dc14dfb63ba7..32ba8638bcc6 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -28,7 +28,7 @@ #include "include/mempool.h" // re-include our assert to clobber boost's -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/types.h" #include "include/stringify.h" diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 71e1f6f2ed6a..3b16e09ef549 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -17,7 +17,7 @@ #pragma once // re-include our assert to clobber boost's -#include "include/assert.h" +#include "include/ceph_assert.h" #include "osd_types.h" #include "os/ObjectStore.h" #include diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 0577e0bf6324..6ec9a268b7d3 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -49,7 +49,7 @@ #include "osdc/Objecter.h" #include "json_spirit/json_spirit_value.h" #include "json_spirit/json_spirit_reader.h" -#include "include/assert.h" // json_spirit clobbers it +#include "include/ceph_assert.h" // json_spirit clobbers it #include "include/rados/rados_types.hpp" #ifdef WITH_LTTNG diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index 65299344f939..262341d32d03 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -18,7 +18,7 @@ #define CEPH_REPLICATEDPG_H #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "OSD.h" #include "PG.h" #include "Watch.h" diff --git a/src/osd/mClockOpClassSupport.cc b/src/osd/mClockOpClassSupport.cc index 83bea1c46f21..d35c2cbe8d5c 100644 --- a/src/osd/mClockOpClassSupport.cc +++ b/src/osd/mClockOpClassSupport.cc @@ -17,7 +17,7 @@ #include "osd/mClockOpClassSupport.h" #include "osd/OpQueueItem.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace ceph { diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index fe25e5c70e5a..b2c75795c3e3 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -18,7 +18,7 @@ #include "msg/Messenger.h" #include "osdc/Journaler.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Finisher.h" #define dout_subsys ceph_subsys_journaler diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index c67b5f1c1a8c..7ecfdb556fa2 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -9,7 +9,7 @@ #include "common/errno.h" #include "common/perf_counters.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define MAX_FLUSH_UNDER_LOCK 20 ///< max bh's we start writeback on #define BUFFER_MEMORY_WEIGHT 12 // memory usage of BufferHead, count in (1< -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/buffer.h" #include "include/types.h" #include "include/rados/rados_types.hpp" diff --git a/src/perf_histogram.h b/src/perf_histogram.h index c188852dca0b..84c6a73fb8f0 100644 --- a/src/perf_histogram.h +++ b/src/perf_histogram.h @@ -22,7 +22,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" class PerfHistogramCommon { public: diff --git a/src/rbd_fuse/rbd-fuse.cc b/src/rbd_fuse/rbd-fuse.cc index a303724d6894..d6d44e051f9c 100644 --- a/src/rbd_fuse/rbd-fuse.cc +++ b/src/rbd_fuse/rbd-fuse.cc @@ -29,7 +29,7 @@ #include "include/compat.h" #include "include/rbd/librbd.h" -#include "include/assert.h" +#include "include/ceph_assert.h" static int gotrados = 0; char *pool_name; diff --git a/src/rbd_replay/ActionTypes.cc b/src/rbd_replay/ActionTypes.cc index 2b203701f9ac..61cd7579f655 100644 --- a/src/rbd_replay/ActionTypes.cc +++ b/src/rbd_replay/ActionTypes.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "rbd_replay/ActionTypes.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/byteorder.h" #include "include/stringify.h" #include "common/Formatter.h" diff --git a/src/rbd_replay/BufferReader.cc b/src/rbd_replay/BufferReader.cc index 262c54799ec3..b4dce6515912 100644 --- a/src/rbd_replay/BufferReader.cc +++ b/src/rbd_replay/BufferReader.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "rbd_replay/BufferReader.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/intarith.h" namespace rbd_replay { diff --git a/src/rbd_replay/rbd_loc.cc b/src/rbd_replay/rbd_loc.cc index c0578f332546..ce6e8e6ed830 100644 --- a/src/rbd_replay/rbd_loc.cc +++ b/src/rbd_replay/rbd_loc.cc @@ -13,7 +13,7 @@ */ #include "rbd_loc.hpp" -#include "include/assert.h" +#include "include/ceph_assert.h" using namespace std; diff --git a/src/rbd_replay/rbd_replay_debug.hpp b/src/rbd_replay/rbd_replay_debug.hpp index 3b9683f58528..4b44588b4b66 100644 --- a/src/rbd_replay/rbd_replay_debug.hpp +++ b/src/rbd_replay/rbd_replay_debug.hpp @@ -16,7 +16,7 @@ #define _INCLUDED_RBD_REPLAY_DEBUG_H #include "common/debug.h" -#include "include/assert.h" +#include "include/ceph_assert.h" namespace rbd_replay { diff --git a/src/rgw/rgw_asio_client.h b/src/rgw/rgw_asio_client.h index 5a9957b46c6c..d9a3c52ba091 100644 --- a/src/rgw/rgw_asio_client.h +++ b/src/rgw/rgw_asio_client.h @@ -6,7 +6,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "rgw_client_io.h" diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index 88c6c7f1ed49..5d4230a41e7e 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -10,7 +10,7 @@ #include #include "include/types.h" #include "include/utime.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/RWLock.h" enum { diff --git a/src/rgw/rgw_coroutine.cc b/src/rgw/rgw_coroutine.cc index ff30dc89a018..d756cfd52a7f 100644 --- a/src/rgw/rgw_coroutine.cc +++ b/src/rgw/rgw_coroutine.cc @@ -3,7 +3,7 @@ #include "rgw_coroutine.h" // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #include diff --git a/src/rgw/rgw_cr_rados.h b/src/rgw/rgw_cr_rados.h index b9aab807f47a..fee080ee7def 100644 --- a/src/rgw/rgw_cr_rados.h +++ b/src/rgw/rgw_cr_rados.h @@ -2,7 +2,7 @@ #define CEPH_RGW_CR_RADOS_H #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "rgw_coroutine.h" #include "rgw_rados.h" #include "common/WorkQueue.h" diff --git a/src/rgw/rgw_cr_rest.cc b/src/rgw/rgw_cr_rest.cc index 7b5b05bd8e01..15465534e799 100644 --- a/src/rgw/rgw_cr_rest.cc +++ b/src/rgw/rgw_cr_rest.cc @@ -3,7 +3,7 @@ #include "rgw_coroutine.h" // re-include our assert to clobber the system one; fix dout: -#include "include/assert.h" +#include "include/ceph_assert.h" #include diff --git a/src/rgw/rgw_cr_rest.h b/src/rgw/rgw_cr_rest.h index 283074c1382f..94ce0f072bc6 100644 --- a/src/rgw/rgw_cr_rest.h +++ b/src/rgw/rgw_cr_rest.h @@ -3,7 +3,7 @@ #include #include -#include "include/assert.h" // boost header clobbers our assert.h +#include "include/ceph_assert.h" // boost header clobbers our assert.h #include "rgw_coroutine.h" #include "rgw_rest_conn.h" diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc index 26aeb719ff2a..139f28329873 100644 --- a/src/rgw/rgw_crypt.cc +++ b/src/rgw/rgw_crypt.cc @@ -8,7 +8,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include #include #include "include/str_map.h" diff --git a/src/rgw/rgw_env.cc b/src/rgw/rgw_env.cc index 813c8678562a..95b6eeca5db7 100644 --- a/src/rgw/rgw_env.cc +++ b/src/rgw/rgw_env.cc @@ -6,7 +6,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "rgw_crypt_sanitize.h" #define dout_context g_ceph_context diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h index cc39c101e1bc..87bd33ac3443 100644 --- a/src/rgw/rgw_file.h +++ b/src/rgw/rgw_file.h @@ -41,7 +41,7 @@ * ASSERT_H somehow not defined after all the above (which bring * in common/debug.h [e.g., dout]) */ -#include "include/assert.h" +#include "include/ceph_assert.h" #define RGW_RWXMODE (S_IRWXU | S_IRWXG | S_IRWXO) diff --git a/src/rgw/rgw_frontend.cc b/src/rgw/rgw_frontend.cc index 23cf115a47e3..f22ec12454c1 100644 --- a/src/rgw/rgw_frontend.cc +++ b/src/rgw/rgw_frontend.cc @@ -6,7 +6,7 @@ #include "rgw_frontend.h" #include "include/str_list.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context diff --git a/src/rgw/rgw_ldap.cc b/src/rgw/rgw_ldap.cc index 185602f13593..9c1e69476aae 100644 --- a/src/rgw/rgw_ldap.cc +++ b/src/rgw/rgw_ldap.cc @@ -9,7 +9,7 @@ #include "common/safe_io.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_ldap.h b/src/rgw/rgw_ldap.h index 2f7316ccf7ac..aeb5f6134ed8 100644 --- a/src/rgw/rgw_ldap.h +++ b/src/rgw/rgw_ldap.h @@ -136,7 +136,7 @@ namespace rgw { #include "common/safe_io.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" std::string parse_rgw_ldap_bindpw(CephContext* ctx); diff --git a/src/rgw/rgw_lib.h b/src/rgw/rgw_lib.h index 0225d79e3c8e..bf69abe05939 100644 --- a/src/rgw/rgw_lib.h +++ b/src/rgw/rgw_lib.h @@ -14,7 +14,7 @@ #include "rgw_process.h" #include "rgw_rest_s3.h" // RGW_Auth_S3 #include "rgw_ldap.h" -#include "include/assert.h" +#include "include/ceph_assert.h" class OpsLogSocket; diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc index 77064f351c3c..ab1fcc9d11cf 100644 --- a/src/rgw/rgw_metadata.cc +++ b/src/rgw/rgw_metadata.cc @@ -13,7 +13,7 @@ #include "rgw_cr_rados.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 0a0971633da7..3267060276b1 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -45,7 +45,7 @@ #include "cls/rgw/cls_rgw_client.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "compressor/Compressor.h" diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index f1043ba7a9e3..ea590fa97d48 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -44,7 +44,7 @@ #include "cls/lock/cls_lock_client.h" #include "cls/rgw/cls_rgw_client.h" -#include "include/assert.h" +#include "include/ceph_assert.h" using ceph::crypto::SHA1; diff --git a/src/rgw/rgw_period_history.cc b/src/rgw/rgw_period_history.cc index d11cb3c356b5..959572749052 100644 --- a/src/rgw/rgw_period_history.cc +++ b/src/rgw/rgw_period_history.cc @@ -4,7 +4,7 @@ #include "rgw_period_history.h" #include "rgw_rados.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_period_history.h b/src/rgw/rgw_period_history.h index 0796c6116b5c..11a5c2aa49e8 100644 --- a/src/rgw/rgw_period_history.h +++ b/src/rgw/rgw_period_history.h @@ -8,7 +8,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/types.h" namespace bi = boost::intrusive; diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h index fb73406cfaf2..1eb085997306 100644 --- a/src/rgw/rgw_process.h +++ b/src/rgw/rgw_process.h @@ -12,7 +12,7 @@ #include "rgw_op.h" #include "rgw_rest.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/WorkQueue.h" #include "common/Throttle.h" diff --git a/src/rgw/rgw_realm_watcher.h b/src/rgw/rgw_realm_watcher.h index 9f9bab829efc..1df4f04fc8e1 100644 --- a/src/rgw/rgw_realm_watcher.h +++ b/src/rgw/rgw_realm_watcher.h @@ -5,7 +5,7 @@ #define RGW_REALM_WATCHER_H #include "include/rados/librados.hpp" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Timer.h" #include "common/Cond.h" diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index c171a853fb10..556d805c7e20 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -10,7 +10,7 @@ #include #include "common/sstring.hh" #include "common/ceph_json.h" -#include "include/assert.h" /* needed because of common/ceph_json.h */ +#include "include/ceph_assert.h" /* needed because of common/ceph_json.h */ #include "rgw_op.h" #include "rgw_formats.h" #include "rgw_client_io.h" diff --git a/src/rgw/rgw_rest_config.cc b/src/rgw/rgw_rest_config.cc index 3770cec15ded..5b6a1cbd38b1 100644 --- a/src/rgw/rgw_rest_config.cc +++ b/src/rgw/rgw_rest_config.cc @@ -20,7 +20,7 @@ #include "rgw_rest_config.h" #include "rgw_client_io.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc index b702d1a79227..92a85dc3cf5e 100644 --- a/src/rgw/rgw_rest_log.cc +++ b/src/rgw/rgw_rest_log.cc @@ -22,7 +22,7 @@ #include "rgw_data_sync.h" #include "rgw_common.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define LOG_CLASS_LIST_MAX_ENTRIES (1000) diff --git a/src/rgw/rgw_rest_metadata.cc b/src/rgw/rgw_rest_metadata.cc index c3835cd16338..ad1d26c08f86 100644 --- a/src/rgw/rgw_rest_metadata.cc +++ b/src/rgw/rgw_rest_metadata.cc @@ -21,7 +21,7 @@ #include "common/errno.h" #include "common/strtol.h" #include "rgw/rgw_b64.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_opstate.cc b/src/rgw/rgw_rest_opstate.cc index af9c024e13f7..52e04b5a8d81 100644 --- a/src/rgw/rgw_rest_opstate.cc +++ b/src/rgw/rgw_rest_opstate.cc @@ -19,7 +19,7 @@ #include "rgw_rest_opstate.h" #include "rgw_client_io.h" #include "common/errno.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define OPSTATE_LIST_MAX_ENTRIES 1000 diff --git a/src/rgw/rgw_rest_realm.cc b/src/rgw/rgw_rest_realm.cc index 6371ff09f141..dac5af064ddd 100644 --- a/src/rgw/rgw_rest_realm.cc +++ b/src/rgw/rgw_rest_realm.cc @@ -6,7 +6,7 @@ #include "rgw_rest_s3.h" #include "rgw_rest_config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 17761d5833c6..deca9cea9613 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -43,7 +43,7 @@ #include "rgw_crypt.h" #include "rgw_crypt_sanitize.h" #include "rgw_rest_user_policy.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h index 8cb7d5d00957..03a951341e7d 100644 --- a/src/rgw/rgw_rest_s3.h +++ b/src/rgw/rgw_rest_s3.h @@ -23,7 +23,7 @@ #include "rgw_ldap.h" #include "rgw_token.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "rgw_auth.h" #include "rgw_auth_filters.h" diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 3905d8e409da..5d11edd8f947 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -6,7 +6,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "ceph_ver.h" #include "common/Formatter.h" diff --git a/src/rgw/rgw_rest_user.cc b/src/rgw/rgw_rest_user.cc index 5efb6a75760e..3782246f1f28 100644 --- a/src/rgw/rgw_rest_user.cc +++ b/src/rgw/rgw_rest_user.cc @@ -8,7 +8,7 @@ #include "rgw_rest_user.h" #include "include/str_list.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_sync_log_trim.cc b/src/rgw/rgw_sync_log_trim.cc index cebc4aa05f09..f27e88dd0a2f 100644 --- a/src/rgw/rgw_sync_log_trim.cc +++ b/src/rgw/rgw_sync_log_trim.cc @@ -28,7 +28,7 @@ #include "rgw_sync.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_token.cc b/src/rgw/rgw_token.cc index 705bdecfbf8b..a626ec64e050 100644 --- a/src/rgw/rgw_token.cc +++ b/src/rgw/rgw_token.cc @@ -21,7 +21,7 @@ #include "common/ceph_argparse.h" #include "common/debug.h" #include "global/global_init.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/str_list.h" #include "rgw_token.h" diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h index c7d90111181c..49f580ba9edc 100644 --- a/src/rgw/rgw_user.h +++ b/src/rgw/rgw_user.h @@ -6,7 +6,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/types.h" #include "rgw_common.h" diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc index 4a34ca108345..b8c296247ae5 100644 --- a/src/test/fio/fio_ceph_objectstore.cc +++ b/src/test/fio/fio_ceph_objectstore.cc @@ -23,7 +23,7 @@ #include #include -#include "include/assert.h" // fio.h clobbers our assert.h +#include "include/ceph_assert.h" // fio.h clobbers our assert.h #include #define dout_context g_ceph_context diff --git a/src/test/journal/test_Journaler.cc b/src/test/journal/test_Journaler.cc index 529141de9a30..cc7f2c051846 100644 --- a/src/test/journal/test_Journaler.cc +++ b/src/test/journal/test_Journaler.cc @@ -12,7 +12,7 @@ #include "gtest/gtest.h" // reinclude our assert to clobber the system one -#include "include/assert.h" +#include "include/ceph_assert.h" class TestJournaler : public RadosTestFixture { public: diff --git a/src/test/libcephfs/deleg.cc b/src/test/libcephfs/deleg.cc index 24f353dbbef5..36c0346d49be 100644 --- a/src/test/libcephfs/deleg.cc +++ b/src/test/libcephfs/deleg.cc @@ -27,7 +27,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" /* in ms -- 1 minute */ #define MAX_WAIT (60 * 1000) diff --git a/src/test/libcephfs/flock.cc b/src/test/libcephfs/flock.cc index a02322358c75..79f8a0777ade 100644 --- a/src/test/libcephfs/flock.cc +++ b/src/test/libcephfs/flock.cc @@ -37,7 +37,7 @@ #include #endif -#include "include/assert.h" +#include "include/ceph_assert.h" // Startup common: create and mount ceph fs #define STARTUP_CEPH() do { \ diff --git a/src/test/libcephfs/recordlock.cc b/src/test/libcephfs/recordlock.cc index a4830e68e063..9d1fcdede8b9 100644 --- a/src/test/libcephfs/recordlock.cc +++ b/src/test/libcephfs/recordlock.cc @@ -38,7 +38,7 @@ #include #endif -#include "include/assert.h" +#include "include/ceph_assert.h" // Startup common: create and mount ceph fs #define STARTUP_CEPH() do { \ diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc index 38a948a85712..13a726ccd6e8 100644 --- a/src/test/librados_test_stub/LibradosTestStub.cc +++ b/src/test/librados_test_stub/LibradosTestStub.cc @@ -23,7 +23,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/compat.h" #define dout_context g_ceph_context diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc index 8994deb003aa..ef96f6198db9 100644 --- a/src/test/librados_test_stub/TestClassHandler.cc +++ b/src/test/librados_test_stub/TestClassHandler.cc @@ -9,7 +9,7 @@ #include #include #include "common/debug.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados diff --git a/src/test/librados_test_stub/TestIoCtxImpl.cc b/src/test/librados_test_stub/TestIoCtxImpl.cc index 5ddfc75b235f..0788d9f5b30a 100644 --- a/src/test/librados_test_stub/TestIoCtxImpl.cc +++ b/src/test/librados_test_stub/TestIoCtxImpl.cc @@ -6,7 +6,7 @@ #include "test/librados_test_stub/TestRadosClient.h" #include "test/librados_test_stub/TestWatchNotify.h" #include "librados/AioCompletionImpl.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/Finisher.h" #include "common/valgrind.h" #include "objclass/objclass.h" diff --git a/src/test/librados_test_stub/TestMemRadosClient.h b/src/test/librados_test_stub/TestMemRadosClient.h index f11c69affe83..6f5dc40eee3a 100644 --- a/src/test/librados_test_stub/TestMemRadosClient.h +++ b/src/test/librados_test_stub/TestMemRadosClient.h @@ -5,7 +5,7 @@ #define CEPH_TEST_MEM_RADOS_CLIENT_H #include "test/librados_test_stub/TestRadosClient.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include #include diff --git a/src/test/librados_test_stub/TestRadosClient.cc b/src/test/librados_test_stub/TestRadosClient.cc index 546973558d2b..a5642460cc80 100644 --- a/src/test/librados_test_stub/TestRadosClient.cc +++ b/src/test/librados_test_stub/TestRadosClient.cc @@ -4,7 +4,7 @@ #include "test/librados_test_stub/TestRadosClient.h" #include "test/librados_test_stub/TestIoCtxImpl.h" #include "librados/AioCompletionImpl.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/ceph_json.h" #include "common/Finisher.h" #include diff --git a/src/test/librados_test_stub/TestWatchNotify.cc b/src/test/librados_test_stub/TestWatchNotify.cc index c98bcecb731a..85fa9393a3b3 100644 --- a/src/test/librados_test_stub/TestWatchNotify.cc +++ b/src/test/librados_test_stub/TestWatchNotify.cc @@ -9,7 +9,7 @@ #include "test/librados_test_stub/TestRadosClient.h" #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rados #undef dout_prefix diff --git a/src/test/librgw_file_marker.cc b/src/test/librgw_file_marker.cc index a29c8e1f7d28..105ab90ee2a2 100644 --- a/src/test/librgw_file_marker.cc +++ b/src/test/librgw_file_marker.cc @@ -27,7 +27,7 @@ #include "common/ceph_argparse.h" #include "common/debug.h" #include "global/global_init.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc index 2ba411ccfc5d..38a76053e146 100644 --- a/src/test/librgw_file_nfsns.cc +++ b/src/test/librgw_file_nfsns.cc @@ -27,7 +27,7 @@ #include "common/ceph_argparse.h" #include "common/debug.h" #include "global/global_init.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 4c6be5af9d0a..7993fc5f0d74 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "messages/MMonProbe.h" #include "messages/MRoute.h" diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 772bc5def530..ba82c2b1bc3a 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -53,7 +53,7 @@ #include "auth/KeyRing.h" #include "auth/AuthAuthorizeHandler.h" #include "include/uuid.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "messages/MOSDBoot.h" #include "messages/MOSDAlive.h" diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index f269f0ac0c85..e2a17bc00603 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -39,7 +39,7 @@ typedef boost::mt11213b gen_type; #include "common/dout.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_ms #undef dout_prefix diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc index 7a2bc9b6e513..76b2cd551058 100644 --- a/src/test/objectstore/DeterministicOpSequence.cc +++ b/src/test/objectstore/DeterministicOpSequence.cc @@ -27,7 +27,7 @@ #include "DeterministicOpSequence.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore diff --git a/src/test/objectstore/TestObjectStoreState.cc b/src/test/objectstore/TestObjectStoreState.cc index 19043856d5ba..fcda2d550386 100644 --- a/src/test/objectstore/TestObjectStoreState.cc +++ b/src/test/objectstore/TestObjectStoreState.cc @@ -23,7 +23,7 @@ #include #include #include "TestObjectStoreState.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc index 3d21fe264092..7cf31fa92984 100644 --- a/src/test/objectstore/test_idempotent_sequence.cc +++ b/src/test/objectstore/test_idempotent_sequence.cc @@ -25,7 +25,7 @@ #include "FileStoreDiff.h" #include "common/config.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_ diff --git a/src/test/objectstore/test_memstore_clone.cc b/src/test/objectstore/test_memstore_clone.cc index 5bcb58cc0da1..85d4132949e8 100644 --- a/src/test/objectstore/test_memstore_clone.cc +++ b/src/test/objectstore/test_memstore_clone.cc @@ -16,7 +16,7 @@ #include "common/ceph_argparse.h" #include "os/ObjectStore.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/errno.h" #include "store_test_fixture.h" diff --git a/src/test/on_exit.cc b/src/test/on_exit.cc index 36491c3fd3cc..aec1f78b787c 100644 --- a/src/test/on_exit.cc +++ b/src/test/on_exit.cc @@ -4,7 +4,7 @@ #include #include #include "include/on_exit.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #ifndef MAP_ANONYMOUS # ifdef MAP_ANON diff --git a/src/test/osdc/FakeWriteback.cc b/src/test/osdc/FakeWriteback.cc index 24a780288b3a..56d208b7d6a0 100644 --- a/src/test/osdc/FakeWriteback.cc +++ b/src/test/osdc/FakeWriteback.cc @@ -9,7 +9,7 @@ #include "common/Cond.h" #include "common/Finisher.h" #include "common/Mutex.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/ceph_time.h" #include "FakeWriteback.h" diff --git a/src/test/osdc/MemWriteback.cc b/src/test/osdc/MemWriteback.cc index 619d510da320..32d3a38f7595 100644 --- a/src/test/osdc/MemWriteback.cc +++ b/src/test/osdc/MemWriteback.cc @@ -9,7 +9,7 @@ #include "common/Cond.h" #include "common/Finisher.h" #include "common/Mutex.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/ceph_time.h" #include "MemWriteback.h" diff --git a/src/test/rbd_mirror/test_mock_fixture.h b/src/test/rbd_mirror/test_mock_fixture.h index 1fd2f9e70ce8..fdc28cc9b7a1 100644 --- a/src/test/rbd_mirror/test_mock_fixture.h +++ b/src/test/rbd_mirror/test_mock_fixture.h @@ -9,7 +9,7 @@ #include "common/WorkQueue.h" #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" namespace librados { class TestRadosClient; diff --git a/src/test/rgw/test_rgw_crypto.cc b/src/test/rgw/test_rgw_crypto.cc index 52e34fa8778d..bcf02ab1b978 100644 --- a/src/test/rgw/test_rgw_crypto.cc +++ b/src/test/rgw/test_rgw_crypto.cc @@ -18,7 +18,7 @@ #include "rgw/rgw_rados.h" #include "rgw/rgw_crypt.h" #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/test/signals.cc b/src/test/signals.cc index 42bd584b629e..dc24900a8c4e 100644 --- a/src/test/signals.cc +++ b/src/test/signals.cc @@ -11,7 +11,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context static volatile sig_atomic_t got_sigusr1 = 0; diff --git a/src/test/system/cross_process_sem.cc b/src/test/system/cross_process_sem.cc index 8b89d47bbfdf..93f10cbeae68 100644 --- a/src/test/system/cross_process_sem.cc +++ b/src/test/system/cross_process_sem.cc @@ -19,7 +19,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" /* We put our cross-process semaphore into a page of memory mapped with mmap. */ struct cross_process_sem_data_t diff --git a/src/test/test_cfuse_cache_invalidate.cc b/src/test/test_cfuse_cache_invalidate.cc index 4e8d757285e5..4b45cb39c7fe 100644 --- a/src/test/test_cfuse_cache_invalidate.cc +++ b/src/test/test_cfuse_cache_invalidate.cc @@ -8,7 +8,7 @@ #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define REGION 1048576 int main(int argc, char *argv[]) { diff --git a/src/test/test_rgw_token.cc b/src/test/test_rgw_token.cc index 002fb9c1900b..1f0c49e0375d 100644 --- a/src/test/test_rgw_token.cc +++ b/src/test/test_rgw_token.cc @@ -21,7 +21,7 @@ #include "common/ceph_argparse.h" #include "common/debug.h" #include "global/global_init.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "gtest/gtest.h" #include "rgw/rgw_token.h" #include "rgw/rgw_b64.h" diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc index ce9a5e54d96d..b52c6109cbf9 100644 --- a/src/test/test_trans.cc +++ b/src/test/test_trans.cc @@ -17,7 +17,7 @@ #include "common/debug.h" #include "os/filestore/FileStore.h" #include "global/global_init.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc index 4abb93644d8f..1f201ea78d09 100644 --- a/src/tools/ceph-dencoder/ceph_dencoder.cc +++ b/src/tools/ceph-dencoder/ceph_dencoder.cc @@ -22,7 +22,7 @@ #include "common/Formatter.h" #include "common/errno.h" #include "msg/Message.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define TYPE(t) #define TYPE_STRAYDATA(t) diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index 2080c7ba9a85..ce83562c3c34 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -36,7 +36,7 @@ #include "crush/CrushWrapper.h" #include "crush/CrushCompiler.h" #include "crush/CrushTester.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_crush diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc index cdda59ebcecd..1a4acbcb03fa 100644 --- a/src/tools/rbd/Utils.cc +++ b/src/tools/rbd/Utils.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "tools/rbd/Utils.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/Context.h" #include "include/encoding.h" #include "common/common_init.h" diff --git a/src/tools/rbd/action/Device.cc b/src/tools/rbd/action/Device.cc index 8d7ca5d9bd1c..3fdf2ef50aab 100644 --- a/src/tools/rbd/action/Device.cc +++ b/src/tools/rbd/action/Device.cc @@ -7,7 +7,7 @@ #include -#include "include/assert.h" +#include "include/ceph_assert.h" namespace rbd { namespace action { diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc index 25a1670f5a72..f7205ee758e4 100644 --- a/src/tools/rbd/action/Import.cc +++ b/src/tools/rbd/action/Import.cc @@ -17,7 +17,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index 6f4443d140ca..8044816b8660 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -18,7 +18,7 @@ #include #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include diff --git a/src/tools/rbd_mirror/PoolWatcher.h b/src/tools/rbd_mirror/PoolWatcher.h index d51b001700fc..c9c17ff66f03 100644 --- a/src/tools/rbd_mirror/PoolWatcher.h +++ b/src/tools/rbd_mirror/PoolWatcher.h @@ -16,7 +16,7 @@ #include "types.h" #include #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "tools/rbd_mirror/pool_watcher/Types.h" namespace librbd { struct ImageCtx; } diff --git a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc index b537f719765b..36f06866fe0e 100644 --- a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "tools/rbd_mirror/image_deleter/RemoveRequest.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" diff --git a/src/tools/rbd_mirror/image_map/StateTransition.cc b/src/tools/rbd_mirror/image_map/StateTransition.cc index 6e7746fc84be..ec5f07ff9953 100644 --- a/src/tools/rbd_mirror/image_map/StateTransition.cc +++ b/src/tools/rbd_mirror/image_map/StateTransition.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include -#include "include/assert.h" +#include "include/ceph_assert.h" #include "StateTransition.h" namespace rbd { diff --git a/src/tools/rbd_mirror/image_map/Types.cc b/src/tools/rbd_mirror/image_map/Types.cc index 6fdbad007214..47de9c3cf590 100644 --- a/src/tools/rbd_mirror/image_map/Types.cc +++ b/src/tools/rbd_mirror/image_map/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "Types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "common/Formatter.h" #include diff --git a/src/tools/rbd_mirror/instance_watcher/Types.cc b/src/tools/rbd_mirror/instance_watcher/Types.cc index 8dbf91220c71..0e9922733724 100644 --- a/src/tools/rbd_mirror/instance_watcher/Types.cc +++ b/src/tools/rbd_mirror/instance_watcher/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "Types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "common/Formatter.h" diff --git a/src/tools/rbd_mirror/leader_watcher/Types.cc b/src/tools/rbd_mirror/leader_watcher/Types.cc index a767db8d7a70..d2fb7908fa4b 100644 --- a/src/tools/rbd_mirror/leader_watcher/Types.cc +++ b/src/tools/rbd_mirror/leader_watcher/Types.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "Types.h" -#include "include/assert.h" +#include "include/ceph_assert.h" #include "include/stringify.h" #include "common/Formatter.h"