chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New internal consistency checking with assert if right options set.
[adns.git]
/
src
/
poll.c
diff --git
a/src/poll.c
b/src/poll.c
index 03f153a0b3849612a0b427ee7d5b1063c794f3c7..6183e4667503e84fabac9f26d08f762fc79606f0 100644
(file)
--- a/
src/poll.c
+++ b/
src/poll.c
@@
-29,32
+29,36
@@
int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeout_io,
const struct timeval *now) {
struct timeval tv_nowbuf, tv_tobuf, *tv_to;
int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeout_io,
const struct timeval *now) {
struct timeval tv_nowbuf, tv_tobuf, *tv_to;
- int space, found, timeout_ms;
+ int space, found, timeout_ms
, r
;
struct pollfd fds_tmp[MAX_POLLFDS];
struct pollfd fds_tmp[MAX_POLLFDS];
- adns__must_gettimeofday(ads,&now,&tv_nowbuf);
- if (!now) { *nfds_io= 0; return 0; }
+ adns__consistency(ads,cc_entex);
- timeout_ms= *timeout_io;
- if (timeout_ms == -1) {
- tv_to= 0;
- } else {
- tv_tobuf.tv_sec= timeout_ms / 1000;
- tv_tobuf.tv_usec= (timeout_ms % 1000)*1000;
- tv_to= &tv_tobuf;
- }
+ if (timeout_io) {
+ adns__must_gettimeofday(ads,&now,&tv_nowbuf);
+ if (!now) { *nfds_io= 0; r= 0; goto xit; }
- adns__timeouts(ads, 1, &tv_to,&tv_tobuf, *now);
+ timeout_ms= *timeout_io;
+ if (timeout_ms == -1) {
+ tv_to= 0;
+ } else {
+ tv_tobuf.tv_sec= timeout_ms / 1000;
+ tv_tobuf.tv_usec= (timeout_ms % 1000)*1000;
+ tv_to= &tv_tobuf;
+ }
- if (tv_to) {
- assert(tv_to == &tv_tobuf);
- timeout_ms= (tv_tobuf.tv_usec+999)/1000;
- assert(tv_tobuf.tv_sec < (INT_MAX-timeout_ms)/1000);
- timeout_ms += tv_tobuf.tv_sec*1000;
- } else {
- timeout_ms= -1;
+ adns__timeouts(ads, 0, &tv_to,&tv_tobuf, *now);
+
+ if (tv_to) {
+ assert(tv_to == &tv_tobuf);
+ timeout_ms= (tv_tobuf.tv_usec+999)/1000;
+ assert(tv_tobuf.tv_sec < (INT_MAX-timeout_ms)/1000);
+ timeout_ms += tv_tobuf.tv_sec*1000;
+ } else {
+ timeout_ms= -1;
+ }
+ *timeout_io= timeout_ms;
}
}
- *timeout_io= timeout_ms;
space= *nfds_io;
if (space >= MAX_POLLFDS) {
space= *nfds_io;
if (space >= MAX_POLLFDS) {
@@
-63,21
+67,26
@@
int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeo
} else {
found= adns__pollfds(ads,fds_tmp);
*nfds_io= found;
} else {
found= adns__pollfds(ads,fds_tmp);
*nfds_io= found;
- if (
found < space) return space ? ERANGE : 0;
+ if (
space < found) { r= ERANGE; goto xit; }
memcpy(fds,fds_tmp,sizeof(struct pollfd)*found);
}
memcpy(fds,fds_tmp,sizeof(struct pollfd)*found);
}
- return 0;
+ r= 0;
+xit:
+ adns__consistency(ads,cc_entex);
+ return r;
}
void adns_afterpoll(adns_state ads, const struct pollfd *fds, int nfds,
const struct timeval *now) {
struct timeval tv_buf;
}
void adns_afterpoll(adns_state ads, const struct pollfd *fds, int nfds,
const struct timeval *now) {
struct timeval tv_buf;
+ adns__consistency(ads,cc_entex);
adns__must_gettimeofday(ads,&now,&tv_buf);
adns__must_gettimeofday(ads,&now,&tv_buf);
- if (!now) return;
-
- adns__timeouts(ads,1, 0,0, *now);
- adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
+ if (now) {
+ adns__timeouts(ads, 1, 0,0, *now);
+ adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
+ }
+ adns__consistency(ads,cc_entex);
}
#endif
}
#endif