From 8da82c0e11eccbb954081e3fc50c5a26b52ebd3e Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Sat, 29 Sep 2007 03:30:53 +0000
Subject: [PATCH] preserve chunk_at on received messages

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1872 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/msg/Message.h          | 1 +
 trunk/ceph/msg/SimpleMessenger.cc | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/trunk/ceph/msg/Message.h b/trunk/ceph/msg/Message.h
index cb432136f0ebb..208cf252c43fc 100644
--- a/trunk/ceph/msg/Message.h
+++ b/trunk/ceph/msg/Message.h
@@ -209,6 +209,7 @@ public:
     payload = bl;
   }
   const list<int>& get_chunk_payload_at() const { return chunk_payload_at; }
+  void set_chunk_payload_at(list<int>& o) { chunk_payload_at.swap(o); }
   msg_envelope_t& get_envelope() {
     return env;
   }
diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc
index b885fd6f83c1f..d503f4f3bb9b6 100644
--- a/trunk/ceph/msg/SimpleMessenger.cc
+++ b/trunk/ceph/msg/SimpleMessenger.cc
@@ -106,7 +106,7 @@ int Rank::Accepter::start()
 	dout(15) << ".ceph_hosts: host '" << host << "' -> '" << addr << "'" << dendl;
 	if (host == hostname) {
 	  parse_ip_port(addr.c_str(), g_my_addr);
-	  dout(0) << ".ceph_hosts: my addr is " << g_my_addr << dendl;
+	  dout(1) << ".ceph_hosts: my addr is " << g_my_addr << dendl;
 	  break;
 	}
       }
@@ -615,6 +615,8 @@ Message *Rank::Pipe::read_message()
   
   // payload
   bufferlist blist;
+  int32_t pos = 0;
+  list<int> chunk_at;
   for (int i=0; i<env.nchunks; i++) {
     int32_t size;
     if (!tcp_read( sd, (char*)&size, sizeof(size) )) {
@@ -624,6 +626,9 @@ Message *Rank::Pipe::read_message()
 
     dout(30) << "decode chunk " << i << "/" << env.nchunks << " size " << size << dendl;
 
+    if (pos) chunk_at.push_back(pos);
+    pos += size;
+
     bufferptr bp;
     if (size % 4096 == 0) {
       dout(30) << "decoding page-aligned chunk of " << size << dendl;
@@ -646,6 +651,8 @@ Message *Rank::Pipe::read_message()
   // unmarshall message
   size_t s = blist.length();
   Message *m = decode_message(env, blist);
+
+  m->set_chunk_payload_at(chunk_at);
   
   dout(20) << "pipe(" << peer_addr << ' ' << this << ").reader got " << s << " byte message from " 
            << m->get_source() << dendl;
-- 
2.39.5