ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-20 17:33:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename variable to current_httpd_request_count

Browse Source
This commit is contained in:
Andrew Bettison 2015-06-22 18:11:00 +09:30
parent cf0e1aa8d6
commit 0ac9d15b8f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
httpd.c
View File

@ -236,20 +236,20 @@ static int httpd_dispatch(struct http_request *);
static unsigned int http_request_uuid_counter = 0;
static httpd_request * current_httpd_requests = NULL;
unsigned int httpd_request_count = 0;
unsigned int current_httpd_request_count = 0;
static void httpd_server_finalise_http_request(struct http_request *hr)
{
httpd_request *r = (httpd_request *) hr;
if (config.debug.httpd)
DEBUGF("httpd_request_count=%u current_httpd_requests=%p r=%p r->next=%p r->prev=%p", httpd_request_count, current_httpd_requests, r, r->next, r->prev);
DEBUGF("current_httpd_request_count=%u current_httpd_requests=%p r=%p r->next=%p r->prev=%p", current_httpd_request_count, current_httpd_requests, r, r->next, r->prev);
if (r->next) {
assert(httpd_request_count >= 2);
assert(current_httpd_request_count >= 2);
assert(r->next->prev == r);
r->next->prev = r->prev;
}
if (r->prev) {
assert(httpd_request_count >= 2);
assert(current_httpd_request_count >= 2);
assert(r->prev->next == r);
r->prev->next = r->next;
}
@ -258,10 +258,10 @@ static void httpd_server_finalise_http_request(struct http_request *hr)
current_httpd_requests = r->next;
}
r->next = r->prev = NULL;
assert(httpd_request_count > 0);
--httpd_request_count;
assert(current_httpd_request_count > 0);
--current_httpd_request_count;
if (current_httpd_requests == NULL) {
assert(httpd_request_count == 0);
assert(current_httpd_request_count == 0);
}
if (r->manifest) {
rhizome_manifest_free(r->manifest);
@ -306,11 +306,11 @@ void httpd_server_poll(struct sched_ent *alarm)
request->next = current_httpd_requests;
request->prev = NULL;
if (current_httpd_requests) {
assert(httpd_request_count > 0);
assert(current_httpd_request_count > 0);
current_httpd_requests->prev = request;
}
current_httpd_requests = request;
++httpd_request_count;
++current_httpd_request_count;
request->uuid = http_request_uuid_counter++;
request->payload_status = INVALID_RHIZOME_PAYLOAD_STATUS;
request->bundle_status = INVALID_RHIZOME_BUNDLE_STATUS;

2
httpd.h
View File

@ -31,7 +31,7 @@ int is_httpd_server_running();
#define HTTPD_PORT_MAX 4210
extern uint16_t httpd_server_port;
extern unsigned int httpd_request_count;
extern unsigned int current_httpd_request_count;
enum list_phase { LIST_HEADER = 0, LIST_FIRST, LIST_ROWS, LIST_END, LIST_DONE };

2
rhizome_http.c
View File

@ -81,7 +81,7 @@ int rhizome_status_page(httpd_request *r, const char *remainder)
char buf[32*1024];
strbuf b = strbuf_local(buf, sizeof buf);
strbuf_puts(b, "<html><head><meta http-equiv=\"refresh\" content=\"5\" ></head><body>");
strbuf_sprintf(b, "%d HTTP requests<br>", httpd_request_count);
strbuf_sprintf(b, "%d HTTP requests<br>", current_httpd_request_count);
strbuf_sprintf(b, "%d Bundles transferring via MDP<br>", rhizome_cache_count());
rhizome_fetch_status_html(b);
strbuf_puts(b, "</body></html>");