From fcafb089d262c29422320e80808970c80d30220d Mon Sep 17 00:00:00 2001
From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Fri, 5 Jul 2019 22:07:59 +0800
Subject: [PATCH] crimson: change to use make_message()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---
 src/crimson/osd/shard_services.cc   | 4 ++--
 src/test/crimson/test_alien_echo.cc | 4 ++--
 src/test/crimson/test_async_echo.cc | 4 ++--
 src/test/crimson/test_messenger.cc  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index f5502e9272169..be99970c2ef92 100644
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -203,7 +203,7 @@ seastar::future<> ShardServices::send_pg_created(pg_t pgid)
   auto o = get_osdmap();
   ceph_assert(o->require_osd_release >= ceph_release_t::luminous);
   pg_created.insert(pgid);
-  return monc.send_message(new MOSDPGCreated(pgid));
+  return monc.send_message(make_message<MOSDPGCreated>(pgid));
 }
 
 seastar::future<> ShardServices::send_pg_created()
@@ -213,7 +213,7 @@ seastar::future<> ShardServices::send_pg_created()
   ceph_assert(o->require_osd_release >= ceph_release_t::luminous);
   return seastar::parallel_for_each(pg_created,
     [this](auto &pgid) {
-      return monc.send_message(new MOSDPGCreated(pgid));
+      return monc.send_message(make_message<MOSDPGCreated>(pgid));
     });
 }
 
diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc
index a368b93daab00..d784c843e4029 100644
--- a/src/test/crimson/test_alien_echo.cc
+++ b/src/test/crimson/test_alien_echo.cc
@@ -46,7 +46,7 @@ struct Server {
                                   MessageRef m) override {
       std::cout << "server got ping " << *m << std::endl;
       // reply with a pong
-      return c->send(MessageRef{new MPing(), false}).then([this] {
+      return c->send(make_message<MPing>()).then([this] {
         ++count;
         on_reply.signal();
       });
@@ -196,7 +196,7 @@ seastar_echo(const entity_addr_t addr, echo_role role, unsigned count)
               }).then([&disp=client.dispatcher, count](ceph::net::ConnectionXRef conn) {
                 return seastar::do_until(
                   [&disp,count] { return disp.count >= count; },
-                  [&disp,conn] { return (*conn)->send(MessageRef{new MPing(), false})
+                  [&disp,conn] { return (*conn)->send(make_message<MPing>())
                                    .then([&] { return disp.on_reply.wait(); });
                 });
               }).finally([&client] {
diff --git a/src/test/crimson/test_async_echo.cc b/src/test/crimson/test_async_echo.cc
index c9a4e907308ef..c04e754d3445f 100644
--- a/src/test/crimson/test_async_echo.cc
+++ b/src/test/crimson/test_async_echo.cc
@@ -49,7 +49,7 @@ struct Server {
       return m->get_type() == CEPH_MSG_PING;
     }
     void ms_fast_dispatch(Message* m) override {
-      m->get_connection()->send_message(new MPing);
+      m->get_connection()->send_message(make_message<MPing>());
       m->put();
       {
         std::lock_guard lock{mutex};
@@ -132,7 +132,7 @@ struct Client {
       auto conn = msgr->connect_to(peer.name.type(),
                                    entity_addrvec_t{peer.addr});
       replied = false;
-      conn->send_message(new MPing);
+      conn->send_message(make_message<MPing>());
       std::unique_lock lock{mutex};
       return on_reply.wait_for(lock, 500ms, [&] {
         return replied;
diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc
index f5eb576d20546..924a7f839057b 100644
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -418,8 +418,8 @@ static seastar::future<> test_concurrent_dispatch(bool v2)
                                       entity_name_t::TYPE_OSD);
         }).then([](ceph::net::ConnectionXRef conn) {
           // send two messages
-          (*conn)->send(MessageRef{new MPing, false});
-          (*conn)->send(MessageRef{new MPing, false});
+          (*conn)->send(make_message<MPing>());
+          (*conn)->send(make_message<MPing>());
         }).then([server] {
           return server->wait();
         }).finally([client] {
-- 
2.39.5