Change the connected time from time_t to timespec.

[cubemap] / stats.cpp

diff --git a/stats.cpp b/stats.cpp
index 280f019edd9b2811d551cf018e62334cf00413bc..b0765ed32a4e22a0b0059144f3bd7ce321c3ccdd 100644 (file)
--- 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>
@@ -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,15 +57,14 @@ 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",
                                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));