rbd_replay: Use ceph_assert for asserts.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/rbd_replay/BufferReader.cc b/src/rbd_replay/BufferReader.cc
index 1c84c117ebc1ee45cc9eb9a25a2cbb350cc2725c..262c54799ec3fdf5636482a6bdb60367c0b1bf09 100644 (file)
--- a/src/rbd_replay/BufferReader.cc
+++ b/src/rbd_replay/BufferReader.cc
@@ -10,7 +10,7 @@ namespace rbd_replay {
 BufferReader::BufferReader(int fd, size_t min_bytes, size_t max_bytes)
   : m_fd(fd), m_min_bytes(min_bytes), m_max_bytes(max_bytes),
     m_bl_it(m_bl.begin()), m_eof_reached(false) {
-  assert(m_min_bytes <= m_max_bytes);
+  ceph_assert(m_min_bytes <= m_max_bytes);
 }
 
 int BufferReader::fetch(bufferlist::const_iterator **it) {
@@ -25,7 +25,7 @@ int BufferReader::fetch(bufferlist::const_iterator **it) {
       if (r == 0) {
        m_eof_reached = true;
       }
-      assert(r <= bytes_to_read);
+      ceph_assert(r <= bytes_to_read);
       bytes_to_read -= r;
     }
   }

diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc
index 9fca229fe795b5add3d9d592319c609fb75cf01d..9cbcc348aa26295012e7cb631d026624c895d990 100644 (file)
--- a/src/rbd_replay/Replayer.cc
+++ b/src/rbd_replay/Replayer.cc
@@ -73,12 +73,12 @@ void Worker::join() {
 }
 
 void Worker::send(Action::ptr action) {
-  assert(action);
+  ceph_assert(action);
   m_buffer.push_front(action);
 }
 
 void Worker::add_pending(PendingIO::ptr io) {
-  assert(io);
+  ceph_assert(io);
   std::scoped_lock lock{m_pending_ios_mutex};
   assertf(m_pending_ios.count(io->id()) == 0, "id = %d", io->id());
   m_pending_ios[io->id()] = io;
@@ -113,7 +113,7 @@ void Worker::run() {
 
 
 void Worker::remove_pending(PendingIO::ptr io) {
-  assert(io);
+  ceph_assert(io);
   m_replayer.set_action_complete(io->id());
   std::scoped_lock lock{m_pending_ios_mutex};
   size_t num_erased = m_pending_ios.erase(io->id());
@@ -130,7 +130,7 @@ librbd::Image* Worker::get_image(imagectx_id_t imagectx_id) {
 
 
 void Worker::put_image(imagectx_id_t imagectx_id, librbd::Image* image) {
-  assert(image);
+  ceph_assert(image);
   m_replayer.put_image(imagectx_id, image);
 }
 
@@ -288,9 +288,9 @@ librbd::Image* Replayer::get_image(imagectx_id_t imagectx_id) {
 }
 
 void Replayer::put_image(imagectx_id_t imagectx_id, librbd::Image *image) {
-  assert(image);
+  ceph_assert(image);
   std::unique_lock lock{m_images_mutex};
-  assert(m_images.count(imagectx_id) == 0);
+  ceph_assert(m_images.count(imagectx_id) == 0);
   m_images[imagectx_id] = image;
 }
 
@@ -316,7 +316,7 @@ void Replayer::set_action_complete(action_id_t id) {
   auto now = std::chrono::system_clock::now();
   action_tracker_d &tracker = tracker_for(id);
   std::unique_lock lock{tracker.mutex};
-  assert(tracker.actions.count(id) == 0);
+  ceph_assert(tracker.actions.count(id) == 0);
   tracker.actions[id] = now;
   tracker.condition.notify_all();
 }

diff --git a/src/rbd_replay/actions.cc b/src/rbd_replay/actions.cc
index 3c6baf7ab5d0f9797fce89a159e5bda8b5a3f2ea..3a95c399f08290293a108887a39c69063bfcaabe 100644 (file)
--- a/src/rbd_replay/actions.cc
+++ b/src/rbd_replay/actions.cc
@@ -109,7 +109,7 @@ void StopThreadAction::perform(ActionCtx &ctx) {
 void AioReadAction::perform(ActionCtx &worker) {
   dout(ACTION_LEVEL) << "Performing " << *this << dendl;
   librbd::Image *image = worker.get_image(m_action.imagectx_id);
-  assert(image);
+  ceph_assert(image);
   PendingIO::ptr io(new PendingIO(pending_io_id(), worker));
   worker.add_pending(io);
   int r = image->aio_read(m_action.offset, m_action.length, io->bufferlist(), &io->completion());

diff --git a/src/rbd_replay/rbd-replay-prep.cc b/src/rbd_replay/rbd-replay-prep.cc
index bfcd250657e17c1dc955f443bfc761da610b9aa9..d4b4db5379a5e7e42a244f09adbd6eed3f844024 100644 (file)
--- a/src/rbd_replay/rbd-replay-prep.cc
+++ b/src/rbd_replay/rbd-replay-prep.cc
@@ -63,7 +63,7 @@ public:
   }
 
   void issued_io(IO::ptr io, std::set<IO::ptr> *latest_ios) {
-    assert(io);
+    ceph_assert(io);
     if (m_latest_io.get() != NULL) {
       latest_ios->erase(m_latest_io);
     }
@@ -89,7 +89,7 @@ private:
 class AnonymizedImage {
 public:
   void init(const string &image_name, int index) {
-    assert(m_image_name == "");
+    ceph_assert(m_image_name == "");
     m_image_name = image_name;
     ostringstream oss;
     oss << "image" << index;
@@ -194,7 +194,7 @@ public:
     struct bt_ctf_iter *itr = bt_ctf_iter_create(ctx,
                                                 NULL, // begin_pos
                                                 NULL); // end_pos
-    assert(itr);
+    ceph_assert(itr);
 
     struct bt_iter *bt_itr = bt_ctf_get_iter(itr);
 
@@ -358,7 +358,7 @@ private:
     } else if (strcmp(event_name, "librbd:open_image_exit") == 0) {
       completed(thread->latest_io());
       boost::shared_ptr<OpenImageIO> io(boost::dynamic_pointer_cast<OpenImageIO>(thread->latest_io()));
-      assert(io);
+      ceph_assert(io);
       m_open_images.insert(io->imagectx());
     } else if (strcmp(event_name, "librbd:close_image_enter") == 0) {
       imagectx_id_t imagectx = fields.uint64("imagectx");
@@ -370,7 +370,7 @@ private:
     } else if (strcmp(event_name, "librbd:close_image_exit") == 0) {
       completed(thread->latest_io());
       boost::shared_ptr<CloseImageIO> io(boost::dynamic_pointer_cast<CloseImageIO>(thread->latest_io()));
-      assert(io);
+      ceph_assert(io);
       m_open_images.erase(io->imagectx());
     } else if (strcmp(event_name, "librbd:aio_open_image_enter") == 0) {
       string name(fields.string("name"));
@@ -541,7 +541,7 @@ private:
                     const string& snap_name,
                     bool readonly,
                      IO::ptrs *ios) {
-    assert(thread);
+    ceph_assert(thread);
     if (m_open_images.count(imagectx) > 0) {
       return;
     }

diff --git a/src/rbd_replay/rbd_loc.cc b/src/rbd_replay/rbd_loc.cc
index fea73c3836dea8b4fabdc27bf4cde87c3280a3e9..c0578f332546f21959eb878191249734dd09cdd6 100644 (file)
--- a/src/rbd_replay/rbd_loc.cc
+++ b/src/rbd_replay/rbd_loc.cc
@@ -41,7 +41,7 @@ bool rbd_loc::parse(string name_string) {
       if (read_slash || read_at) {
        return false;
       }
-      assert(field == 0);
+      ceph_assert(field == 0);
       field++;
       read_slash = true;
       break;
@@ -49,7 +49,7 @@ bool rbd_loc::parse(string name_string) {
       if (read_at) {
        return false;
       }
-      assert(field < 2);
+      ceph_assert(field < 2);
       field++;
       read_at = true;
       break;