From 53ce37ac35fea1d41b238bc594c5842e382c29f0 Mon Sep 17 00:00:00 2001 From: sageweil Date: Mon, 9 Oct 2006 19:14:54 +0000 Subject: [PATCH] tabs git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@921 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/messages/MMonOSDMapInfo.h | 22 +++++++++++----------- ceph/messages/MMonOSDMapLease.h | 22 +++++++++++----------- ceph/messages/MMonOSDMapLeaseAck.h | 18 +++++++++--------- ceph/messages/MMonOSDMapUpdateAck.h | 18 +++++++++--------- ceph/messages/MMonOSDMapUpdateCommit.h | 14 +++++++------- ceph/messages/MMonOSDMapUpdatePrepare.h | 22 +++++++++++----------- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ceph/messages/MMonOSDMapInfo.h b/ceph/messages/MMonOSDMapInfo.h index 871395d354ac0..182b36f0a57cf 100644 --- a/ceph/messages/MMonOSDMapInfo.h +++ b/ceph/messages/MMonOSDMapInfo.h @@ -25,24 +25,24 @@ class MMonOSDMapInfo : public Message { epoch_t get_epoch() { return epoch; } epoch_t get_mon_epoch() { return mon_epoch; } - + MMonOSDMapInfo(epoch_t e, epoch_t me) : - Message(MSG_MON_OSDMAP_UPDATE_PREPARE), - epoch(e), mon_epoch(me) { + Message(MSG_MON_OSDMAP_UPDATE_PREPARE), + epoch(e), mon_epoch(me) { } - + char *get_type_name() { return "omap_info"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); - payload.append((char*)&mon_epoch, sizeof(mon_epoch)); + payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&mon_epoch, sizeof(mon_epoch)); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); - payload.copy(off, sizeof(mon_epoch), (char*)&mon_epoch); - off += sizeof(mon_epoch); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); + payload.copy(off, sizeof(mon_epoch), (char*)&mon_epoch); + off += sizeof(mon_epoch); } }; diff --git a/ceph/messages/MMonOSDMapLease.h b/ceph/messages/MMonOSDMapLease.h index e9672926982f3..c6112bd898cae 100644 --- a/ceph/messages/MMonOSDMapLease.h +++ b/ceph/messages/MMonOSDMapLease.h @@ -27,22 +27,22 @@ class MMonOSDMapLease : public Message { const utime_t& get_lease_expire() { return lease_expire; } MMonOSDMapLease(epoch_t e, utime_t le) : - Message(MSG_MON_OSDMAP_LEASE), - epoch(e), lease_expire(le) { + Message(MSG_MON_OSDMAP_LEASE), + epoch(e), lease_expire(le) { } - - char *get_type_name() { return "omaplease"; } + + char *get_type_name() { return "omap_lease"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); - payload.append((char*)&lease_expire, sizeof(lease_expire)); + payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&lease_expire, sizeof(lease_expire)); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); - payload.copy(off, sizeof(lease_expire), (char*)&lease_expire); - off += sizeof(lease_expire); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); + payload.copy(off, sizeof(lease_expire), (char*)&lease_expire); + off += sizeof(lease_expire); } }; diff --git a/ceph/messages/MMonOSDMapLeaseAck.h b/ceph/messages/MMonOSDMapLeaseAck.h index b9678b17eef43..85d5ea7c02809 100644 --- a/ceph/messages/MMonOSDMapLeaseAck.h +++ b/ceph/messages/MMonOSDMapLeaseAck.h @@ -21,23 +21,23 @@ class MMonOSDMapLeaseAck : public Message { epoch_t epoch; - public: +public: epoch_t get_epoch() { return epoch; } - + MMonOSDMapLeaseAck(epoch_t e) : - Message(MSG_MON_OSDMAP_LEASE_ACK), - epoch(e) { + Message(MSG_MON_OSDMAP_LEASE_ACK), + epoch(e) { } - + char *get_type_name() { return "omap_lease_ack"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&epoch, sizeof(epoch)); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); } }; diff --git a/ceph/messages/MMonOSDMapUpdateAck.h b/ceph/messages/MMonOSDMapUpdateAck.h index dc154959de7ab..8673788f0632f 100644 --- a/ceph/messages/MMonOSDMapUpdateAck.h +++ b/ceph/messages/MMonOSDMapUpdateAck.h @@ -19,23 +19,23 @@ #include "include/types.h" class MMonOSDMapUpdateAck : public Message { - public: +public: epoch_t epoch; - + MMonOSDMapUpdateAck(epoch_t e) : - Message(MSG_MON_OSDMAP_UPDATE_ACK), - epoch(e) { + Message(MSG_MON_OSDMAP_UPDATE_ACK), + epoch(e) { } - + char *get_type_name() { return "omap_update_ack"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&epoch, sizeof(epoch)); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); } }; diff --git a/ceph/messages/MMonOSDMapUpdateCommit.h b/ceph/messages/MMonOSDMapUpdateCommit.h index 3f36d95cf90c8..6f12a8e3c784d 100644 --- a/ceph/messages/MMonOSDMapUpdateCommit.h +++ b/ceph/messages/MMonOSDMapUpdateCommit.h @@ -23,19 +23,19 @@ class MMonOSDMapUpdateCommit : public Message { epoch_t epoch; MMonOSDMapUpdateCommit(epoch_t e) : - Message(MSG_MON_OSDMAP_UPDATE_COMMIT), - epoch(e) { + Message(MSG_MON_OSDMAP_UPDATE_COMMIT), + epoch(e) { } - + char *get_type_name() { return "omap_update_commit"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&epoch, sizeof(epoch)); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); } }; diff --git a/ceph/messages/MMonOSDMapUpdatePrepare.h b/ceph/messages/MMonOSDMapUpdatePrepare.h index 7047871f7a159..bc962ea2b3eb2 100644 --- a/ceph/messages/MMonOSDMapUpdatePrepare.h +++ b/ceph/messages/MMonOSDMapUpdatePrepare.h @@ -27,25 +27,25 @@ class MMonOSDMapUpdatePrepare : public Message { epoch_t get_epoch() { return epoch; } MMonOSDMapUpdatePrepare(epoch_t e, - bufferlist& mbl, bufferlist& incmbl) : - Message(MSG_MON_OSDMAP_UPDATE_PREPARE), - epoch(e), - map_bl(mbl), inc_map_bl(incmbl) { + bufferlist& mbl, bufferlist& incmbl) : + Message(MSG_MON_OSDMAP_UPDATE_PREPARE), + epoch(e), + map_bl(mbl), inc_map_bl(incmbl) { } - + char *get_type_name() { return "omap_update_prepare"; } void encode_payload() { - payload.append((char*)&epoch, sizeof(epoch)); + payload.append((char*)&epoch, sizeof(epoch)); ::_encode(map_bl, payload); ::_encode(inc_map_bl, payload); } void decode_payload() { - int off = 0; - payload.copy(off, sizeof(epoch), (char*)&epoch); - off += sizeof(epoch); - ::_decode(map_bl, payload, off); - ::_decode(inc_map_bl, payload, off); + int off = 0; + payload.copy(off, sizeof(epoch), (char*)&epoch); + off += sizeof(epoch); + ::_decode(map_bl, payload, off); + ::_decode(inc_map_bl, payload, off); } }; -- 2.39.5