Fix an issue where access.log would have the wrong timestamp.
[cubemap] / accesslog.cpp
index 3183a10..af53872 100644 (file)
@@ -1,9 +1,6 @@
-#include <errno.h>
-#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <time.h>
-#include <unistd.h>
 #include <string>
 #include <vector>
 
@@ -11,6 +8,7 @@
 #include "client.h"
 #include "log.h"
 #include "mutexlock.h"
+#include "timespec.h"
 
 using namespace std;
 
@@ -26,8 +24,11 @@ AccessLogThread::AccessLogThread(const string &filename)
 
 void AccessLogThread::write(const ClientStats& client)
 {
-       MutexLock lock(&mutex);
-       pending_writes.push_back(client);
+       {
+               MutexLock lock(&mutex);
+               pending_writes.push_back(client);
+       }
+       wakeup();
 }
 
 void AccessLogThread::do_work()
@@ -43,7 +44,7 @@ void AccessLogThread::do_work()
                }
        }
 
-       while (!should_stop) {
+       while (!should_stop()) {
                // Empty the queue.
                vector<ClientStats> writes;
                {
@@ -51,43 +52,37 @@ void AccessLogThread::do_work()
                        swap(pending_writes, writes);
                }
 
-               if (logfp == NULL) {
-                       continue;
-               }
-
-               // Do the actual writes.
-               time_t now = time(NULL);
-               for (size_t i = 0; i < writes.size(); ++i) {
-                       fprintf(logfp, "%llu %s %s %d %llu %llu %llu\n",
-                               (long long unsigned)(writes[i].connect_time),
-                               writes[i].remote_addr.c_str(),
-                               writes[i].stream_id.c_str(),
-                               int(now - writes[i].connect_time),
-                               (long long unsigned)(writes[i].bytes_sent),
-                               (long long unsigned)(writes[i].bytes_lost),
-                               (long long unsigned)(writes[i].num_loss_events));
+               if (logfp != NULL) {
+                       // Do the actual writes.
+                       timespec now_monotonic;
+                       timespec now_realtime;
+                       if (clock_gettime(CLOCK_MONOTONIC_COARSE, &now_monotonic) == -1) {
+                               log_perror("clock_gettime(CLOCK_MONOTONIC_COARSE)");
+                       } else if (clock_gettime(CLOCK_REALTIME, &now_realtime) == -1) {
+                               log_perror("clock_gettime(CLOCK_REALTIME)");
+                       } else {
+                               timespec realtime_offset = clock_diff(now_monotonic, now_realtime);
+                               for (size_t i = 0; i < writes.size(); ++i) {
+                                       timespec connect_time_realtime = clock_add(writes[i].connect_time, realtime_offset);
+                                       timespec time_since_connect = clock_diff(writes[i].connect_time, now_monotonic);
+                                       fprintf(logfp, "%llu %s %s %d %llu %llu %llu \"%s\" \"%s\"\n",
+                                               (long long unsigned)(connect_time_realtime.tv_sec),
+                                               writes[i].remote_addr.c_str(),
+                                               writes[i].url.c_str(),
+                                               int(time_since_connect.tv_sec),
+                                               (long long unsigned)(writes[i].bytes_sent),
+                                               (long long unsigned)(writes[i].bytes_lost),
+                                               (long long unsigned)(writes[i].num_loss_events),
+                                               writes[i].referer.c_str(),
+                                               writes[i].user_agent.c_str());
+                               }
+                               fflush(logfp);
+                       }
                }
-               fflush(logfp);
-               
-               // Wait until the stop_fd pipe is closed, one second has passed.
-               // or a spurious signal arrives.
-               pollfd pfd;
-               pfd.fd = stop_fd_read;
-               pfd.events = POLLIN | POLLRDHUP;
 
-               int nfds = poll(&pfd, 1, 1000);
-               if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
-                       continue;
-               }
-               if (nfds == 1) {
-                       // Should stop.
-                       break;
-               }
-               if (nfds == -1) {
-                       log_perror("poll");
-                       usleep(100000);
-                       continue;
-               }
+               // Wait until we are being woken up, either to quit or because
+               // there is material in pending_writes.
+               wait_for_wakeup(NULL);
        }
 
        if (logfp != NULL) {