X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input_stats.cpp;h=5b7dc59ae762696f2eca6e9ad12fc4e54fc6272b;hp=1edfbde52379b062407dfd8e31804e51733ef64a;hb=HEAD;hpb=d4bc12548cd825607e257cbe01f3136ed524cb10

diff --git a/input_stats.cpp b/input_stats.cpp
index 1edfbde..5b7dc59 100644
--- a/input_stats.cpp
+++ b/input_stats.cpp
@@ -5,12 +5,12 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <math.h>
 #include <vector>
 
-#include "client.h"
-#include "log.h"
 #include "input.h"
 #include "input_stats.h"
+#include "log.h"
 #include "util.h"
 
 using namespace std;
@@ -27,10 +27,11 @@ void InputStatsThread::do_work()
 	while (!should_stop()) {
 		int fd;
 		FILE *fp;
+		time_t now;
 
 		// Open a new, temporary file.
 		char *filename = strdup((stats_file + ".new.XXXXXX").c_str());
-		fd = mkostemp(filename, O_WRONLY);
+		fd = mkostemp(filename, O_WRONLY | O_CLOEXEC);
 		if (fd == -1) {
 			log_perror(filename);
 			free(filename);
@@ -38,7 +39,7 @@ void InputStatsThread::do_work()
 		}
 
 		fp = fdopen(fd, "w");
-		if (fp == NULL) {
+		if (fp == nullptr) {
 			log_perror("fdopen");
 			safe_close(fd);
 			if (unlink(filename) == -1) {
@@ -48,11 +49,31 @@ void InputStatsThread::do_work()
 			goto sleep;
 		}
 
+		now = time(nullptr);
 		for (size_t i = 0; i < inputs.size(); ++i) {
 			InputStats stats = inputs[i]->get_stats();
-			fprintf(fp, "%s %llu %llu\n", stats.url.c_str(),
+			for (const char ch : stats.url) {
+				if (isspace(ch) || !isprint(ch)) {
+					putc('_', fp);
+				} else {
+					putc(ch, fp);
+				}
+			}
+			fprintf(fp, " %llu %llu",
 				(long long unsigned)(stats.bytes_received),
 				(long long unsigned)(stats.data_bytes_received));
+			if (stats.connect_time == -1) {
+				fprintf(fp, " -");
+			} else {
+				fprintf(fp, " %d", int(now - stats.connect_time));
+			}
+			fprintf(fp, " %llu", (long long unsigned)(stats.metadata_bytes_received));
+			if (!isfinite(stats.latency_sec)) {
+				fprintf(fp, " -");
+			} else {
+				fprintf(fp, " %.6f", stats.latency_sec);
+			}
+			fprintf(fp, "\n");
 		}
 		if (fclose(fp) == EOF) {
 			log_perror("fclose");