X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=accesslog.cpp;h=9cd5be0ad7735cc30fe8769adada8d3509f8a079;hp=f8ee50bd42d39589fbe812624310fa52c8ec80e4;hb=1eb848c868a11973207bfcdc83925b669163c234;hpb=5cd46e39b4063d94f6dc559ae350beeb8406a8f9

diff --git a/accesslog.cpp b/accesslog.cpp
index f8ee50b..9cd5be0 100644
--- a/accesslog.cpp
+++ b/accesslog.cpp
@@ -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>
 
@@ -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 (logfp != NULL) {	
+		if (fclose(logfp) == EOF) {
+			log_perror("fclose");
 		}
-		if (nfds == 1) {
-			// Should stop.
-			break;
-		}
-		if (nfds == -1) {
-			log_perror("poll");
-			usleep(100000);
-			continue;
-		}
-	}
-	
-	if (fclose(logfp) == EOF) {
-		log_perror("fclose");
 	}
 
 	logfp = NULL;