ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-20 21:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add assertions to http_server_poll()

Browse Source 
This might help discover the cause of the "runaway http_server_poll"
bug sometimes observed in Batphone
This commit is contained in:
Andrew Bettison 2014-06-12 15:57:45 +09:30
parent 3e601aa5af
commit 55b9de721e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http_server.c
View File

@ -109,6 +109,7 @@ void http_request_init(struct http_request *r, int sockfd)
r->response.header.resource_length = CONTENT_LENGTH_UNKNOWN; r->response.header.resource_length = CONTENT_LENGTH_UNKNOWN;
r->alarm.stats = &http_server_stats; r->alarm.stats = &http_server_stats;
r->alarm.function = http_server_poll; r->alarm.function = http_server_poll;
assert(r->idle_timeout >= 0);
if (r->idle_timeout == 0) if (r->idle_timeout == 0)
r->idle_timeout = 10000; // 10 seconds r->idle_timeout = 10000; // 10 seconds
r->alarm.poll.fd = sockfd; r->alarm.poll.fd = sockfd;
@ -126,7 +127,7 @@ static void http_request_set_idle_timeout(struct http_request *r)
{ {
assert(r->phase == RECEIVE || r->phase == TRANSMIT); assert(r->phase == RECEIVE || r->phase == TRANSMIT);
r->alarm.alarm = gettime_ms() + r->idle_timeout; r->alarm.alarm = gettime_ms() + r->idle_timeout;
r->alarm.deadline = r->alarm.alarm + r->idle_timeout; r->alarm.deadline = r->alarm.alarm + 500;
unschedule(&r->alarm); unschedule(&r->alarm);
schedule(&r->alarm); schedule(&r->alarm);
} }
@ -1705,12 +1706,16 @@ static void http_server_poll(struct sched_ent *alarm)
DEBUGF("Poll error (%s), closing connection", alloca_poll_events(alarm->poll.revents)); DEBUGF("Poll error (%s), closing connection", alloca_poll_events(alarm->poll.revents));
http_request_finalise(r); http_request_finalise(r);
} }
else { else if (alarm->poll.revents & POLLIN) {
if (r->phase == RECEIVE && (alarm->poll.revents & POLLIN)) assert((alarm->poll.revents & POLLOUT) == 0);
http_request_receive(r); // this could change the phase to TRANSMIT http_request_receive(r); // this could change the phase to TRANSMIT
if (r->phase == TRANSMIT && (alarm->poll.revents & POLLOUT))
http_request_send_response(r);
} }
else if (alarm->poll.revents & POLLOUT) {
assert((alarm->poll.revents & POLLIN) == 0);
http_request_send_response(r);
}
else
abort(); // should not be any other POLL bits set
// Any of the above calls could change the phase to DONE. // Any of the above calls could change the phase to DONE.
if (r->phase == DONE && r->free) if (r->phase == DONE && r->free)
r->free(r); // after this, *r is no longer valid r->free(r); // after this, *r is no longer valid