From d5bc886fb8d8daa8c81b6e4d8ee97f24772b6f47 Mon Sep 17 00:00:00 2001 From: Avner BenHanoch Date: Mon, 11 Apr 2016 14:29:47 +0300 Subject: [PATCH] xio: refactor release_xio_req -> release_xio_msg avoid names that are misleading with accelio's terminology (msg - is one way notification, req - is 2 ways notification) Signed-off-by: Avner BenHanoch --- src/msg/xio/XioConnection.cc | 2 +- src/msg/xio/XioPortal.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc index 091dc4e143f6..544fd8fafdc0 100644 --- a/src/msg/xio/XioConnection.cc +++ b/src/msg/xio/XioConnection.cc @@ -542,7 +542,7 @@ int XioConnection::discard_input_queue(uint32_t flags) break; case XioSubmit::INCOMING_MSG_RELEASE: deferred_q.erase(q_iter); - portal->release_xio_rsp(static_cast(xs)); + portal->release_xio_msg(static_cast(xs)); break; default: ldout(msgr->cct,0) << __func__ << ": Unknown Msg type " << xs->type << dendl; diff --git a/src/msg/xio/XioPortal.h b/src/msg/xio/XioPortal.h index 04e16d22a7e9..344e96dcc8ea 100644 --- a/src/msg/xio/XioPortal.h +++ b/src/msg/xio/XioPortal.h @@ -157,7 +157,7 @@ public: int bind(struct xio_session_ops *ops, const string &base_uri, uint16_t port, uint16_t *assigned_port); - inline void release_xio_rsp(XioRsp* xrsp) { + inline void release_xio_msg(XioRsp* xrsp) { struct xio_msg *msg = xrsp->dequeue(); struct xio_msg *next_msg = NULL; int code; @@ -193,7 +193,7 @@ public: break; default: /* INCOMING_MSG_RELEASE */ - release_xio_rsp(static_cast(xs)); + release_xio_msg(static_cast(xs)); break; }; } @@ -321,7 +321,7 @@ public: default: /* INCOMING_MSG_RELEASE */ q_iter = send_q.erase(q_iter); - release_xio_rsp(static_cast(xs)); + release_xio_msg(static_cast(xs)); continue; } /* switch (xs->type) */ q_iter = send_q.erase(q_iter); -- 2.47.3