Remove std:: from all code in .cpp files, for consistency.

[cubemap] / stats.cpp

diff --git a/stats.cpp b/stats.cpp
index fa483bf3a617fbed566ac1d053ac21e6e115c858..661a17bf9100b1ea4c044e89ddeba667942f7894 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -5,20 +5,19 @@
 #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;
 
 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,57 +49,52 @@ void StatsThread::do_work()
                fp = fdopen(fd, "w");
                if (fp == NULL) {
                        log_perror("fdopen");
-                       close(fd);
-                       unlink(filename);
+                       safe_close(fd);
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                        free(filename);
                        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");
-                       unlink(filename);
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                        free(filename);
                        goto sleep;
                }
                
                if (rename(filename, stats_file.c_str()) == -1) {
                        log_perror("rename");
-                       unlink(filename);
+                       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) {
-                       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);
        }
 }