X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stats.cpp;h=9e3f72c2d065613c2a783336c9980c05785eea22;hp=f5916edf2fb696530fe081cad9eee503457c8a70;hb=562cf44b96b5c0260d1a1ab18b2dd2408b6d1fc8;hpb=76d52250fd5d7a84d9ae535fd7725d3a466bbb36

diff --git a/stats.cpp b/stats.cpp
index f5916ed..9e3f72c 100644
--- a/stats.cpp
+++ b/stats.cpp
@@ -5,13 +5,13 @@
 #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"
+#include "util.h"
 
 using namespace std;
 
@@ -25,7 +25,7 @@ StatsThread::StatsThread(const std::string &stats_file, int stats_interval)
 
 void StatsThread::do_work()
 {
-	while (!should_stop) {
+	while (!should_stop()) {
 		int fd;
 		FILE *fp;
 		time_t now;
@@ -35,16 +35,18 @@ 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");
-			close(fd);
-			unlink(filename);
+			log_perror("fdopen");
+			safe_close(fd);
+			if (unlink(filename) == -1) {
+				log_perror(filename);
+			}
 			free(filename);
 			goto sleep;
 		}
@@ -52,46 +54,40 @@ 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 %llu %llu\n",
+			fprintf(fp, "%s %d %d %s %d %llu %llu %llu\n",
 			        client_stats[i].remote_addr.c_str(),
-				client_stats[i].stream_id.c_str(),
+			        client_stats[i].sock,
+			        client_stats[i].fwmark,
+				client_stats[i].url.c_str(),
 				int(now - client_stats[i].connect_time),
 				(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");
-			unlink(filename);
+			log_perror("fclose");
+			if (unlink(filename) == -1) {
+				log_perror(filename);
+			}
 			free(filename);
 			goto sleep;
 		}
 		
 		if (rename(filename, stats_file.c_str()) == -1) {
-			perror("rename");
-			unlink(filename);
+			log_perror("rename");
+			if (unlink(filename) == -1) {
+				log_perror(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) {
-			perror("poll");
-			usleep(100000);
-			continue;
-		}
+		timespec timeout_ts;
+		timeout_ts.tv_sec = stats_interval;
+		timeout_ts.tv_nsec = 0;
+		wait_for_wakeup(&timeout_ts);
 	}
 }