Revert "Rewrite the entire internal signal handling/wakeup."

[cubemap] / stats.cpp

diff --git a/stats.cpp b/stats.cpp
index 71fb4852cef695693c1a91e70ef4a61c2f764cb1..b2bca75970f800a6cf3f21517e243e3aed89cacd 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,12 +1,12 @@
+#include <errno.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/poll.h>
-#include <errno.h>
 #include <vector>
 
 #include "client.h"
@@ -44,8 +44,12 @@ void StatsThread::do_work()
                fp = fdopen(fd, "w");
                if (fp == NULL) {
                        log_perror("fdopen");
-                       close(fd);
-                       unlink(filename);
+                       if (close(fd) == -1) {
+                               log_perror("close");
+                       }
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                        free(filename);
                        goto sleep;
                }
@@ -53,8 +57,10 @@ 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].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),
@@ -63,15 +69,20 @@ void StatsThread::do_work()
                }
                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,