status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpd: improve finalize_sendto()

This commit is contained in:
Thomas Bernard 2014-02-28 16:39:59 +01:00
parent b71e0c028f
commit dbdad6a79b
1 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
miniupnpd/asyncsendto.c
View File

@ -195,25 +195,79 @@ int try_sendto(fd_set * writefds)
return 0; return 0;
} }
/* maximum execution time for finalize_sendto() in milliseconds */
#define FINALIZE_SENDTO_DELAY (500)
/* empty the list */ /* empty the list */
void finalize_sendto(void) void finalize_sendto(void)
{ {
ssize_t n; ssize_t n;
struct scheduled_send * elt; struct scheduled_send * elt;
struct scheduled_send * next; struct scheduled_send * next;
/* TODO : improve with a select() and a short timeout */ fd_set writefds;
for(elt = send_list.lh_first; elt != NULL; elt = next) { struct timeval deadline;
next = elt->entries.le_next; struct timeval now;
syslog(LOG_DEBUG, "finalize_sendto(): %d bytes on socket %d", struct timeval timeout;
(int)elt->len, elt->sockfd); int max_fd;
n = sendto(elt->sockfd, elt->buf, elt->len, elt->flags,
elt->dest_addr, elt->addrlen); if(gettimeofday(&deadline, NULL) < 0) {
if(n < 0) { syslog(LOG_ERR, "gettimeofday: %m");
syslog(LOG_WARNING, "sendto(): %m"); return;
}
deadline.tv_usec += FINALIZE_SENDTO_DELAY*1000;
if(deadline.tv_usec > 1000000) {
deadline.tv_sec++;
deadline.tv_usec -= 1000000;
}
while(send_list.lh_first) {
FD_ZERO(&writefds);
max_fd = -1;
for(elt = send_list.lh_first; elt != NULL; elt = next) {
next = elt->entries.le_next;
syslog(LOG_DEBUG, "finalize_sendto(): %d bytes on socket %d",
(int)elt->len, elt->sockfd);
n = sendto(elt->sockfd, elt->buf, elt->len, elt->flags,
elt->dest_addr, elt->addrlen);
if(n < 0) {
if(errno==EAGAIN || errno==EWOULDBLOCK) {
FD_SET(elt->sockfd, &writefds);
if(elt->sockfd > max_fd)
max_fd = elt->sockfd;
continue;
}
syslog(LOG_WARNING, "finalize_sendto(): socket=%d sendto: %m", elt->sockfd);
}
/* remove from the list */
LIST_REMOVE(elt, entries);
free(elt);
}
/* check deadline */
if(gettimeofday(&now, NULL) < 0) {
syslog(LOG_ERR, "gettimeofday: %m");
return;
}
if(now.tv_sec > deadline.tv_sec ||
(now.tv_sec == deadline.tv_sec && now.tv_usec > deadline.tv_usec)) {
/* deadline ! */
while((elt = send_list.lh_first) != NULL) {
LIST_REMOVE(elt, entries);
free(elt);
}
return;
}
/* compute timeout value */
timeout.tv_sec = deadline.tv_sec - now.tv_sec;
timeout.tv_usec = deadline.tv_usec - now.tv_usec;
if(timeout.tv_usec < 0) {
timeout.tv_sec--;
timeout.tv_usec += 1000000;
}
if(max_fd >= 0) {
if(select(max_fd + 1, NULL, &writefds, NULL, &timeout) < 0) {
syslog(LOG_ERR, "select: %m");
return;
}
} }
/* remove from the list */
LIST_REMOVE(elt, entries);
free(elt);
} }
} }