git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@382 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sage 2005-07-02 18:56:56 +00:00
parent 262717a99c
commit cb8e50d6a3
4 changed files with 12 additions and 6 deletions

View File

@ -196,6 +196,7 @@ class bufferptr {
// assignment operator
bufferptr& operator=(const bufferptr& other) {
assert(0);
// discard old
discard_buffer();

View File

@ -32,18 +32,21 @@ class bufferlist {
bdbout(1) << "bufferlist.cons " << this << endl;
}
bufferlist(bufferlist& bl) : _len(0) {
bdbout(1) << "bufferlist.cons " << this << endl;
bdbout(1) << "bufferlist.cons " << this << endl; // O(n) and stupid!
_buffers = bl._buffers;
_len = bl._len;
}
~bufferlist() {
bdbout(1) << "bufferlist.des " << this << endl;
}
/*
bufferlist& operator=(bufferlist& bl) {
assert(0); // actually, this should be fine.
assert(0); // actually, this should be fine, just slow (O(n)) and stupid.
_buffers = bl._buffers;
_len = bl._len;
return *this;
}
*/
// accessors
list<bufferptr>& buffers() {

View File

@ -349,7 +349,9 @@ int tcp_send(Message *m)
m->reset_payload();
m->encode_payload();
msg_envelope_t *env = &m->get_envelope();
bufferlist blist = m->get_payload();
bufferlist blist;
blist.claim( m->get_payload() );
#ifdef TCP_KEEP_CHUNKS
env->nchunks = blist.buffers().size();
#else

View File

@ -93,7 +93,7 @@ int main(int oargc, char **oargv) {
int world = tcpmessenger_world();
//cerr << "horrible hack remove me" << endl;
//if (myrank == 0) g_conf.debug_filer = 15;
//if (myrank == 0) g_conf.debug = 10;
if (myrank == 0)