RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-09 01:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@346 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sage 2005-06-27 16:58:13 +00:00
parent d3ef7c44de
commit 7804916cdb
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/msg/Messenger.cc
View File

@ -129,7 +129,7 @@ Message *Messenger::sendrecv(Message *m, msg_addr_t dest, int port)
This should be fine. only the Client uses this so far (not MDS).
If OSDs want to use this, though, this must be made smarter!!!
*/
long pcid = ++last_pcid;
long pcid = ++_last_pcid;
m->set_pcid(pcid);
_lock.Lock();

4
ceph/msg/Messenger.h
View File

@ -21,13 +21,13 @@ class Messenger {
msg_addr_t _myaddr;
// procedure call fun
long last_pcid;
long _last_pcid;
Mutex _lock; // protect call_sem, call_reply
map<long, Cond*> call_cond;
map<long, Message*> call_reply;
public:
Messenger(msg_addr_t w) : dispatcher(0), _myaddr(w) { }
Messenger(msg_addr_t w) : dispatcher(0), _myaddr(w), _last_pcid(1) { }
virtual ~Messenger() { }
msg_addr_t get_myaddr() { return _myaddr; }

6
ceph/msg/TCPMessenger.cc
View File

@ -219,6 +219,9 @@ void tcp_write(int sd, char *buf, int len)
//dout(DBL) << "tcp_write writing " << len << endl;
while (len > 0) {
int did = ::send( sd, buf, len, 0 );
if (did < 0) {
dout(1) << "tcp_write error did = " << did << " errno " << errno << " " << strerror(errno) << endl;
}
assert(did >= 0);
len -= did;
buf += did;
@ -436,6 +439,9 @@ int tcp_send(Message *m)
}
sender_lock.Unlock();
// hose message
delete m;
}