RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

some fixes on x86

Browse Source
This commit is contained in:
Sage Weil 2008-02-01 00:41:00 -08:00
parent f2d52d3f1c
commit 4699935a27
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/msg/Message.h
View File

@ -154,20 +154,20 @@ public:
void set_seq(unsigned s) { env.seq = cpu_to_le64(s); }
// source/dest
entity_inst_t& get_dest_inst() { return *(entity_inst_t*)&env.dst; }
void set_dest_inst(entity_inst_t& inst) { env.dst = *(ceph_entity_inst*)&inst; }
entity_inst_t get_dest_inst() { return entity_inst_t(env.dst); }
void set_dest_inst(entity_inst_t& inst) { env.dst = inst; }
entity_inst_t& get_source_inst() { return *(entity_inst_t*)&env.src; }
void set_source_inst(entity_inst_t& inst) { env.src = *(ceph_entity_inst*)&inst; }
entity_inst_t get_source_inst() { return entity_inst_t(env.src); }
void set_source_inst(entity_inst_t& inst) { env.src = inst; }
entity_name_t& get_dest() { return *(entity_name_t*)&env.dst.name; }
void set_dest(entity_name_t a) { env.dst.name = *(ceph_entity_name*)&a; }
entity_name_t get_dest() { return entity_name_t(env.dst.name); }
void set_dest(entity_name_t a) { env.dst.name = a; }
entity_name_t& get_source() { return *(entity_name_t*)&env.src.name; }
void set_source(entity_name_t a) { env.src.name = *(ceph_entity_name*)&a; }
entity_name_t get_source() { return entity_name_t(env.src.name); }
void set_source(entity_name_t a) { env.src.name = a; }
entity_addr_t& get_source_addr() { return *(entity_addr_t*)&env.src.addr; }
void set_source_addr(const entity_addr_t &i) { env.src.addr = *(ceph_entity_addr*)&i; }
entity_addr_t get_source_addr() { return entity_addr_t(env.src.addr); }
void set_source_addr(const entity_addr_t &i) { env.src.addr = i; }
// virtual bits
virtual void decode_payload() = 0;

4
src/msg/SimpleMessenger.cc
View File

@ -1447,8 +1447,8 @@ Message *Rank::Pipe::read_message()
// read data
bufferlist data;
int data_len = le32_to_cpu(env.data_len);
int data_off = le32_to_cpu(env.data_off);
unsigned data_len = le32_to_cpu(env.data_len);
unsigned data_off = le32_to_cpu(env.data_off);
if (data_len) {
int left = data_len;
if (data_off & ~PAGE_MASK) {

4
src/msg/msg_types.h
View File

@ -185,6 +185,10 @@ struct entity_inst_t {
entity_inst_t(entity_name_t n, const entity_addr_t& a) : name(n), addr(a) {}
entity_inst_t(const ceph_entity_inst& i) : name(i.name), addr(i.addr) { }
entity_inst_t(const ceph_entity_name& n, const ceph_entity_addr &a) : name(n), addr(a) {}
operator ceph_entity_inst() {
ceph_entity_inst i = {name, addr};
return i;
}
};