DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling of timeout issues

Browse Source
This commit is contained in:
Pierre Pronchery 2007-10-09 20:33:40 +00:00
parent 39d0941376
commit 4c8801ae97
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/appclient.c
View File

@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <netinet/in.h>
#include <netdb.h>
@ -54,9 +55,11 @@ struct _AppClient
static int _appclient_timeout(AppClient * appclient)
{
#ifdef DEBUG
fprintf(stderr, "%s", "appclient_timeout()\n");
fprintf(stderr, "%s%d%s", "appclient_timeout(", appclient->fd, ")\n");
#endif
close(appclient->fd);
errno = ETIMEDOUT;
event_unregister_io_read(appclient->event, appclient->fd);
event_unregister_io_write(appclient->event, appclient->fd);
return 1;
}
@ -78,7 +81,7 @@ static int _appclient_read(int fd, AppClient * ac)
}
ac->buf_read_cnt += len;
#ifdef DEBUG
fprintf(stderr, "%s%d%s", "appclient_read() ", len, " bytes\n");
fprintf(stderr, "%s%zd%s", "appclient_read() ", len, " bytes\n");
#endif
len = appinterface_call_receive(ac->interface, ac->buf_read,
ac->buf_read_cnt, ac->lastret, ac->lastfunc,
@ -157,7 +160,6 @@ AppClient * appclient_new_event(char * app, Event * event)
return NULL;
}
appclient->event = event;
appclient->fd = -1;
appclient->buf_read_cnt = 0;
appclient->buf_write_cnt = 0;
if(_new_connect(appclient, app) != 0)
@ -277,6 +279,7 @@ int appclient_call(AppClient * ac, int32_t * ret, char const * function, ...)
}
static int _call_event(AppClient * ac)
/* FIXME don't block processing of other events */
{
Event * eventtmp;
struct timeval tv = { 10, 0 };

3
src/event.c
View File

@ -130,7 +130,7 @@ int event_loop(Event * event)
int ret = 0;
while(!(timeout == NULL && event->fdmax == -1)
&& (ret = select(event->fdmax+1, &rfds, &wfds, NULL,
&& (ret = select(event->fdmax + 1, &rfds, &wfds, NULL,
timeout)) != -1)
{
_loop_timeout(event);
@ -331,6 +331,7 @@ int event_register_timeout(Event * event, struct timeval timeout,
/* event_unregister_io_read */
static int _unregister_io(eventioArray * eios, fd_set * fds, int fd);
int event_unregister_io_read(Event * event, int fd)
{
event->fdmax = _unregister_io(event->reads, &event->rfds, fd);