microsecond timestamp is added to http_request structure

Author: blackav

bin/ej-contests.c

@@ -349,6 +349,7 @@ cmd_http_request(
   hr.fw_state = state;
   gettimeofday(&hr.timestamp1, 0);
   hr.current_time = hr.timestamp1.tv_sec;
+  hr.current_time_us = hr.timestamp1.tv_sec * 1000000LL + hr.timestamp1.tv_usec;
   hr.locale_id = -1;
 
   if (pkt_size < sizeof(*pkt))
@@ -624,6 +625,7 @@ handle_ws_request(
   hr.fw_state = state;
   gettimeofday(&hr.timestamp1, 0);
   hr.current_time = hr.timestamp1.tv_sec;
+  hr.current_time_us = hr.timestamp1.tv_sec * 1000000LL + hr.timestamp1.tv_usec;
   hr.locale_id = -1;
   hr.config = ejudge_config;
   hr.json = root;

csp/contests/priv_main_page.csp

@@ -642,11 +642,10 @@
 %>
 
 <%
-  gettimeofday(&phr->timestamp2, 0);
-  tdiff = ((long long) phr->timestamp2.tv_sec) * 1000000;
-  tdiff += phr->timestamp2.tv_usec;
-  tdiff -= ((long long) phr->timestamp1.tv_sec) * 1000000;
-  tdiff -= phr->timestamp1.tv_usec;
+  struct timeval timestamp2;
+  gettimeofday(&timestamp2, NULL);
+  long long ts2 = timestamp2.tv_sec * 1000000LL + timestamp2.tv_usec;
+  tdiff = ts2 - phr->current_time_us;
 %>
 
 <div class="dotted"><p<s:v escape="false" value="cnts->team_par_style" />><s:_>Page generation time</s:_>: <s:v value="tdiff / 1000" /> <s:_>msec</s:_></p></div>

include/ejudge/http_request.h

@@ -119,8 +119,10 @@ struct http_request_info
   unsigned char content_type[128];
 
   time_t current_time;
+  // this time is used in priv-main-page to estimate generation time
   struct timeval timestamp1;
-  struct timeval timestamp2;
+  // microsecond precision current time
+  long long current_time_us;
 
   const struct contest_desc *cnts;
   struct contest_extra *extra;