X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stats.cpp;h=661a17bf9100b1ea4c044e89ddeba667942f7894;hp=280f019edd9b2811d551cf018e62334cf00413bc;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=0cb56be70f7ca4f4564eea892a99d20032359a1d

diff --git a/stats.cpp b/stats.cpp
index 280f019..661a17b 100644
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,6 +1,4 @@
-#include <errno.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,7 +17,7 @@ using namespace std;
 
 extern ServerPool *servers;
 
-StatsThread::StatsThread(const std::string &stats_file, int stats_interval)
+StatsThread::StatsThread(const string &stats_file, int stats_interval)
 	: stats_file(stats_file),
 	  stats_interval(stats_interval)
 {
@@ -29,12 +27,18 @@ void StatsThread::do_work()
 {
 	while (!should_stop()) {
 		int fd;
+		char *filename;
 		FILE *fp;
-		time_t now;
+		timespec now;
 		vector<ClientStats> client_stats;
 
+		if (clock_gettime(CLOCK_MONOTONIC_COARSE, &now) == -1) {
+			log_perror("clock_gettime(CLOCK_MONOTONIC_COARSE)");
+			goto sleep;
+		}
+
 		// Open a new, temporary file.
-		char *filename = strdup((stats_file + ".new.XXXXXX").c_str());
+		filename = strdup((stats_file + ".new.XXXXXX").c_str());
 		fd = mkostemp(filename, O_WRONLY);
 		if (fd == -1) {
 			log_perror(filename);
@@ -53,18 +57,19 @@ void StatsThread::do_work()
 			goto sleep;
 		}
 
-		now = time(NULL);
 		client_stats = servers->get_client_stats();
 		for (size_t i = 0; i < client_stats.size(); ++i) {
-			fprintf(fp, "%s %d %d %s %d %llu %llu %llu\n",
+			fprintf(fp, "%s %d %d %s %d %llu %llu %llu \"%s\" \"%s\"\n",
 			        client_stats[i].remote_addr.c_str(),
 			        client_stats[i].sock,
-			        client_stats[i].fwmark,
-				client_stats[i].stream_id.c_str(),
-				int(now - client_stats[i].connect_time),
+			        0,  // Used to be fwmark.
+				client_stats[i].url.c_str(),
+				int(now.tv_sec - client_stats[i].connect_time.tv_sec),  // Rather coarse.
 				(long long unsigned)(client_stats[i].bytes_sent),
 				(long long unsigned)(client_stats[i].bytes_lost),
-				(long long unsigned)(client_stats[i].num_loss_events));
+				(long long unsigned)(client_stats[i].num_loss_events),
+				client_stats[i].referer.c_str(),
+				client_stats[i].user_agent.c_str());
 		}
 		if (fclose(fp) == EOF) {
 			log_perror("fclose");