From b50649bc95961175e8eae56225afae83ba04b8d0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 21 Aug 2008 11:13:03 -0700 Subject: [PATCH] mds: introduce ceph_session_op_name() --- src/include/ceph_fs.h | 20 +++++++++++++++++--- src/messages/MClientSession.h | 14 +------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 0fe459e8167ee..28c59a4d466c9 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -526,6 +526,20 @@ enum { CEPH_SESSION_STALE, }; +static inline const char *ceph_session_op_name(int op) +{ + switch (op) { + case CEPH_SESSION_REQUEST_OPEN: return "request_open"; + case CEPH_SESSION_OPEN: return "open"; + case CEPH_SESSION_REQUEST_CLOSE: return "request_close"; + case CEPH_SESSION_CLOSE: return "close"; + case CEPH_SESSION_REQUEST_RENEWCAPS: return "request_renewcaps"; + case CEPH_SESSION_RENEWCAPS: return "renewcaps"; + case CEPH_SESSION_STALE: return "stale"; + default: return "???"; + } +} + struct ceph_mds_session_head { __le32 op; __le64 seq; @@ -611,7 +625,7 @@ static inline const char *ceph_mds_op_name(int op) case CEPH_MDS_OP_LSSNAP: return "lssnap"; case CEPH_MDS_OP_MKSNAP: return "mksnap"; case CEPH_MDS_OP_RMSNAP: return "rmsnap"; - default: return "unknown"; + default: return "???"; } } @@ -814,7 +828,7 @@ inline static const char* ceph_cap_op_name(int op) { case CEPH_CAP_OP_REQUEST: return "request"; case CEPH_CAP_OP_FLUSHSNAP: return "flushsnap"; case CEPH_CAP_OP_RELEASE: return "release"; - default: return 0; + default: return "???"; } } @@ -984,7 +998,7 @@ static inline const char* ceph_osd_op_name(int op) case CEPH_OSD_OP_PULL: return "pull"; case CEPH_OSD_OP_PUSH: return "push"; - default: return ""; + default: return "???"; } } diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h index f6d42843a1861..f7799ac9edec7 100644 --- a/src/messages/MClientSession.h +++ b/src/messages/MClientSession.h @@ -19,18 +19,6 @@ class MClientSession : public Message { public: - static const char *get_opname(int o) { - switch (o) { - case CEPH_SESSION_REQUEST_OPEN: return "request_open"; - case CEPH_SESSION_OPEN: return "open"; - case CEPH_SESSION_REQUEST_CLOSE: return "request_close"; - case CEPH_SESSION_CLOSE: return "close"; - case CEPH_SESSION_REQUEST_RENEWCAPS: return "request_renewcaps"; - case CEPH_SESSION_RENEWCAPS: return "renewcaps"; - case CEPH_SESSION_STALE: return "stale"; - default: assert(0); return 0; - } - } int32_t op; version_t seq; // used when requesting close, declaring stale @@ -46,7 +34,7 @@ public: const char *get_type_name() { return "client_session"; } void print(ostream& out) { - out << "client_session(" << get_opname(op); + out << "client_session(" << ceph_session_op_name(op); if (seq) out << " seq " << seq; out << ")"; } -- 2.39.5