From 2f3f8f1f4267c30f6fda75b7deb7a43e933e4d29 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Wed, 20 Mar 2019 15:32:41 +0800 Subject: [PATCH] msg/async: reduce one condition check. Signed-off-by: Jianpeng Ma --- src/msg/async/ProtocolV1.cc | 9 ++------- src/msg/async/ProtocolV2.cc | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc index d41329bd9fd..0af52acd605 100644 --- a/src/msg/async/ProtocolV1.cc +++ b/src/msg/async/ProtocolV1.cc @@ -257,13 +257,8 @@ void ProtocolV1::prepare_send_message(uint64_t features, Message *m, ldout(cct, 20) << __func__ << " m " << *m << dendl; // associate message with Connection (for benefit of encode_payload) - if (m->empty_payload()) { - ldout(cct, 20) << __func__ << " encoding features " << features << " " << m - << " " << *m << dendl; - } else { - ldout(cct, 20) << __func__ << " half-reencoding features " << features - << " " << m << " " << *m << dendl; - } + ldout(cct, 20) << __func__ << (m->empty_payload() ? " encoding features " : " half-reencoding features ") + << features << " " << m << " " << *m << dendl; // encode and copy out of *m // in write_message we update header.seq and need recalc crc diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index 9fe753c2269..82893b9d599 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -384,13 +384,8 @@ void ProtocolV2::prepare_send_message(uint64_t features, ldout(cct, 20) << __func__ << " m=" << *m << dendl; // associate message with Connection (for benefit of encode_payload) - if (m->empty_payload()) { - ldout(cct, 20) << __func__ << " encoding features " << features << " " << m - << " " << *m << dendl; - } else { - ldout(cct, 20) << __func__ << " half-reencoding features " << features - << " " << m << " " << *m << dendl; - } + ldout(cct, 20) << __func__ << (m->empty_payload() ? " encoding features " : " half-reencoding features ") + << features << " " << m << " " << *m << dendl; // encode and copy out of *m m->encode(features, 0); -- 2.47.3