RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

msgr: make Message::get_orig_* differ only when explicitly directed to

Browse Source 
This paves the way for removal of the orig_src field from the message
header.
This commit is contained in:
Sage Weil 2010-03-25 13:46:16 -07:00
parent 158d4ecb5a
commit 94137309db
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/messages/MForward.h
View File

@ -55,6 +55,7 @@ struct MForward : public Message {
::decode(client, p);
::decode(client_caps, p);
msg = (PaxosServiceMessage *)decode_message(p);
msg->set_orig_source_inst(client);
}
const char *get_type_name() { return "forward"; }

26
src/msg/Message.h
View File

@ -220,15 +220,18 @@ protected:
Connection *connection;
friend class Messenger;
bool _forwarded;
entity_inst_t _orig_source_inst;
public:
atomic_t nref;
Message() : connection(NULL), nref(0) {
Message() : connection(NULL), _forwarded(false), nref(0) {
memset(&header, 0, sizeof(header));
memset(&footer, 0, sizeof(footer));
};
Message(int t) : connection(NULL), nref(0) {
Message(int t) : connection(NULL), _forwarded(false), nref(0) {
memset(&header, 0, sizeof(header));
header.type = t;
header.version = 1;
@ -313,10 +316,21 @@ public:
entity_addr_t get_source_addr() { return entity_addr_t(header.src.addr); }
void set_source_inst(entity_inst_t& inst) { header.src = inst; }
entity_inst_t get_orig_source_inst() { return entity_inst_t(header.orig_src); }
entity_name_t get_orig_source() { return entity_name_t(header.orig_src.name); }
entity_addr_t get_orig_source_addr() { return entity_addr_t(header.orig_src.addr); }
void set_orig_source_inst(entity_inst_t &i) { header.orig_src = i; }
entity_inst_t get_orig_source_inst() {
if (_forwarded)
return _orig_source_inst;
return get_source_inst();
}
entity_name_t get_orig_source() {
return get_orig_source_inst().name;
}
entity_addr_t get_orig_source_addr() {
return get_orig_source_inst().addr;
}
void set_orig_source_inst(entity_inst_t& i) {
_forwarded = true;
_orig_source_inst = i;
}
// virtual bits
virtual void decode_payload() = 0;