crimson/net: drop and replace __func__

__func__ is meaningless in the lambda function with continuations.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc
index 77973b652a50cc602e1f4cb7007df696f5809fe0..cca001eca8f2cc2fe96a273a22b36671f4851e97 100644 (file)
--- a/src/crimson/net/ProtocolV2.cc
+++ b/src/crimson/net/ProtocolV2.cc
@@ -460,7 +460,7 @@ ProtocolV2::banner_exchange(bool is_connect)
       //5. read peer HelloFrame
       return frame_assembler->read_main_preamble();
     }).then([this](auto ret) {
-      expect_tag(Tag::HELLO, ret.tag, conn, __func__);
+      expect_tag(Tag::HELLO, ret.tag, conn, "read_hello_frame");
       return frame_assembler->read_frame_payload();
     }).then([this](auto payload) {
       // 6. process peer HelloFrame
@@ -544,7 +544,7 @@ seastar::future<> ProtocolV2::handle_auth_reply()
           return finish_auth();
         });
       default: {
-        unexpected_tag(ret.tag, conn, __func__);
+        unexpected_tag(ret.tag, conn, "handle_auth_reply");
         return seastar::now();
       }
     }
@@ -959,7 +959,7 @@ seastar::future<> ProtocolV2::_handle_auth_request(bufferlist& auth_payload, boo
     ).then([this] {
       return frame_assembler->read_main_preamble();
     }).then([this](auto ret) {
-      expect_tag(Tag::AUTH_REQUEST_MORE, ret.tag, conn, __func__);
+      expect_tag(Tag::AUTH_REQUEST_MORE, ret.tag, conn, "read_auth_request_more");
       return frame_assembler->read_frame_payload();
     }).then([this](auto payload) {
       auto auth_more = AuthRequestMoreFrame::Decode(payload->back());
@@ -984,7 +984,7 @@ seastar::future<> ProtocolV2::server_auth()
 {
   return frame_assembler->read_main_preamble(
   ).then([this](auto ret) {
-    expect_tag(Tag::AUTH_REQUEST, ret.tag, conn, __func__);
+    expect_tag(Tag::AUTH_REQUEST, ret.tag, conn, "read_auth_request");
     return frame_assembler->read_frame_payload();
   }).then([this](auto payload) {
     // handle_auth_request() logic
@@ -1280,7 +1280,7 @@ ProtocolV2::read_reconnect()
 {
   return frame_assembler->read_main_preamble(
   ).then([this](auto ret) {
-    expect_tag(Tag::SESSION_RECONNECT, ret.tag, conn, "read_reconnect");
+    expect_tag(Tag::SESSION_RECONNECT, ret.tag, conn, "read_session_reconnect");
     return server_reconnect();
   });
 }

diff --git a/src/crimson/net/Socket.cc b/src/crimson/net/Socket.cc
index 304f4dc16be824d48a939235b1906ad86b93ca94..6434a407f22a56c6b2c3f75a8d12eedcf181e7ad 100644 (file)
--- a/src/crimson/net/Socket.cc
+++ b/src/crimson/net/Socket.cc
@@ -157,9 +157,7 @@ seastar::future<> Socket::close() {
 seastar::future<> Socket::inject_delay () {
   if (float delay_period = local_conf()->ms_inject_internal_delays;
       delay_period) {
-    logger().debug("{}: sleep for {}",
-                  __func__,
-                  delay_period);
+    logger().debug("Socket::inject_delay: sleep for {}", delay_period);
     return seastar::sleep(
       std::chrono::milliseconds((int)(delay_period * 1000.0)));
   }
@@ -171,9 +169,9 @@ void Socket::inject_failure()
   if (local_conf()->ms_inject_socket_failures) {
     uint64_t rand =
       ceph::util::generate_random_number<uint64_t>(1, RAND_MAX);
-      if (rand % local_conf()->ms_inject_socket_failures == 0) {
+    if (rand % local_conf()->ms_inject_socket_failures == 0) {
       if (true) {
-        logger().warn("{} injecting socket failure", __func__);
+        logger().warn("Socket::inject_failure: injecting socket failure");
        throw std::system_error(make_error_code(
          crimson::net::error::negotiation_failure));
       }

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index b5cb03932b84fd134692f16d08e1aa4e7f396c57..da8942483152271d32b682a75bd144df297b848e 100644 (file)
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -43,7 +43,7 @@ SocketMessenger::SocketMessenger(const entity_name_t& myname,
 
 SocketMessenger::~SocketMessenger()
 {
-  logger().debug("{}: {}", __func__, logic_name);
+  logger().debug("~SocketMessenger: {}", logic_name);
   ceph_assert(!listener);
 }