Unbreak access logging.
[cubemap] / accesslog.cpp
index 7dfadff..9cd5be0 100644 (file)
@@ -1,9 +1,6 @@
+#include <stddef.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <sys/poll.h>
-#include <errno.h>
-
-#include <algorithm>
+#include <time.h>
 #include <string>
 #include <vector>
 
@@ -26,8 +23,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 +43,7 @@ void AccessLogThread::do_work()
                }
        }
 
-       while (!should_stop) {
+       while (!should_stop()) {
                // Empty the queue.
                vector<ClientStats> writes;
                {
@@ -51,47 +51,31 @@ void AccessLogThread::do_work()
                        swap(pending_writes, writes);
                }
 
-               if (logfp == NULL) {
-                       continue;
+               if (logfp != NULL) {
+                       // 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].url.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));
+                       }
+                       fflush(logfp);
                }
 
-               // 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));
-               }
-               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;
+               // Wait until we are being woken up, either to quit or because
+               // there is material in pending_writes.
+               wait_for_wakeup(NULL);
+       }
 
-               int nfds = poll(&pfd, 1, 1000);
-               if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
-                       continue;
-               }
-               if (nfds == 1) {
-                       // Should stop.
-                       break;
+       if (logfp != NULL) {    
+               if (fclose(logfp) == EOF) {
+                       log_perror("fclose");
                }
-               if (nfds == -1) {
-                       log_perror("poll");
-                       usleep(100000);
-                       continue;
-               }
-       }
-       
-       if (fclose(logfp) == EOF) {
-               log_perror("fclose");
        }
 
        logfp = NULL;