projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1a1720
)
EVENTClient: rather use the FD found on our internal structures then searching it...
author
Wilfried Goesgens
<dothebart@citadel.org>
Fri, 15 Jun 2012 18:03:58 +0000
(20:03 +0200)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Fri, 15 Jun 2012 18:03:58 +0000
(20:03 +0200)
citadel/event_client.c
patch
|
blob
|
history
diff --git
a/citadel/event_client.c
b/citadel/event_client.c
index c4016dc1c6e2a3b4c53e3f39d5d4f58604ccd7af..774d3e86cecf506087eb2de1b87c5a7c7b17880c 100644
(file)
--- a/
citadel/event_client.c
+++ b/
citadel/event_client.c
@@
-495,8
+495,8
@@
IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
StrBufPlain(IO->ErrMsg, errmsg, -1);
break;
default:
StrBufPlain(IO->ErrMsg, errmsg, -1);
break;
default:
- rc = StrBuf_write_one_chunk_callback(
watcher->
fd,
- 0
/*TODO*/
,
+ rc = StrBuf_write_one_chunk_callback(
IO->SendBuf.
fd,
+ 0,
&IO->SendBuf);
}
&IO->SendBuf);
}
@@
-585,6
+585,9
@@
IO_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
}
else if (rc < 0) {
if (errno != EAGAIN) {
}
else if (rc < 0) {
if (errno != EAGAIN) {
+ EV_syslog(LOG_DEBUG,
+ "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ errno, strerror(errno), IO->SendBuf.fd);
IO_Timeout_callback(loop, &IO->rw_timeout, revents);
}
}
IO_Timeout_callback(loop, &IO->rw_timeout, revents);
}
}
@@
-770,8
+773,8
@@
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
}
break;
default:
}
break;
default:
- nbytes = StrBuf_read_one_chunk_callback(
watcher->
fd,
- 0
/*TODO */
,
+ nbytes = StrBuf_read_one_chunk_callback(
IO->RecvBuf.
fd,
+ 0,
&IO->RecvBuf);
break;
}
&IO->RecvBuf);
break;
}
@@
-812,8
+815,8
@@
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
// FD is gone. kick it.
StopClientWatchers(IO);
EV_syslog(LOG_DEBUG,
// FD is gone. kick it.
StopClientWatchers(IO);
EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid!
%s
\n",
-
strerror(errno)
);
+ "EVENT: Socket Invalid!
[%d] [%s] [%d]
\n",
+
errno, strerror(errno), IO->SendBuf.fd
);
ShutDownCLient(IO);
}
return;
ShutDownCLient(IO);
}
return;