diff --git a/httpd.c b/httpd.c
index 3b914fe7..386a1606 100644
--- a/httpd.c
+++ b/httpd.c
@@ -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;
diff --git a/httpd.h b/httpd.h
index d0d98dfb..f94fd8ca 100644
--- a/httpd.h
+++ b/httpd.h
@@ -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 };
diff --git a/rhizome_http.c b/rhizome_http.c
index 0f8a7d5e..be09518c 100644
--- a/rhizome_http.c
+++ b/rhizome_http.c
@@ -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, "");
- strbuf_sprintf(b, "%d HTTP requests
", httpd_request_count);
+ strbuf_sprintf(b, "%d HTTP requests
", current_httpd_request_count);
strbuf_sprintf(b, "%d Bundles transferring via MDP
", rhizome_cache_count());
rhizome_fetch_status_html(b);
strbuf_puts(b, "");