X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stats.cpp;h=fa483bf3a617fbed566ac1d053ac21e6e115c858;hp=1ae23e9891a4000f8b75dd66da87c2f080120c25;hb=0d72f384a1de672824298262ba5c427ec0aee2d6;hpb=e1722a5c0341fd541ce57f1eed4dc76cbd3efe07

diff --git a/stats.cpp b/stats.cpp
index 1ae23e9..fa483bf 100644
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,10 +1,16 @@
+#include <fcntl.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pthread.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/poll.h>
+#include <errno.h>
+#include <vector>
 
+#include "client.h"
+#include "log.h"
 #include "serverpool.h"
 #include "stats.h"
 
@@ -30,14 +36,14 @@ void StatsThread::do_work()
 		char *filename = strdup((stats_file + ".new.XXXXXX").c_str());
 		fd = mkostemp(filename, O_WRONLY);
 		if (fd == -1) {
-			perror(filename);
+			log_perror(filename);
 			free(filename);
 			goto sleep;
 		}
 
 		fp = fdopen(fd, "w");
 		if (fp == NULL) {
-			perror("fdopen");
+			log_perror("fdopen");
 			close(fd);
 			unlink(filename);
 			free(filename);
@@ -47,28 +53,48 @@ void StatsThread::do_work()
 		now = time(NULL);
 		client_stats = servers->get_client_stats();
 		for (size_t i = 0; i < client_stats.size(); ++i) {
-			fprintf(fp, "%s %s %d %llu\n",
+			fprintf(fp, "%s %d %d %s %d %llu %llu %llu\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),
-				(long long unsigned)(client_stats[i].bytes_sent));
+				(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));
 		}
 		if (fclose(fp) == EOF) {
-			perror("fclose");
+			log_perror("fclose");
 			unlink(filename);
 			free(filename);
 			goto sleep;
 		}
 		
 		if (rename(filename, stats_file.c_str()) == -1) {
-			perror("rename");
+			log_perror("rename");
 			unlink(filename);
 		}
 
 sleep:
-		int left_to_sleep = stats_interval;
-		do {
-			left_to_sleep = sleep(left_to_sleep);
-		} while (left_to_sleep > 0 && !should_stop);
+		// Wait until the stop_fd pipe is closed, 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;
+		}
 	}
 }