test/omap_bench: Un-deprecated version of aio_create_completion

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

diff --git a/src/test/omap_bench.cc b/src/test/omap_bench.cc
index fea897fedab616f290f35b9b8845570bd2f74f4f..107aa51c441bf6369c4a4a9a8b781cab77d3221a 100644 (file)
--- a/src/test/omap_bench.cc
+++ b/src/test/omap_bench.cc
@@ -158,14 +158,13 @@ AioWriter::~AioWriter() {
 librados::AioCompletion * AioWriter::get_aioc() {
   return aioc;
 }
-void AioWriter::set_aioc(librados::callback_t complete,
-    librados::callback_t safe) {
-  aioc = ob->rados.aio_create_completion(this, complete, safe);
+void AioWriter::set_aioc(librados::callback_t complete) {
+  aioc = ob->rados.aio_create_completion(this, complete);
 }
 
 
 //Helper methods
-void OmapBench::aio_is_safe(rados_completion_t c, void *arg) {
+void OmapBench::aio_is_complete(rados_completion_t c, void *arg) {
   AioWriter *aiow = reinterpret_cast<AioWriter *>(arg);
   aiow->stop_time();
   ceph::mutex * data_lock = &aiow->ob->data_lock;
@@ -366,7 +365,6 @@ int OmapBench::generate_small_non_random_omap(const int omap_entries,
 
 //tests
 int OmapBench::test_write_objects_in_parallel(omap_generator_t omap_gen) {
-  comp = NULL;
   AioWriter *this_aio_writer;
 
   std::unique_lock l{thread_is_free_lock};
@@ -380,7 +378,7 @@ int OmapBench::test_write_objects_in_parallel(omap_generator_t omap_gen) {
 
     //set up the write
     this_aio_writer = new AioWriter(this);
-    this_aio_writer->set_aioc(NULL,safe);
+    this_aio_writer->set_aioc(comp);
 
     //perform the write
     busythreads_count++;

diff --git a/src/test/omap_bench.h b/src/test/omap_bench.h
index 34ee7123b4a54f40667d82852edc3d16b0293645..6fc57583a48eaf287386a69d75e9a8c5917fa18a 100644 (file)
--- a/src/test/omap_bench.h
+++ b/src/test/omap_bench.h
@@ -74,8 +74,7 @@ public:
   AioWriter(OmapBench *omap_bench);
   ~AioWriter() override;
   virtual librados::AioCompletion * get_aioc();
-  virtual void set_aioc(librados::callback_t complete,
-      librados::callback_t safe);
+  virtual void set_aioc(librados::callback_t complete);
 };
 
 class OmapBench{
@@ -94,7 +93,6 @@ protected:
     ceph::make_mutex("OmapBench::data_lock");
   int busythreads_count;
   librados::callback_t comp;
-  librados::callback_t safe;
 
   string pool_name;
   string rados_id;
@@ -114,7 +112,7 @@ public:
     : test(&OmapBench::test_write_objects_in_parallel),
       omap_generator(generate_uniform_omap),
       busythreads_count(0),
-      comp(NULL), safe(aio_is_safe),
+      comp(aio_is_complete),
       pool_name("rbd"),
       rados_id("admin"),
       prefix(rados_id+".obj."),
@@ -128,13 +126,13 @@ public:
 
   /**
    * Callback for when an AioCompletion (called from an AioWriter)
-   * is safe. deletes the AioWriter that called it,
+   * is complete. deletes the AioWriter that called it,
    * Updates data, updates busythreads, and signals thread_is_free.
    *
    * @param c provided by aio_write - not used
    * @param arg the AioWriter that contains this AioCompletion
    */
-  static void aio_is_safe(rados_completion_t c, void *arg);
+  static void aio_is_complete(rados_completion_t c, void *arg);
 
   /**
    * Generates a random string len characters long