X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stats.cpp;h=661a17bf9100b1ea4c044e89ddeba667942f7894;hp=4e82d7f3395f206ed0b750d6b72980cf4c796d9a;hb=b757a4a2ce9d24835b52a185134835762af2f50c;hpb=162161d07d8db58b69e74847e71012c775c4ecca

diff --git a/stats.cpp b/stats.cpp
index 4e82d7f..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>
@@ -13,12 +11,13 @@
 #include "log.h"
 #include "serverpool.h"
 #include "stats.h"
+#include "util.h"
 
 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)
 {
@@ -26,14 +25,20 @@ StatsThread::StatsThread(const std::string &stats_file, int stats_interval)
 
 void StatsThread::do_work()
 {
-	while (!should_stop) {
+	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);
@@ -44,9 +49,7 @@ void StatsThread::do_work()
 		fp = fdopen(fd, "w");
 		if (fp == NULL) {
 			log_perror("fdopen");
-			if (close(fd) == -1) {
-				log_perror("close");
-			}
+			safe_close(fd);
 			if (unlink(filename) == -1) {
 				log_perror(filename);
 			}
@@ -54,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");
@@ -77,33 +81,20 @@ void StatsThread::do_work()
 		}
 		
 		if (rename(filename, stats_file.c_str()) == -1) {
+			log_perror("rename");
 			if (unlink(filename) == -1) {
 				log_perror(filename);
 			}
-			unlink(filename);
 		}
 		free(filename);
 
 sleep:
-		// Wait until the stop_fd pipe is closed, stats_interval timeout,
+		// Wait until we are asked to quit, stats_interval timeout,
 		// or a spurious signal. (The latter will cause us to write stats
 		// too often, but that's okay.)
-		pollfd pfd;
-		pfd.fd = stop_fd_read;
-		pfd.events = POLLIN | POLLRDHUP;
-
-		int nfds = poll(&pfd, 1, stats_interval * 1000);
-		if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
-			continue;
-		}
-		if (nfds == 1) {
-			// Should stop.
-			break;
-		}
-		if (nfds == -1) {
-			log_perror("poll");
-			usleep(100000);
-			continue;
-		}
+		timespec timeout_ts;
+		timeout_ts.tv_sec = stats_interval;
+		timeout_ts.tv_nsec = 0;
+		wait_for_wakeup(&timeout_ts);
 	}
 }