]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Rename "include/assert.h" 24098/head
authorBrad Hubbard <bhubbard@redhat.com>
Fri, 14 Sep 2018 04:22:00 +0000 (14:22 +1000)
committerBrad Hubbard <bhubbard@redhat.com>
Fri, 14 Sep 2018 04:22:00 +0000 (14:22 +1000)
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 <bhubbard@redhat.com>
260 files changed:
src/auth/Crypto.cc
src/ceph_mds.cc
src/ceph_mon.cc
src/ceph_osd.cc
src/client/Client.cc
src/client/Inode.h
src/client/SyntheticClient.cc
src/client/barrier.cc
src/client/fuse_ll.cc
src/common/Graylog.h
src/common/Mutex.h
src/common/OutputDataSocket.cc
src/common/Preforker.h
src/common/PrioritizedQueue.h
src/common/RWLock.h
src/common/RefCountedObj.h
src/common/SubProcess.cc
src/common/TextTable.h
src/common/Throttle.cc
src/common/WeightedPriorityQueue.h
src/common/admin_socket.cc
src/common/async/detail/shared_mutex.h
src/common/autovector.h
src/common/bit_str.cc
src/common/bit_vector.hpp
src/common/bounded_key_counter.h
src/common/buffer.cc
src/common/ceph_crypto.h
src/common/ceph_time.h
src/common/cmdparse.h
src/common/convenience.h
src/common/dout.h
src/common/fork_function.h
src/common/hobject.h
src/common/mClockPriorityQueue.h
src/common/mutex_debug.h
src/common/perf_histogram.h
src/common/shared_cache.hpp
src/compressor/Compressor.h
src/crimson/common/assert.cc
src/crimson/thread/ThreadPool.cc
src/crush/CrushWrapper.h
src/erasure-code/isa/ErasureCodeIsa.cc
src/erasure-code/isa/xor_op.cc
src/erasure-code/lrc/ErasureCodeLrc.cc
src/global/global_init.h
src/include/Context.h
src/include/assert.h [deleted file]
src/include/btree_map.h
src/include/buffer.h
src/include/ceph_assert.h [new file with mode: 0644]
src/include/cpp-btree/btree.h
src/include/denc.h
src/include/frag.h
src/include/mempool.h
src/include/on_exit.h
src/include/xlist.h
src/journal/Future.cc
src/journal/Future.h
src/journal/FutureImpl.h
src/journal/JournalMetadata.h
src/journal/Journaler.h
src/journal/ObjectPlayer.h
src/journal/ObjectRecorder.cc
src/journal/ObjectRecorder.h
src/json_spirit/json_spirit_reader_template.h
src/json_spirit/json_spirit_writer_template.h
src/krbd.cc
src/kv/KineticStore.h
src/kv/LevelDBStore.cc
src/kv/LevelDBStore.h
src/kv/MemDB.cc
src/kv/RocksDBStore.h
src/kv/rocksdb_cache/BinnedLRUCache.h
src/libcephfs.cc
src/librados/IoCtxImpl.cc
src/librados/RadosClient.cc
src/librbd/BlockGuard.h
src/librbd/LibrbdWriteback.cc
src/librbd/WatchNotifyTypes.cc
src/librbd/Watcher.cc
src/librbd/image/CloneRequest.cc
src/librbd/image/CreateRequest.cc
src/librbd/image/OpenRequest.cc
src/librbd/image/RefreshRequest.cc
src/librbd/image/SetFlagsRequest.cc
src/librbd/internal.cc
src/librbd/io/AsyncOperation.cc
src/librbd/io/AsyncOperation.h
src/librbd/journal/CreateRequest.cc
src/librbd/journal/RemoveRequest.cc
src/librbd/journal/ResetRequest.cc
src/librbd/journal/Types.cc
src/librbd/managed_lock/Utils.cc
src/librbd/mirroring_watcher/Types.cc
src/librbd/object_map/CreateRequest.cc
src/librbd/object_map/RemoveRequest.cc
src/librbd/trash_watcher/Types.cc
src/log/Log.cc
src/log/LogClock.h
src/log/SubsystemMap.h
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/MDCache.cc
src/mds/MDLog.cc
src/mds/MDSCacheObject.h
src/mds/MDSTable.cc
src/mds/Server.cc
src/mds/SessionMap.cc
src/mds/SnapClient.cc
src/mds/SnapServer.cc
src/mds/mdstypes.h
src/mgr/PyFormatter.h
src/mgr/PyModule.cc
src/mgr/StandbyPyModules.cc
src/mon/AuthMonitor.cc
src/mon/ConfigKeyService.cc
src/mon/Elector.cc
src/mon/HealthMonitor.cc
src/mon/LogMonitor.cc
src/mon/MDSMonitor.cc
src/mon/MgrStatMonitor.cc
src/mon/MonCap.cc
src/mon/Monitor.cc
src/mon/MonitorDBStore.h
src/mon/MonmapMonitor.cc
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/mon/Paxos.cc
src/mon/PaxosFSMap.h
src/mon/PaxosService.cc
src/msg/Connection.h
src/msg/DispatchQueue.h
src/msg/Dispatcher.h
src/msg/Message.h
src/msg/async/AsyncMessenger.h
src/msg/async/Stack.cc
src/msg/async/dpdk/DPDK.cc
src/msg/async/dpdk/DPDKStack.cc
src/msg/async/dpdk/EventDPDK.cc
src/msg/async/dpdk/IP.cc
src/msg/async/dpdk/TCP.cc
src/msg/async/dpdk/UserspaceEvent.cc
src/msg/async/dpdk/UserspaceEvent.h
src/msg/async/dpdk/ethernet.h
src/msg/async/dpdk/net.cc
src/msg/async/rdma/Infiniband.h
src/msg/simple/SimpleMessenger.h
src/msg/xio/XioConnection.cc
src/msg/xio/XioPortal.h
src/os/bluestore/Allocator.h
src/os/bluestore/BlockDevice.h
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueRocksEnv.h
src/os/bluestore/BlueStore.h
src/os/bluestore/fastbmap_allocator_impl.h
src/os/filestore/BtrfsFileStoreBackend.cc
src/os/filestore/DBObjectMap.cc
src/os/filestore/FileJournal.h
src/os/filestore/FileStore.cc
src/os/filestore/FileStore.h
src/os/filestore/JournalThrottle.cc
src/os/filestore/XfsFileStoreBackend.cc
src/os/filestore/ZFSFileStoreBackend.cc
src/os/filestore/chain_xattr.cc
src/os/filestore/chain_xattr.h
src/os/kstore/KStore.h
src/os/memstore/MemStore.h
src/osd/ECUtil.h
src/osd/OSD.cc
src/osd/OpRequest.cc
src/osd/PG.h
src/osd/PGLog.h
src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.h
src/osd/mClockOpClassSupport.cc
src/osdc/Journaler.cc
src/osdc/ObjectCacher.cc
src/osdc/Objecter.h
src/perf_histogram.h
src/rbd_fuse/rbd-fuse.cc
src/rbd_replay/ActionTypes.cc
src/rbd_replay/BufferReader.cc
src/rbd_replay/rbd_loc.cc
src/rbd_replay/rbd_replay_debug.hpp
src/rgw/rgw_asio_client.h
src/rgw/rgw_cache.h
src/rgw/rgw_coroutine.cc
src/rgw/rgw_cr_rados.h
src/rgw/rgw_cr_rest.cc
src/rgw/rgw_cr_rest.h
src/rgw/rgw_crypt.cc
src/rgw/rgw_env.cc
src/rgw/rgw_file.h
src/rgw/rgw_frontend.cc
src/rgw/rgw_ldap.cc
src/rgw/rgw_ldap.h
src/rgw/rgw_lib.h
src/rgw/rgw_metadata.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_period_history.cc
src/rgw/rgw_period_history.h
src/rgw/rgw_process.h
src/rgw/rgw_realm_watcher.h
src/rgw/rgw_rest.h
src/rgw/rgw_rest_config.cc
src/rgw/rgw_rest_log.cc
src/rgw/rgw_rest_metadata.cc
src/rgw/rgw_rest_opstate.cc
src/rgw/rgw_rest_realm.cc
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h
src/rgw/rgw_rest_swift.cc
src/rgw/rgw_rest_user.cc
src/rgw/rgw_sync_log_trim.cc
src/rgw/rgw_token.cc
src/rgw/rgw_user.h
src/test/fio/fio_ceph_objectstore.cc
src/test/journal/test_Journaler.cc
src/test/libcephfs/deleg.cc
src/test/libcephfs/flock.cc
src/test/libcephfs/recordlock.cc
src/test/librados_test_stub/LibradosTestStub.cc
src/test/librados_test_stub/TestClassHandler.cc
src/test/librados_test_stub/TestIoCtxImpl.cc
src/test/librados_test_stub/TestMemRadosClient.h
src/test/librados_test_stub/TestRadosClient.cc
src/test/librados_test_stub/TestWatchNotify.cc
src/test/librgw_file_marker.cc
src/test/librgw_file_nfsns.cc
src/test/mon/test-mon-msg.cc
src/test/mon/test_mon_workloadgen.cc
src/test/msgr/test_msgr.cc
src/test/objectstore/DeterministicOpSequence.cc
src/test/objectstore/TestObjectStoreState.cc
src/test/objectstore/test_idempotent_sequence.cc
src/test/objectstore/test_memstore_clone.cc
src/test/on_exit.cc
src/test/osdc/FakeWriteback.cc
src/test/osdc/MemWriteback.cc
src/test/rbd_mirror/test_mock_fixture.h
src/test/rgw/test_rgw_crypto.cc
src/test/signals.cc
src/test/system/cross_process_sem.cc
src/test/test_cfuse_cache_invalidate.cc
src/test/test_rgw_token.cc
src/test/test_trans.cc
src/tools/ceph-dencoder/ceph_dencoder.cc
src/tools/crushtool.cc
src/tools/rbd/Utils.cc
src/tools/rbd/action/Device.cc
src/tools/rbd/action/Import.cc
src/tools/rbd/action/MirrorPool.cc
src/tools/rbd_mirror/PoolWatcher.h
src/tools/rbd_mirror/image_deleter/RemoveRequest.cc
src/tools/rbd_mirror/image_map/StateTransition.cc
src/tools/rbd_mirror/image_map/Types.cc
src/tools/rbd_mirror/instance_watcher/Types.cc
src/tools/rbd_mirror/leader_watcher/Types.cc

index b94b7949f44a33cf07ae3bd603af6b7d32911af3..bd0ee383d87fdf7b6c5ea0e25b36f500286b735f 100644 (file)
@@ -20,7 +20,7 @@
 # include <openssl/aes.h>
 #endif
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/Clock.h"
 #include "common/armor.h"
 #include "common/ceph_context.h"
index 9e5d499605450e3a6c0b780f54a1dfc3436fab09..010a441d7d59a263d58ae0fdb8c13bb65a465ad2 100644 (file)
@@ -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
index eb0152d7f51da6e7f4ff5ca0c37da77b251aecec..adee3ec3182238268e9e5b2941a7e0281bc9253d 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "perfglue/heap_profiler.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_mon
 
index 3974792382fd79956e97897cfca2473f9bfda356..0cd40fa5dc94dff4b6e06dfca89423cdff80b1ad 100644 (file)
@@ -45,7 +45,7 @@
 
 #include "perfglue/heap_profiler.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "common/Preforker.h"
 
index 6d177a7157898dcac7dc5d720323b9de0822c7a1..52e7adc266caf621716c90b0b7987414a6f9d0f1 100644 (file)
@@ -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"
index b3b5b6e4be0b62a568bf92f3219d252d93a5bb7a..41c4e611025a9dfea682e9c400d0ee21d2e92230 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <numeric>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/types.h"
 #include "include/xlist.h"
 
index ed74923a7291d937b448316f8c9d4c6c3fbdffc5..f511168386f749b764488baf755c9eee749f7863 100644 (file)
@@ -35,7 +35,7 @@
 #include <sys/statvfs.h>
 
 #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
index 3f2937c2063e95d5319bbecc9e18998a21cc213d..260384499b991e1c2345a5343023a2018866a0ef 100644 (file)
@@ -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 << " "
index b112ec7488ce8038c5f86b83e63c42e92772c3b9..47140c784dab3fc3a6cfa38d715fe16d7e3a74d9 100644 (file)
@@ -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"
index 70cd770504ebc4311bbcd8f7b2429b427f60fcd7..6e5a22972470cf60509d1f932ebdeb62ea232a95 100644 (file)
@@ -8,7 +8,7 @@
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/filter/zlib.hpp>
 
-#include "include/assert.h"  // boost clobbers this
+#include "include/ceph_assert.h"  // boost clobbers this
 
 struct uuid_d;
 class LogEntry;
index b02ac3e38ab92f8c51972d0a37b5c6362c79aa75..2784319295f56dbba0a06b6ed128c7bc97ebeae2 100644 (file)
@@ -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 <string>
index bbee667f329f91083cc361c26e4ab86f01e26866..9752ce318cc2ac6f98072a5e358816a04e8f9922 100644 (file)
@@ -22,7 +22,7 @@
 #include <sys/un.h>
 
 // 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
index f9e1de170f3ed9dfcb2a49cd94d04dc39609b2ac..a4d7af8f9a0032942855312a2b844d47edcb79e2 100644 (file)
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <sstream>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/safe_io.h"
 #include "common/errno.h"
 
index aade0b91b4f7888d3825b19a1ae8e5aae935563f..2e86d1069ff45109f9fcd36aee3085106af09a74 100644 (file)
@@ -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"
index 8a5a0e820764361a3d5534cd2a1ac144bca1e499..94ba7a00116401351e0b1e66010e974f3b07b4b6 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <pthread.h>
 #include <string>
-#include <include/assert.h>
+#include "include/ceph_assert.h"
 #include "acconfig.h"
 #include "lockdep.h"
 #include "common/valgrind.h"
index 510a6682f9888fbf29cbcb24f709600005f65475..e840e4082d656f21998dd390265a23fd38adbf06 100644 (file)
@@ -23,7 +23,7 @@
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 // re-include our assert to clobber the system one; fix dout:
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 struct RefCountedObject {
 private:
index 1190e6df70cee9a8bbb234f52d58aa620b632528..2bc1cf413a1249f315bdf06ed30bd63569577f82 100644 (file)
@@ -9,7 +9,7 @@
 #include <iostream>
 
 #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_),
index c60ba5f4490ef16716211c70460dcb185082580c..53ae4b9f38ad87aca3bbd7adf72390e432dac6ba 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <vector>
 #include <sstream>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 /**
  * TextTable:
index 3186d8a22cbad091d864aa0b742104ebf62b1b5e..4dac8fb7444f561844329d080f58930bec954aaf 100644 (file)
@@ -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
 
index 9ab8875ee246fad1ef27fd097d386012866f5b8f..877187d8015ec09817a5e4eb6b060d5c212aa0ca 100644 (file)
@@ -21,7 +21,7 @@
 #include <boost/intrusive/rbtree.hpp>
 #include <boost/intrusive/avl_set.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace bi = boost::intrusive;
 
index a4567120aca44e626cbbe8d7db77af11e8ba929f..decb8c3b8f54b1c00ccd03f8ce6797516e146f4c 100644 (file)
@@ -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
index 1a79a69d4e14faf9807e502157ea1966a90b325b..8e5436350cfd63fda4a300f6c4ae92e06e0862a3 100644 (file)
@@ -23,7 +23,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/intrusive/list.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "common/async/completion.h"
 
index 503e239ce773b1164f37f008e0edb6ad1f24d278..f52a585f2a08d1cd1647fc13e7d3b8aed2e8975d 100644 (file)
@@ -13,7 +13,7 @@
 #include <stdexcept>
 #include <vector>
 
-#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.
index 5f72d9983f7ff49a02e6f8cfdeef980f4f0a6a11..f14b2daad9c57cd2d91f25170d17a19bcdaf7991 100644 (file)
@@ -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,
index a07dc83b5322963a99b7472d67bebe6237c120eb..8c6fab4452fcb3fb0ad91ef2acd9a1cd5fb61088 100644 (file)
@@ -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 <utility>
 
index e146a31f87630ac895f2e1d936eae7435b7cf7fc..ee7fa304a191892ba16d95ea27b4cac04d4c087d 100644 (file)
@@ -22,7 +22,7 @@
 #include <tuple>
 #include <vector>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 /**
  * BoundedKeyCounter
index d5bf6703228b672a09e0292cd74d77f02249893d..35e8c84d711739e28f72cc0daed03d58d4e582d2 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <sys/uio.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/types.h"
 #include "include/buffer_raw.h"
 #include "include/compat.h"
index 909044208016f21f20006f8d0e93c672ed16731e..2234e9c05819e5721dd315f2706a80cb286eb7b8 100644 (file)
@@ -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 {
index 79f410095423bba666f153e9a6918ffb2b98152e..8b300e2158949139bcc56237cce7c7ea748007f1 100644 (file)
@@ -20,7 +20,7 @@
 #include <string>
 #include <sys/time.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #if defined(__APPLE__)
 #include <sys/_types/_timespec.h>
index 761d468b5277a2bea57edc2b42971b20334e583e..ee3844fb8fbdbeb9249fe5e492e81e02197e99bc 100644 (file)
@@ -7,7 +7,7 @@
 #include <stdexcept>
 #include <ostream>
 #include <boost/variant.hpp>
-#include "include/assert.h"    // boost clobbers this
+#include "include/ceph_assert.h"       // boost clobbers this
 #include "common/Formatter.h"
 #include "common/BackTrace.h"
 
index 3989c70d1043cca2523f1b5c3850830425574f30..c230288675f77900fa2e6b8f7a5770833ff205fb 100644 (file)
@@ -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.
 
 
index a98dcfa3e1ef0c61e8b3e9ea2fd1af417f1b30c8..e8ec1733833083ed18b8baea41dfa9346e4060b5 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <type_traits>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #ifdef WITH_SEASTAR
 #include <seastar/util/log.hh>
 #include "crimson/common/log.h"
index 137d9e6373d698dc5c2fd45cc04cf70aff70e758..6f533c87f93448b3abd5cf17718b59213d05c7f3 100644 (file)
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <ostream>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/errno.h"
 
 static void _fork_function_dummy_sighandler(int sig) {}
index b9f277bc8ef2782a7b59e51592adf5d0ac9ccd7a..e04c378c85ccad31c56c523eca0c09a9849acd65 100644 (file)
@@ -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"
 
index 1e07ba92d4a410190f487a11ff2b6e7a5ab5231f..5a87de35f515a2ef7f20ced7663701d182be3be6 100644 (file)
@@ -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 {
index e19344e88445b1ecbd54115be1fe4ab75343408c..d4a60f7181bf58f433ab362072465f5506b44c45 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <pthread.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "ceph_time.h"
 #include "likely.h"
index dc4832e36499b01bc733ddacd6128a2d89b76279..3052106be20f589d5c73af418327c1324ea71d9f 100644 (file)
@@ -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:
index e728984d6a2f6c0db53e1858b4cc47233d5f39d8..5aa4963722d0a80c128e8a653a88842cdd9be519 100644 (file)
@@ -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 <class K, class V,
          ceph::LockPolicy lock_policy = ceph::LockPolicy::MUTEX>
index d09c916f377f5682491944a0517524969405eda9..a696521ad6745d96d6f067019f342865ee02d74a 100644 (file)
@@ -19,7 +19,7 @@
 #include <string>
 #include <string_view>
 #include <boost/optional.hpp>
-#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
index 9b34cb529029bf7c0aee8ed17befd15233b46df2..9ed6b7e3bc37e67a8111a1e1e99dd8e781bb0981 100644 (file)
@@ -3,7 +3,7 @@
 #include <seastar/util/backtrace.hh>
 #include <seastar/core/reactor.hh>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "crimson/common/log.h"
 
index 0154344c212cc1b3bbe14a0e81b100526079851e..9df849b54c7925af0557335fc21dfe90c0fe41a5 100644 (file)
@@ -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 {
 
index ba43e296dda3b053c19b0c77a323118e25c7273a..74e23065b7617b45d85c8974e9b3adc707cda768 100644 (file)
@@ -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"
index cf8e5cadd1cbd943af52e72a1c16554bb29998fe..fec86a9ac2ceb87b6b32be31f2e1bdcc67e4c69e 100644 (file)
@@ -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;
 
 // -----------------------------------------------------------------------------
index 5ddcced8c796b30dd1072746bfd00e02ade580ea..2b56e977c7fd92c20b4a57b4c6bb78f286e25c6c 100644 (file)
@@ -16,7 +16,7 @@
 #include <string.h>
 #include "arch/intel.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 // -----------------------------------------------------------------------------
 
index 772704522774ca072c4592d1dd6b8d1053ca06bc..2526774c38ac30ecddb6175819178f4e8836e81d 100644 (file)
@@ -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
index 2c4bf2ebbc63da4d958d90986409ff5ad10e8e58..fe6f557bb253ea139455be4c6dbdaf8bcd218348 100644 (file)
@@ -19,7 +19,7 @@
 #include <vector>
 #include <map>
 #include <boost/intrusive_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/code_environment.h"
 #include "common/common_init.h"
 
index b5e582702f6029d6ad7a2628db2c055ea66378e7..050a7fdfbb9c5121c280006a0b3446d7a04af0f3 100644 (file)
@@ -23,7 +23,7 @@
 #include <set>
 #include <memory>
 
-#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 (file)
index 5fb9855..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef CEPH_ASSERT_H
-#define CEPH_ASSERT_H
-
-#include <cstdlib>
-#include <string>
-
-#if defined(__linux__)
-#include <features.h>
-
-#ifndef __STRING
-# define __STRING(x) #x
-#endif
-
-#elif defined(__FreeBSD__)
-#include <sys/cdefs.h>
-#define        __GNUC_PREREQ(minor, major)     __GNUC_PREREQ__(minor, major)
-#elif defined(__sun) || defined(_AIX)
-#include "include/compat.h"
-#include <assert.h>
-#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<void>
-
-#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
index 28949849a89efdd97376ad1d6d7a2df838c79e5d..1f42ea41414f2f75237e135ef94f5e963eb0a6a6 100644 (file)
@@ -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<class T, class U>
index 0fdbec51ac9dbddeae7ede6806d3e9f42657facc..3f866e39d2c460a3a9f9015604d349e60919e9a1 100644 (file)
@@ -55,7 +55,7 @@
 #include "buffer_fwd.h"
 
 #ifdef __CEPH__
-# include "include/assert.h"
+# include "include/ceph_assert.h"
 #else
 # include <assert.h>
 #endif
diff --git a/src/include/ceph_assert.h b/src/include/ceph_assert.h
new file mode 100644 (file)
index 0000000..5fb9855
--- /dev/null
@@ -0,0 +1,149 @@
+#ifndef CEPH_ASSERT_H
+#define CEPH_ASSERT_H
+
+#include <cstdlib>
+#include <string>
+
+#if defined(__linux__)
+#include <features.h>
+
+#ifndef __STRING
+# define __STRING(x) #x
+#endif
+
+#elif defined(__FreeBSD__)
+#include <sys/cdefs.h>
+#define        __GNUC_PREREQ(minor, major)     __GNUC_PREREQ__(minor, major)
+#elif defined(__sun) || defined(_AIX)
+#include "include/compat.h"
+#include <assert.h>
+#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<void>
+
+#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
index 22872b6ba30e7e9cb1ac9b4c51f507256c6f3ccd..0a40e0e180889047a7583884bd48f9bdb703e172 100644 (file)
 #include <string>
 #include <utility>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace btree {
 
index b1bd7802ddb657fc8ae7f7f73b774c8b0477f458..c8d79f8886893bcfc593096983d28e0a25eacdc2 100644 (file)
@@ -38,7 +38,7 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/optional.hpp>
 
-#include "include/assert.h"    // boost clobbers this
+#include "include/ceph_assert.h"       // boost clobbers this
 #include "include/intarith.h"
 #include "include/int_types.h"
 
index 09cb6e4867e16af2b6f37a7d202d1ad786cbb2bb..8c841ef4fee481c69c439aafc09252cff60c8a34 100644 (file)
@@ -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"
 
index e03a1f9071460d7a3bf76899439c032cd8561750..155ec18d438242e0a7ce0edd99b5277846649fa4 100644 (file)
@@ -28,7 +28,7 @@
 #include <boost/container/flat_map.hpp>
 
 #include <common/Formatter.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/compact_map.h"
 #include "include/compact_set.h"
 
index 1642c6820405388e8b0b18fa2f4472e99edd498f..c412ab33e0834e00de0e63c7b7ba92605964cba8 100644 (file)
@@ -4,7 +4,7 @@
 #include <pthread.h>
 #include <vector>
 
-#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().
index 0204155e169c53cddd61d2760cfeff8f60a9c69f..69c6e1c640c02536dab946152f9888206f0f084c 100644 (file)
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <ostream>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 template<typename T>
 class xlist {
index c2eaa967ac90675d79852977ac60dcfee519cca7..89f7fd326e9b47456f30fed89e27edbc23634fa9 100644 (file)
@@ -3,7 +3,7 @@
 
 #include "journal/Future.h"
 #include "journal/FutureImpl.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace journal {
 
index 1ddb606563282e8c6e3b74e0d297936c238401af..fef0015651c88310e4f99fb8ce2de914e41a21a3 100644 (file)
@@ -8,7 +8,7 @@
 #include <string>
 #include <iosfwd>
 #include <boost/intrusive_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class Context;
 
index f44f0e08913e42eeb6149016a586437c2eae7888..1f56a4ad567025cc02716a6ce76b6dbf7691831e 100644 (file)
@@ -12,7 +12,7 @@
 #include <map>
 #include <boost/noncopyable.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class Context;
 
index ed063b0237f4be80c97d776f53a445736a54cbb9..393d20297d834e6ccf981149288f08fc2aa25c98 100644 (file)
@@ -22,7 +22,7 @@
 #include <list>
 #include <map>
 #include <string>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class SafeTimer;
 
index c5194ced512496a538b69392fd53205ae99369a2..1424cb7576129b8d23019acc5849ac2ea048766e 100644 (file)
@@ -14,7 +14,7 @@
 #include <list>
 #include <map>
 #include <string>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class ContextWQ;
 class SafeTimer;
index a3cbe807332f32182bfca354de051e18e00db344..b9062b832b0d3dd04cd3a2cbb8e397ad52c08a37 100644 (file)
@@ -16,7 +16,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/unordered_map.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class SafeTimer;
 
index bc7b927b8c86a7de7c287eab48512db83b66f23f..f39ca981cc0c70b603edfe85bb26d26bffb34bad 100644 (file)
@@ -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"
 
index 2b754e5be3fe1e2c62b0704ae0f9453403997cb3..8d250e5f04230367842450caae86ca7c563cdec4 100644 (file)
@@ -16,7 +16,7 @@
 #include <set>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class SafeTimer;
 
index c0d3b90f0721dcd9c37eb74644cb53791b234fdb..59a8a0512653e36d96b207fee122d51fc73a990a 100644 (file)
@@ -37,7 +37,7 @@
     #define spirit_namespace boost::spirit\r
 #endif\r
 \r
-#include "include/assert.h"\r
+#include "include/ceph_assert.h"\r
 \r
 namespace json_spirit\r
 {\r
index 4eec0b4ea6632a334aabb1d31d4d358511a1e798..2e34268a2c0175193dbab54c934b0a2c3deb7af0 100644 (file)
@@ -17,7 +17,7 @@
 #include <iomanip>\r
 #include <boost/io/ios_state.hpp>\r
 \r
-#include "include/assert.h"\r
+#include "include/ceph_assert.h"\r
 \r
 namespace json_spirit\r
 {\r
index 74163c7edddb11aa7a343a0907d928161eb45a5d..d9fa1727d6db90ba94ca3ce81fa5fdef08a64b84 100644 (file)
@@ -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"
index b7c669a66913bfbfb73eabe20e5427d71e4e85e8..b22d4f0218f55b2440a2c20e70084962169a0d06 100644 (file)
@@ -14,7 +14,7 @@
 #include <errno.h>
 #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"
index fdad594bba321559ad64f44e538f61711d7e7e06..bdd76e431835307f3cdafc907efa14e2a274afd5 100644 (file)
@@ -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
index 9700de62f78e423a81b7859e2821fcead854ef7f..34fdb7a6935be4441228f6b4706c0e4563d911b0 100644 (file)
 #include <errno.h>
 #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;
 
index cadda26d5716d6e2a97cfb1016d4e25e690d7dbd..c648dd9fb515138a895690abda6e7c9a3b37bce6 100644 (file)
@@ -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"
index 08477dded929c668e8494163b89c38e1b56003a5..041474138c1cfd6319a2a1735aeb197d511155db 100644 (file)
@@ -19,7 +19,7 @@
 #include <errno.h>
 #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"
index 94b76b422a97aa6451710a951f80ad69f19152e4..0cf9819f8686202ba32173322b2bfe1b8e2c5168 100644 (file)
@@ -16,7 +16,7 @@
 #include "ShardedCache.h"
 
 #include "common/autovector.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace rocksdb_cache {
 
index 8773005b0141da050375705a7719eed6c81bd742..1f6ba5cb92b563b792b114caa80e0d26730c61c0 100644 (file)
@@ -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"
index 41ef8f547aa065a88fb5530a769ed65a51810f37..cd93c44a9528f1fd7c594205be9e5f5f3ac88c51 100644 (file)
@@ -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"
 
index 51d3b9f2cebbb61e4814f07fcb422e394d3c9655..65966ade4a0ed12ecaec0abcc9d2c5210ef024c3 100644 (file)
@@ -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
index 46c91b44b66ae77d9a9c4591940f2940e0b20ac1..062f1901d61b7c1f08803b3f9a2e34841711a317 100644 (file)
@@ -11,7 +11,7 @@
 #include <boost/intrusive/set.hpp>
 #include <deque>
 #include <list>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
index da44fbf82d481f3b8da8c5ca2b55955cb7c5f3d4..b19dd5a741badf4d2296aec1818bec4f8e0ebd5c 100644 (file)
@@ -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
index 42d84dc59c27e0aee8b1817af0f59faf5e3cfb6f..a340019e81b4d02ed62e5e8b564af711d2102d34 100644 (file)
@@ -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"
index 45de8d7eb445c2febab14507d9a82fd97ad8ee07..7d1a67ebdfe7ef9fd60f6d73e84573856be43b43 100644 (file)
@@ -11,7 +11,7 @@
 #include <boost/bind.hpp>
 
 // 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
 
index b90c777c1e67b9d771cf8841dc160cb65a3f93fb..1889481ba9889fe801d4d1f5a7a17c30cc8a4309 100644 (file)
@@ -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"
index 782259c6e80a30b1796ec9bb13115a875a85e16f..08abc6831f5ddd525e02be77339b1969eee40c8c 100644 (file)
@@ -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"
index 6e47b7bf724dbb2c7d358a06db68b102097f5824..113e5d622694e3129fddcc66cf6f78b3fbdff1fd 100644 (file)
@@ -12,7 +12,7 @@
 #include "librbd/image/RefreshRequest.h"
 #include "librbd/image/SetSnapRequest.h"
 #include <boost/algorithm/string/predicate.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
index 717648a4721254872eab94f8b1a3fddde14024d5..a5289a6dc520a7434bc53b831a16ec9e3654116e 100644 (file)
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include <boost/algorithm/string/predicate.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "librbd/image/RefreshRequest.h"
 #include "common/dout.h"
index 71a864244d2e00792f25e1e66699e8269c4c053e..a18c749948a8323ef21aae35a0685b0023a78125 100644 (file)
@@ -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
index 3285fcab4e0554dd4f47dc4eaab3ae507021fb1a..d7d26066d4e81bd877465080c0765138b9f2c3bb 100644 (file)
@@ -56,7 +56,7 @@
 
 #include <boost/scope_exit.hpp>
 #include <boost/variant.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rbd
 #undef dout_prefix
index fddb621e220cceaca9a37a85ddf84766d770f1b7..e2bdc3b306017815226f17017ad429b320580f88 100644 (file)
@@ -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
index 1f22e72db8165414917ae106ba3130e8672f4bd2..8a01e5c742e307e839e09f2ad4acafe8e236bedc 100644 (file)
@@ -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 <list>
 
index 68fd088c102443456656c9d100692e092ca19504..4f10ec6571c13dd95bc875894cdb1b5a73f280dc 100644 (file)
@@ -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"
index aa2d13e8652c416dd6886b3fc7c0fa2e50e075df..6ed5f54c3b53e2d20f34279d9201de83e776ee7a 100644 (file)
@@ -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"
 
index 4fb5fa4dd7952160285affb39ee2d14ca22b210a..9b67f3e452ce74361ac844b03879f4c277b50a47 100644 (file)
@@ -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"
index 03e62660bc61045c4e6680b94f40e78ec91954ae..75e71a21e0349e596c8c8d34f90d0c4f5c1af082 100644 (file)
@@ -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"
index 89ac6aae5648556d1fadb36ed1359ac926340898..0b4f908dd6883f57bef8406d150598725ecb26ab 100644 (file)
@@ -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 <sstream>
 
index b723ba87ac8c9e080e73e40cdff6a6deeb3bb2a2..3226b6352f79eb4048c7d676ee5086976fe7f32e 100644 (file)
@@ -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"
index f4eee5594fa9fdf02b23dbae82e8dfec1cd76607..a2b9d8f60d67908e22a0974a68221dad73e299d6 100644 (file)
@@ -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"
index ee6e27464095db44ab16c1c41958f2e416b98552..a7db0c030611f564923b6d07dfc826da76c47477 100644 (file)
@@ -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
index f3e338140ce93e2ab494108b7d47b898600d3ea7..c95ea223b936e0c18028b61fba80b998afcfe160 100644 (file)
@@ -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"
index c1f8e76562a4b2f513cf968860ec76af9d85273c..be57c6d5257990ef5ccc4e0340ff2520645654c8 100644 (file)
@@ -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"
 
index 14bddbd2537b11920c1217a5f007869fc0828951..5cd4e77d8fe8da88ec9de273f53f2a0268099439 100644 (file)
@@ -9,7 +9,7 @@
 #include <ctime>
 #include <sys/time.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/ceph_time.h"
 
 namespace ceph {
index 9df9c9132d189a69de32e2fb3c7fdee03e9a2f1d..4d33ab3b1aa868753e7ebe737249270a1220b8b2 100644 (file)
@@ -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 {
index 7efeab7398bbc7e24315947d91201ff4846286de..d63236643db062f837d057919e801e6bd7f7b401 100644 (file)
@@ -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
index ac08db1a866f0f24c389bd4e224d697ba9eb2b93..ad7b3eb9cd9d2aa9b1689224e31d314ff7f05c69 100644 (file)
@@ -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"
index 462bd2957f1835c48b301c4acee7c43803ac0f70..2eef3ded9fc28735cd6ce9b5bf087700ee1111de 100644 (file)
@@ -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
index 94d933bfd98c8973cd9aa4088dd7475821dfcdf7..5990693e6e5418a1974fad4ba787faec392496bf 100644 (file)
@@ -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
index 27f20349476b719f2e86b9012a19b3d7c7bedb69..c69ca9d9d071de49751376042a947d57f40c6939 100644 (file)
@@ -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"
index bc575033019a1a2c76a284043537f2fae8b44d11..8af30ac547159bbbaf06b911f8b00d81958ef7c4 100644 (file)
@@ -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
index aad94d4d8a03bad9f15a09bc4f1917c0eff97e6c..9825066adbfba5ad35e05ec93b56432531e3755f 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #include <boost/lexical_cast.hpp>
-#include "include/assert.h"  // lexical_cast includes system assert.h
+#include "include/ceph_assert.h"  // lexical_cast includes system assert.h
 
 #include <boost/config/warning_disable.hpp>
 #include <boost/fusion/include/std_pair.hpp>
index 838899f60ce9fc76500b0e4af656dd1b5cf958e8..8d54bd6d30708f64601a626b16da858eaaa4dc78 100644 (file)
@@ -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
index e4fcbbba172d6de5a5c807267af082a1cfb7edfb..88237424c87cf9a216ef8a9a7bbd27e622ff2dd3 100644 (file)
@@ -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
index 16b42e9ae4ef9c8c8453f4a962851c78ffa9fb83..27611f4af1474d5e54224e7fbb169428c5e1072f 100644 (file)
@@ -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
index 6d72bd4e19e9dbb75dacd7c864b2797577833640..12a6ab4165a2d6c10fc8b4d528b7d551eee794d9 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/pool/pool.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include <boost/serialization/strong_typedef.hpp>
 
 #define CEPH_FS_ONDISK_MAGIC "ceph fs volume v011"
index 9c7d54eebbc46470668f56cfe5839c8e34e74df1..d65e14167e97ca3b833ca6f20a7a360a6f665cea 100644 (file)
@@ -25,7 +25,7 @@
 #include <list>
 
 #include "common/Formatter.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class PyFormatter : public ceph::Formatter
 {
index 90333629a60da41d99df3f65d51346d845efd32c..cd97f4b5286060eef1072e2fa50b68a1a35529e2 100644 (file)
@@ -32,7 +32,7 @@ std::string PyModule::config_prefix = "mgr/";
 // Courtesy of http://stackoverflow.com/questions/1418015/how-to-get-python-exception-text
 #include <boost/python.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#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()
 {
index 0113ae1cf30f666564b09916ae4d96022ba704a9..f2d1eeb45b8d4a01ba6cf65d0f6ba4f9d7ee864b 100644 (file)
@@ -21,7 +21,7 @@
 
 
 #include <boost/python.hpp>
-#include "include/assert.h"  // boost clobbers this
+#include "include/ceph_assert.h"  // boost clobbers this
 
 // For ::config_prefix
 #include "PyModuleRegistry.h"
index 37640888696ef2d8dc5b32ac465849f6a0bc8a57..dd8d5dcbbbfc554c8d611aa490f9ba5df7ab16c6 100644 (file)
@@ -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"
index 05c38ec4f764af945b9fbf0109af373557b197ea..38a22d16496e5a37e68ac7d5e11389d644704a14 100644 (file)
@@ -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)
index c95ad3f203355f1109a5012a7369b0326f6e76fe..ae97dd6caba094e495c295fe8e903c8d1c8a973d 100644 (file)
@@ -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
index 699794441073f79b5f20a8067550d99598813ef4..93d209c4a5563aef2d74df55b34dd7ac6df24905 100644 (file)
@@ -17,7 +17,7 @@
 #include <sstream>
 #include <regex>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/stringify.h"
 
 #include "mon/Monitor.h"
index 446ca1d2fb007e7e53642b9f1ee510a4828f02e6..14ab4c8d110f68d7eddd6aa1138a36084402711e 100644 (file)
@@ -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"
index f127833d6a4bb1e2205924946d847af8945bdc87..4017b860ba9870979b4d2c6bbb59dba45c3c261f 100644 (file)
@@ -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"
index 545f64bd2c57d4198c733b5708744644426d1cd4..ab87ab42edc72becb6e171de3c6b4dbad99e1103 100644 (file)
@@ -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
index 1724a10ae5290f4081292e80b802018665483566..1465d48246536a9a630e1054503e5a80e69a5629 100644 (file)
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <regex>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 static inline bool is_not_alnum_space(char c)
 {
index d1283834a17b8f32ed37e8114386530c798d2289..b03f68e727e01ca32f91d16966296c074364a5d8 100644 (file)
@@ -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"
 
index e037ee44d86825adde336acef074c0305fde3a27..abc06f9ea461072d9666bbbf3c6deb3107f2f30e 100644 (file)
@@ -23,7 +23,7 @@
 #include <fstream>
 #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"
index a7612aef101f8916efeb001477e668b8fa21a88a..667fdf2d4a19a861ccb70f2fafc937e4fb8c2fcc 100644 (file)
@@ -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
index 31a975fa3d2584c4b94592ffcb07c5d923916c83..f611fcad7e6e3c0f2b656489cc2b43b62c2fe50f 100644 (file)
@@ -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"
index 492e2ce6de8cc918c791267bce9299a8a43bacda..8c6ecb864da53573d52c2405747c85c3013e1178 100644 (file)
@@ -44,7 +44,7 @@ class MOSDMap;
 #include "mon/MonOpRequest.h"
 #include <boost/functional/hash.hpp>
 // 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 {
index bd0f8022444521a370639329999e5305c860cadb..ff58212af763beaaca76dc0df3e6157429b62d03 100644 (file)
@@ -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"
index 0c8d5d75d7464ab9c5fee3ab76cdc09fa4b72072..f7f8a380a6faade9fb8baf332f0fd278521c8b27 100644 (file)
@@ -18,7 +18,7 @@
 #include "mds/FSMap.h"
 #include "mds/MDSMap.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class PaxosFSMap {
 public:
index 7d3ff2c7b98763c4f9e56b0e6f5adde817195dd3..06776635f94966ddeea1c2ab387252614bdedd7c 100644 (file)
@@ -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
index 7d0f39385282ff1f310317709b86c742f7f8e328..03375a4dc8ce9fecc9cf392a0219f284e035a354 100644 (file)
@@ -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"
index 30e6b654f66d36737c04d925eb91f05468595b31..2d90d82c433a98a9391504c32d01342bf5e610e8 100644 (file)
@@ -19,7 +19,7 @@
 #include <map>
 #include <queue>
 #include <boost/intrusive_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/Throttle.h"
 #include "common/Mutex.h"
 #include "common/Cond.h"
index c5f19736cda154d198376910d17dd6b494f14fc8..4596abade810bf50965247f3e913913ffa06e577 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <memory>
 #include "include/buffer_fwd.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "msg/MessageRef.h"
 
 class Messenger;
index 29c04645a7c7e5e2fceb4ebc5541907087b91865..02d1e95ed966e10356241d8df793cad0d91bad45 100644 (file)
@@ -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"
index d349bab221d0e4b2b9b82180c3df91a13e6b69f3..27c228ed9955fc3442a25fa682c7e6bb1aaf0051 100644 (file)
@@ -35,7 +35,7 @@
 #include "AsyncConnection.h"
 #include "Event.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class AsyncMessenger;
 
index ef6ead8a419d8500d737c144c45531d72f3394b1..8e2d1ec13ac8797cebbcde609245447fb0839cd7 100644 (file)
@@ -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
index 5fc2cf938d1450bb47e76d031cd238869f3582a8..278efe9ed071bfbd4862308c48a00d08680b0163 100644 (file)
@@ -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
index fabfb024129fc0a2c479f181f823795a4ba84f8f..9954e6701b20e8a8706f2a0f8b612f344f5142b3 100644 (file)
@@ -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
index 0a80bc7a02d56c85370a9f4468c542237d91be11..5d291716c719f7d2dac047a5622084b7c73fab46 100644 (file)
@@ -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
 
index 2ad9dadcf5a55c19e50f820cfaf82797036c195d..f730cded9e12a13ecf87b26c20865a65088c584a 100644 (file)
@@ -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
index dec159b6cc1fe77d87dd29abea6547ef518107d4..c6397709b1a7aecb8cbe212d6d936eb8358716b1 100644 (file)
@@ -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
index fce6588757cf47f19e75a10a98f6d645fdf41eb9..282dcef12f60d570156266df15f263309fe43c67 100644 (file)
@@ -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
index 01ef0dc6643e4eaab26729d990be1fe2eff80875..7e89517df873d3d071c0b6a067e7df53ee9c5c59 100644 (file)
@@ -23,7 +23,7 @@
 #include <vector>
 #include <list>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/int_types.h"
 #include "common/Tub.h"
 
index 858df89a47371478b1b76f2ce47dbbce3d5db282..b007425fe92563f373d93bea967d64622f2c279a 100644 (file)
@@ -26,7 +26,7 @@
 #include <array>
 #include <sstream>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "byteorder.h"
 
 struct ethernet_address {
index 29e341195d2cb59523aa979710b5278a690b47aa..6e361f182d1507da6b843a91b38c285d3e2da323 100644 (file)
@@ -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
index 319130ff8617e6135b4b30ad72580be147840a2a..974db59b1fa1ff6dca85f9432d4ee2cf24250d48 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <boost/pool/pool.hpp>
 // need this because boost messes with ceph log/assert definitions
-#include <include/assert.h>
+#include "include/ceph_assert.h"
 
 #include <infiniband/verbs.h>
 #include <rdma/rdma_cma.h>
index 0292f6c7684eeada42660b433235d0d9277fc2ef..c522ba39565f83200402a60825931fe198f9de61 100644 (file)
@@ -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"
index abe270a41dbc080e161d60070daec6310e80e601..97516f4bc6a838829a75cb598ba93bf719678ba8 100644 (file)
@@ -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;
index ad9d4df0b4d0648763a12f9cb42dfe65165904c2..7a0afee41931c4a80988a8034ef5975ce312bf6b 100644 (file)
@@ -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
index 8d821116d68e407110ed6cbe569ef6d52df6bd9f..763e6f25d6e4ce7a064187d3d31856e469ad3363 100644 (file)
@@ -13,7 +13,7 @@
 #define CEPH_OS_BLUESTORE_ALLOCATOR_H
 
 #include <ostream>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "os/bluestore/bluestore_types.h"
 
 class Allocator {
index c34fde3858549e2c729e6af253193d5e58d9bd83..462891ca7005daec5f9658ed8830391aae17268d 100644 (file)
@@ -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:"
index 837282b63110e8553c73c689a298cd63906b6895..058541a30edb0a266ac4973468238ef41de2b4be 100644 (file)
@@ -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
index 909e1b1c174ae1fb185d38ce52a4abafabfc8a59..486d16432062964ef4721eae83430aeda7e99157 100644 (file)
@@ -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;
 
index bf65f6efb5dc1ab6eb383f4c3681b9712ebf664d..cfa9cd74cd0e77b77c3e1f0ade8e68e57ee4c132 100644 (file)
@@ -29,7 +29,7 @@
 #include <boost/functional/hash.hpp>
 #include <boost/dynamic_bitset.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/unordered_map.h"
 #include "include/mempool.h"
 #include "common/bloom_filter.hpp"
index 88fbf584ccfd1561f55efc5dd0ac47daa29f0167..0ad3f9a7ad6120681df54e255fbb250fd6cb6881 100755 (executable)
@@ -31,7 +31,7 @@ struct interval_t
 typedef std::vector<interval_t> interval_vector_t;
 typedef std::vector<slot_t> 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"
index 8718432ec671647206254d37744e69b9d9509723..4f1c60db028f74d266f3275602ffb7036f7e90bc 100644 (file)
@@ -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"
index eee34c90f2a55f852a965bfad8d9c87aeeb21af7..cfba6dad59dc68db7849e0d33d90811e131ce13f 100644 (file)
@@ -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
index 81d75d8358827d6fd11f871a1b55b97751862360..a9af1a64b41f2be94c5189cde3b5e6ddd3eea2dd 100644 (file)
@@ -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.
index 9532ca5ae5d845afa34244f3ce0937dd2b6491b4..4040c7f006aa66a8b5922fc1c05590dd152b7f64 100644 (file)
@@ -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"
index eb9c57de087cbf03cfe9656a1fa3ead0b694532b..77a60447fb8db763aa75b82e8eebbda0850d4515 100644 (file)
@@ -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"
index 4a100c6b39fb12eed595cad605d3e27fa4cf24fc..8475bbbfd1faf06dea0260f29d55b9d81c87ed68 100644 (file)
@@ -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,
index 8a236851603cd8c58e8a72a9628174c3a626f96c..1081d146aa2527c7ef4ceeb842525282d666ef84 100644 (file)
@@ -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()
index 1a6b63bbd7fd2125007eee183739fedff2761543..e85dbd52636c1187106af65ce60fb024e2445f02 100644 (file)
@@ -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 <iostream>
 #include <fstream>
index 8d63f1d37ad0df0a17cbe5df216dbf19a573a734..e4dedd2933d236bf09c7c3c99e59d806fc56ec3f 100644 (file)
@@ -6,14 +6,14 @@
 #include <stdio.h>           // for size_t, snprintf
 #include <stdlib.h>          // for free, malloc
 #include <string.h>          // for strcpy, strlen
-#include "include/assert.h"  // for assert
+#include "include/ceph_assert.h"  // for assert
 #include "include/buffer.h"
 
 #if defined(__linux__)
 #include <linux/fs.h>
 #endif
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 /*
  * chaining xattrs
index ce7c5582490b551def7ef3a35d4e764a4bb9eb9f..a2d17fa64afce944a3d2bd8914d137d009fd97c8 100644 (file)
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include "common/xattr.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/buffer_fwd.h"
 
 #if defined(__linux__)
index 100604209c2ba32e98a43b8f4885c8d8ea9c06da..72aad200148a7c957c9aae645d13cd85ce4ac05d 100644 (file)
@@ -23,7 +23,7 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/unordered_map.h"
 #include "common/Finisher.h"
 #include "common/RWLock.h"
index 1d184ee8b3436b264782a552a8552eb8b90925bb..6b78c1c6a7379a0e079a7835b8e11c9f898ff519 100644 (file)
@@ -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:
index e843d83c4579ca2d738f3cfe929490b42d6c11e6..8e980e27ebcdc141feae994b97cfa4b39301ab8d 100644 (file)
@@ -18,7 +18,7 @@
 #include <ostream>
 #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"
 
index 57f6d9fa06312fc70a91308e096e951d701bd0a3..e33160546c548e2aa4604f21025c856bd6b48cdc 100644 (file)
 #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"
 
index 1e8c6dbcdb59dabd0a283212e58e4ef761a4212a..d595b1bc9ab0f10dff0ccf297d705ded5b40d4ce 100644 (file)
@@ -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
index dc14dfb63ba7f650bca3c38baddb4cf37ccff0e3..32ba8638bcc62bc635771fb5b8dac70c6c27be2c 100644 (file)
@@ -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"
index 71e1f6f2ed6a7c53b30d156f30e744212d09917d..3b16e09ef54991bf548ceb449ac26736df30e1c8 100644 (file)
@@ -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 <list>
index 0577e0bf6324bc5f900197fa50cc8a954885d997..6ec9a268b7d3debf4030851e3ef82ed118edd7bc 100644 (file)
@@ -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
index 65299344f939c879d0d14e0ae8e917e651ae18eb..262341d32d03b7a54d584b471ab4ba7b981297cc 100644 (file)
@@ -18,7 +18,7 @@
 #define CEPH_REPLICATEDPG_H
 
 #include <boost/tuple/tuple.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "OSD.h"
 #include "PG.h"
 #include "Watch.h"
index 83bea1c46f21fa03cd5e9c6ae88520549d8c8d84..d35c2cbe8d5c4065ccc7935961773bec3b806369 100644 (file)
@@ -17,7 +17,7 @@
 #include "osd/mClockOpClassSupport.h"
 #include "osd/OpQueueItem.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace ceph {
 
index fe25e5c70e5a9cb9e69d9741fc2635dd2d79383d..b2c75795c3e303e970f8f4f380f82ec9a0028351 100644 (file)
@@ -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
index c67b5f1c1a8c19eec964ae35f09131eb9475d2f3..7ecfdb556fa206474fa8c9cef953845f6d71ddbb 100644 (file)
@@ -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<<n)
index 30b27930f72ca65e3f087119b490bcc64c32fb0a..0dc1eebe80b0a188cffb2453f3621d69398ed1e6 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <boost/thread/shared_mutex.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/buffer.h"
 #include "include/types.h"
 #include "include/rados/rados_types.hpp"
index c188852dca0bedd8fbf322f910bdfa412e56e03d..84c6a73fb8f07298dd32c1e8c032783020e26ef8 100644 (file)
@@ -22,7 +22,7 @@
 #include <atomic>
 #include <memory>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 class PerfHistogramCommon {
 public:
index a303724d689490da2ccf9a86d9798d8f74d80e03..d6d44e051f9c57a2f5350b335a9f61609002c9cd 100644 (file)
@@ -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;
index 2b203701f9acf63beddc6a9b2cad381d3286333c..61cd7579f655f3007730be74e037df074de1403b 100644 (file)
@@ -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"
index 262c54799ec3fdf5636482a6bdb60367c0b1bf09..b4dce6515912fc5343fabde4744ebdef62c47d41 100644 (file)
@@ -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 {
index c0578f332546f21959eb878191249734dd09cdd6..ce6e8e6ed830e2df134380e6384216c87f4af78c 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #include "rbd_loc.hpp"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 
 using namespace std;
index 3b9683f585280748300030acf6b473bf4d50b85b..4b44588b4b66751c16da23e86043e83711ffd115 100644 (file)
@@ -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 {
 
index 5a9957b46c6c7254fbc6e76600cfc5b599fca265..d9a3c52ba09105f2a67a1194a361c6499a79d5bd 100644 (file)
@@ -6,7 +6,7 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "rgw_client_io.h"
 
index 88c6c7f1ed49216b7e020eecad5cc9a5ba1035d8..5d4230a41e7ea093ac7e1c9cdbadc20963ca6b25 100644 (file)
@@ -10,7 +10,7 @@
 #include <unordered_map>
 #include "include/types.h"
 #include "include/utime.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/RWLock.h"
 
 enum {
index ff30dc89a0185571d5c8d427af7bce58e147fa28..d756cfd52a7fda556d94986f9278d48f3d655aaa 100644 (file)
@@ -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 <boost/asio/yield.hpp>
 
index b9aab807f47abcceca7db42052123a5a77d5427e..fee080ee7defee5163045cc1306d5879877fc1a9 100644 (file)
@@ -2,7 +2,7 @@
 #define CEPH_RGW_CR_RADOS_H
 
 #include <boost/intrusive_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "rgw_coroutine.h"
 #include "rgw_rados.h"
 #include "common/WorkQueue.h"
index 7b5b05bd8e012e212fecc28476bf8cc7a786e5f8..15465534e799ea71d83e6f8e242c9ff877c03802 100644 (file)
@@ -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 <boost/asio/yield.hpp>
 
index 283074c1382f51ea10c5966d84b820efa4e8c4bc..94ce0f072bc64ebad04398ac652d9f528a3714bb 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <mutex>
-#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"
index 26aeb719ff2af3012280eb0e89a74dac4fbde7af..139f28329873c07b98aaec1d8783adc15f8f33f0 100644 (file)
@@ -8,7 +8,7 @@
 #include <auth/Crypto.h>
 #include <rgw/rgw_b64.h>
 #include <rgw/rgw_rest_s3.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include <boost/utility/string_view.hpp>
 #include <rgw/rgw_keystone.h>
 #include "include/str_map.h"
index 813c8678562a676b92306084ef50516c74f11391..95b6eeca5db78babd31939f9caec52adf56f3a8a 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <string>
 #include <map>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "rgw_crypt_sanitize.h"
 
 #define dout_context g_ceph_context
index cc39c101e1bc2163b5c61e4f46ec719868b27076..87bd33ac3443a7e93800563a13c464ea7f8d095c 100644 (file)
@@ -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)
index 23cf115a47e3ba6578fb3fdca63b9f67138a90ad..f22ec12454c1085acc02bf6aca32ee3a92457960 100644 (file)
@@ -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
index 185602f1359348a423dc2f96b1ddbb64b4609a86..9c1e69476aae6bd1c6dec2cce30afa43142083ea 100644 (file)
@@ -9,7 +9,7 @@
 #include "common/safe_io.h"
 #include <boost/algorithm/string.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rgw
 
index 2f7316ccf7ac1355b3e1fef318840efee2847d39..aeb5f6134ed8edf22a7186422c4921148c07519a 100644 (file)
@@ -136,7 +136,7 @@ namespace rgw {
 #include "common/safe_io.h"
 #include <boost/algorithm/string.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 std::string parse_rgw_ldap_bindpw(CephContext* ctx);
 
index 0225d79e3c8e27688ceacfe9cf273a24895e567d..bf69abe05939da416a608a402c5c70100b7d53b4 100644 (file)
@@ -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;
 
index 77064f351c3cb7bedeb1047750f27ec93a700802..ab1fcc9d11cfcb7def778109f223155cb411095f 100644 (file)
@@ -13,7 +13,7 @@
 
 #include "rgw_cr_rados.h"
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include <boost/asio/yield.hpp>
 
 #define dout_subsys ceph_subsys_rgw
index 0a0971633da7ad2078b8904755affe52d7c62ae0..3267060276b13e9b5c21edbbff23e36d59625718 100644 (file)
@@ -45,7 +45,7 @@
 #include "cls/rgw/cls_rgw_client.h"
 
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "compressor/Compressor.h"
 
index f1043ba7a9e3daaa92aa5ee18e636eea19a3a0a7..ea590fa97d48001e05a41abadd5de8163d5e1b6b 100644 (file)
@@ -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;
 
index d11cb3c356b5af565f2004c90f6e453d7f8a6589..9595727490525f0e2278c15ec87e4f9f4b95aa02 100644 (file)
@@ -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
 
index 0796c6116b5ce233520da3a64c6872be620edc3c..11a5c2aa49e8d1e476acb94497a5081f340b3d2b 100644 (file)
@@ -8,7 +8,7 @@
 #include <mutex>
 #include <system_error>
 #include <boost/intrusive/avl_set.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/types.h"
 
 namespace bi = boost::intrusive;
index fb73406cfaf25fc5e4543f71bc2ee7c4179f60c2..1eb08599730637c0c4484d41dfd2d19b66ff1437 100644 (file)
@@ -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"
index 9f9bab829efc2f3d3bfc0aeb2af9bf72445c5e1e..1df4f04fc8e17dfb631df817d803d8efcc936b74 100644 (file)
@@ -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"
 
index c171a853fb10b39705c528d0d3a6112b405fef8b..556d805c7e2073f3ca8f7b20748a8868208d0510 100644 (file)
@@ -10,7 +10,7 @@
 #include <boost/container/flat_set.hpp>
 #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"
index 3770cec15dedeaea04cbaa93cafeab69fedae63f..5b6a1cbd38b17bc3143fe51b09d7621f9aff941e 100644 (file)
@@ -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
index b702d1a792271b83498da137bf9af1e7499aec65..92a85dc3cf5e428cdd53dd68a725409fda8895d1 100644 (file)
@@ -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)
index c3835cd163385f65092f36784d75734f4697511e..ad1d26c08f865949ccc15b1d96b96bf66b228317 100644 (file)
@@ -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
index af9c024e13f7ba91ce0123c0fa25884e25aa2bd2..52e04b5a8d8136e609370d8310ad4b0e2d5fff33 100644 (file)
@@ -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
index 6371ff09f141a699be2351a6bdd24cbbd355b6f0..dac5af064ddd771522343d456ae024766d4839f8 100644 (file)
@@ -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
 
index 17761d5833c647ed4218138853f7f2b66cde9ca4..deca9cea9613bb6eba14ef79731cd8698ec68c7c 100644 (file)
@@ -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
index 8cb7d5d00957f00a69b41af163c403e42152e7bd..03a951341e7d6ae9e687071aeb640edcabc652e7 100644 (file)
@@ -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"
index 3905d8e409da8580f1ee5b18d8fe69f58dc90ffb..5d11edd8f947a00d6e6b5ca7196e460ef3f17516 100644 (file)
@@ -6,7 +6,7 @@
 #include <boost/optional.hpp>
 #include <boost/utility/in_place_factory.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "ceph_ver.h"
 
 #include "common/Formatter.h"
index 5efb6a75760e329e7a03aa7c1627711a01b913f0..3782246f1f28c04b25fc4b334b1ebc690693ee03 100644 (file)
@@ -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
 
index cebc4aa05f095635a1cee93937f4c503e8272201..f27e88dd0a2f396cf93d0842361cc3b02f53dc0e 100644 (file)
@@ -28,7 +28,7 @@
 #include "rgw_sync.h"
 
 #include <boost/asio/yield.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rgw
 
index 705bdecfbf8b335c583873b46a8e4b1091b84391..a626ec64e0509237479a1cab255e764f5dcbc67d 100644 (file)
@@ -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"
index c7d90111181c9e4443c483fae5507f378c1cc8f9..49f580ba9edc640fe36af43605aaa960a4bbf600 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <string>
 #include <boost/algorithm/string.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include "include/types.h"
 #include "rgw_common.h"
index 4a34ca1083455b6f7b98516bd87c167e48298a4e..b8c296247ae5af5fc6fff69bce6a3dab7624b1e0 100644 (file)
@@ -23,7 +23,7 @@
 #include <fio.h>
 #include <optgroup.h>
 
-#include "include/assert.h" // fio.h clobbers our assert.h
+#include "include/ceph_assert.h" // fio.h clobbers our assert.h
 #include <algorithm>
 
 #define dout_context g_ceph_context
index 529141de9a3078b237a53d6c51a3ec15f332c471..cc7f2c051846df6189250c28adf77e5c7a980f65 100644 (file)
@@ -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:
index 24f353dbbef5a250f7e189cff447254d70e16eb9..36c0346d49bef6af2cda351b50a5417cdacd0c0f 100644 (file)
@@ -27,7 +27,7 @@
 #include <thread>
 #include <atomic>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 /* in ms -- 1 minute */
 #define MAX_WAIT       (60 * 1000)
index a02322358c753024bf525306a2c5c01e95b32358..79f8a0777ade565e1c0f750cf9ce16c5577bbd50 100644 (file)
@@ -37,7 +37,7 @@
 #include <limits.h>
 #endif
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 // Startup common: create and mount ceph fs
 #define STARTUP_CEPH() do {                            \
index a4830e68e0631763a8f81cbb61ae2ee37f6edf88..9d1fcdede8b9ede7c6c9b8b9361fb2bc24a93702 100644 (file)
@@ -38,7 +38,7 @@
 #include <limits.h>
 #endif
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 // Startup common: create and mount ceph fs
 #define STARTUP_CEPH() do {                            \
index 38a948a8571204b3d7eb5713a3c136826aba4b7d..13a726ccd6e856f931dcf7f276ff0578a644a876 100644 (file)
@@ -23,7 +23,7 @@
 #include <deque>
 #include <list>
 #include <vector>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "include/compat.h"
 
 #define dout_context g_ceph_context
index 8994deb003aa70b9ecbcaf4345f1a49a2f00b963..ef96f6198db9f00e95c8de2068aaa3b87802a4fa 100644 (file)
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #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
index 5ddfc75b235fc980ca82a2560792dd6580e656cb..0788d9f5b30aae8a685c1192e645b66788b68c4e 100644 (file)
@@ -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"
index f11c69affe83617815a4d29a5e61af5fa8ec672b..6f5dc40eee3a5c059ba91627a05c2737c8c71e64 100644 (file)
@@ -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 <list>
 #include <string>
 
index 546973558d2bc8b88ecfa5642506ee3d7499bad0..a5642460cc80640cc8e2a9a20e461e1ef98dd594 100644 (file)
@@ -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 <boost/bind.hpp>
index c98bcecb731a0659149a5e703dbc4e7f527404c5..85fa9393a3b35f83a4b1336dc7627644a85d1118 100644 (file)
@@ -9,7 +9,7 @@
 #include "test/librados_test_stub/TestRadosClient.h"
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_subsys ceph_subsys_rados
 #undef dout_prefix
index a29c8e1f7d28046387ab7f1481cc01cdd6835c12..105ab90ee2a25c89ceb0c4e7bd3d43d14bc50926 100644 (file)
@@ -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
 
index 2ba411ccfc5d4164b14589359253345f20e8ae87..38a76053e146e578e8a4d904477e0c3f922bf18d 100644 (file)
@@ -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
 
index 4c6be5af9d0aae2205f2d5e48dbee445e6f08db8..7993fc5f0d74a05ab83bd2e4ecf43d0e13e33d53 100644 (file)
@@ -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"
index 772bc5def530025c7b91ed99d4221e41d49c95f6..ba82c2b1bc3aab73b2459b3776df6efa4d4b2941 100644 (file)
@@ -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"
index f269f0ac0c85751483a6f8bd9f9a4a50e99368ee..e2a17bc006039b61dba4432877b99c1c61f135ff 100644 (file)
@@ -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
index 7a2bc9b6e513c5bd9cc72db72afad097eb9b0281..76b2cd551058588cbb3aeb689634615be9a5a011 100644 (file)
@@ -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
index 19043856d5bae1c502fc042b344e7012da20c177..fcda2d5503861b553022d2fa01c4d92a00b14cf0 100644 (file)
@@ -23,7 +23,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 #include "TestObjectStoreState.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_filestore
index 3d21fe264092834834b6d3071d0d2e5f8029b6ed..7cf31fa92984537b4bb55d361eb09cafd50cb616 100644 (file)
@@ -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_
index 5bcb58cc0da1df3384e2fdef714efc86aed97e20..85d4132949e8a3c90cc1843c8a2b8bbb73108194 100644 (file)
@@ -16,7 +16,7 @@
 #include "common/ceph_argparse.h"
 #include "os/ObjectStore.h"
 #include <gtest/gtest.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/errno.h"
 #include "store_test_fixture.h"
 
index 36491c3fd3cccc408784d496f8f35f16aeae591a..aec1f78b787c16228f4a5e7c6e11360b89770f52 100644 (file)
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "include/on_exit.h"
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #ifndef MAP_ANONYMOUS
 # ifdef MAP_ANON
index 24a780288b3ae8629af8d3e0518e2425ea3735b3..56d208b7d6a07beabc307a0fb6cade128f884124 100644 (file)
@@ -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"
index 619d510da32061065e9dba30947fddb99f151c0d..32d3a38f7595d6350268595c6bb5cbeda464fd5d 100644 (file)
@@ -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"
index 1fd2f9e70ce8fa636e2d1234723ecec9f83d6059..fdc28cc9b7a1beb9d1a02dbdc4a928743c0d2b7e 100644 (file)
@@ -9,7 +9,7 @@
 #include "common/WorkQueue.h"
 #include <boost/shared_ptr.hpp>
 #include <gmock/gmock.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace librados {
 class TestRadosClient;
index 52e34fa8778d60ba0a00766c74594f94ab348776..bcf02ab1b978d0e4ff837db6399d14ce6435d647 100644 (file)
@@ -18,7 +18,7 @@
 #include "rgw/rgw_rados.h"
 #include "rgw/rgw_crypt.h"
 #include <gtest/gtest.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #define dout_subsys ceph_subsys_rgw
 
 using namespace std;
index 42bd584b629e8a62825dccedd2d96168d8270c0f..dc24900a8c4ede528449ecc736aae99e9c6aa22b 100644 (file)
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_context g_ceph_context
 static volatile sig_atomic_t got_sigusr1 = 0;
index 8b89d47bbfdf3a86714b52b4e9f80d7cd5344d41..93f10cbeae68d4e14bf645a8adaa7353e3bfd0a1 100644 (file)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#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
index 4e8d757285e5479fc595137907b71cb2502d823c..4b45cb39c7fe31b39a949d458a51ed8729e94ff1 100644 (file)
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define REGION 1048576
 int main(int argc, char *argv[]) {
index 002fb9c1900b682343ac74f05599513056894a57..1f0c49e0375dbd3925599973c8f1e32b3d52dfde 100644 (file)
@@ -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"
index ce9a5e54d96da78ca154ba23592276af7681d0cc..b52c6109cbf97a7f107c44f3ca16a75185a9caf8 100644 (file)
@@ -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
index 4abb93644d8f71a566428a956292073db47ffc6e..1f201ea78d09800e817176606358f40de713f9d6 100644 (file)
@@ -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)
index 2080c7ba9a85acaf7d0c826cd9f35e30d81e1751..ce83562c3c34c80a5f3abe0e542f38dbd1d101cc 100644 (file)
@@ -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
index cdda59ebcecd89def169df73ca73d5743cf97867..1a4acbcb03fa998b5a6c274192c7e7b8931e50a4 100644 (file)
@@ -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"
index 8d7ca5d9bd1c3d2d7fad609b36d41d3a55d2e75b..3fdf2ef50aab6695fe9cef9561cd1057c2818160 100644 (file)
@@ -7,7 +7,7 @@
 
 #include <boost/program_options.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 namespace rbd {
 namespace action {
index 25a1670f5a72deaa2f83030ebc97e9d16111c2f5..f7205ee758e409483efc2bd471ecbf756e68e138 100644 (file)
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <boost/program_options.hpp>
 #include <boost/scoped_ptr.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rbd
index 6f4443d140caff933cb68643043cab14736ed92b..8044816b8660f4ff90949062ded0e2d465b048f1 100644 (file)
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <regex>
 #include <boost/program_options.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 #include <atomic>
 
index d51b001700fc94e8f8940cf021b1f49e6a84b24d..c9c17ff66f03619aa6de5da3d5ded89d41488aeb 100644 (file)
@@ -16,7 +16,7 @@
 #include "types.h"
 #include <boost/functional/hash.hpp>
 #include <boost/optional.hpp>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "tools/rbd_mirror/pool_watcher/Types.h"
 
 namespace librbd { struct ImageCtx; }
index b537f719765b23639fe68081b34d337604cec7b1..36f06866fe0e2374c1a58ea6345552100387706e 100644 (file)
@@ -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"
index 6e7746fc84bea015f0d8725adef4ba34625e9717..ec5f07ff9953048c32e3d1e530c21defb39b783b 100644 (file)
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include <ostream>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "StateTransition.h"
 
 namespace rbd {
index 6fdbad0072143fd154b6029a0f495a57be49fee2..47de9c3cf590bf2348da407b9f09fccfc1f71e0f 100644 (file)
@@ -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 <iostream>
index 8dbf91220c71eab50b1cbb40858a0115d3dac0f7..0e99227337249604bb98a2a42944c559314b47b6 100644 (file)
@@ -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"
 
index a767db8d7a70596e924595efb6504bc6d6814b74..d2fb7908fa4b531c96d29d1c32b7433235d56e93 100644 (file)
@@ -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"