X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=05ff37ce4ab2c1032a251a8a574d1741c854f17d;hp=c0cfc03bbe6d619bb152aa7a7e265b3d76fef10d;hb=50651c954803c1941e6ad1bb494712891c18f7d2;hpb=3b73724f08274a2c5a435d6a834bc10fcf3db41b

diff --git a/httpinput.cpp b/httpinput.cpp
index c0cfc03..05ff37c 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -20,7 +20,6 @@
 #include "httpinput.h"
 #include "log.h"
 #include "metacube2.h"
-#include "mutexlock.h"
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
@@ -49,22 +48,14 @@ extern ServerPool *servers;
 HTTPInput::HTTPInput(const string &url, Input::Encoding encoding)
 	: state(NOT_CONNECTED),
 	  url(url),
-	  encoding(encoding),
-	  has_metacube_header(false),
-	  sock(-1),
-	  num_connection_attempts(0),
-	  suppress_logging(false)
+	  encoding(encoding)
 {
-	pthread_mutex_init(&stats_mutex, NULL);
 	stats.url = url;
 	stats.bytes_received = 0;
 	stats.data_bytes_received = 0;
 	stats.metadata_bytes_received = 0;
 	stats.connect_time = -1;
 	stats.latency_sec = HUGE_VAL;
-
-	last_verbose_connection.tv_sec = -3600;
-	last_verbose_connection.tv_nsec = 0;
 }
 
 HTTPInput::HTTPInput(const InputProto &serialized)
@@ -79,9 +70,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	  http_header(serialized.http_header()),
 	  stream_header(serialized.stream_header()),
 	  has_metacube_header(serialized.has_metacube_header()),
-	  sock(serialized.sock()),
-	  num_connection_attempts(0),
-	  suppress_logging(false)
+	  sock(serialized.sock())
 {
 	pending_data.resize(serialized.pending_data().size());
 	memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
@@ -89,7 +78,6 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	string protocol, user;
 	parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
-	pthread_mutex_init(&stats_mutex, NULL);
 	stats.url = url;
 	stats.bytes_received = serialized.bytes_received();
 	stats.data_bytes_received = serialized.data_bytes_received();
@@ -97,7 +85,7 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 	if (serialized.has_connect_time()) {
 		stats.connect_time = serialized.connect_time();
 	} else {
-		stats.connect_time = time(NULL);
+		stats.connect_time = time(nullptr);
 	}
 	if (serialized.has_latency_sec()) {
 		stats.latency_sec = serialized.latency_sec();
@@ -116,7 +104,7 @@ void HTTPInput::close_socket()
 		sock = -1;
 	}
 
-	MutexLock lock(&stats_mutex);
+	lock_guard<mutex> lock(stats_mutex);
 	stats.connect_time = -1;
 }
 
@@ -151,7 +139,7 @@ InputProto HTTPInput::serialize() const
 int HTTPInput::lookup_and_connect(const string &host, const string &port)
 {
 	addrinfo *ai;
-	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
+	int err = getaddrinfo(host.c_str(), port.c_str(), nullptr, &ai);
 	if (err != 0) {
 		if (!suppress_logging) {
 			log(WARNING, "[%s] Lookup of '%s' failed (%s).",
@@ -194,7 +182,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 
 		// Wait for the connect to complete, or an error to happen.
 		for ( ;; ) {
-			bool complete = wait_for_activity(sock, POLLIN | POLLOUT, NULL);
+			bool complete = wait_for_activity(sock, POLLIN | POLLOUT, nullptr);
 			if (should_stop()) {
 				safe_close(sock);
 				return -1;
@@ -405,8 +393,8 @@ void HTTPInput::do_work()
 					request_bytes_sent = 0;
 				}
 
-				MutexLock lock(&stats_mutex);
-				stats.connect_time = time(NULL);
+				lock_guard<mutex> lock(stats_mutex);
+				stats.connect_time = time(nullptr);
 				clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity);
 			}
 			break;
@@ -474,7 +462,7 @@ void HTTPInput::do_work()
 			if (status == RP_EXTRA_DATA) {
 				char *ptr = static_cast<char *>(
 					memmem(response.data(), response.size(), "\r\n\r\n", 4));
-				assert(ptr != NULL);
+				assert(ptr != nullptr);
 				extra_data = string(ptr + 4, &response[0] + response.size());
 				response.resize(ptr - response.data());
 			}
@@ -575,7 +563,7 @@ void HTTPInput::do_work()
 void HTTPInput::process_data(char *ptr, size_t bytes)
 {
 	{
-		MutexLock mutex(&stats_mutex);
+		lock_guard<mutex> lock(stats_mutex);
 		stats.bytes_received += bytes;
 	}
 
@@ -601,7 +589,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 			char *ptr = static_cast<char *>(
 				memmem(pending_data.data(), pending_data.size(),
 				       METACUBE2_SYNC, strlen(METACUBE2_SYNC)));
-			if (ptr == NULL) {
+			if (ptr == nullptr) {
 				// OK, so we didn't find the sync marker. We know then that
 				// we do not have the _full_ marker in the buffer, but we
 				// could have N-1 bytes. Drop everything before that,
@@ -654,14 +642,14 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 		// TODO: Keep metadata when sending on to other Metacube users.
 		if (flags & METACUBE_FLAGS_METADATA) {
 			{
-				MutexLock lock(&stats_mutex);
+				lock_guard<mutex> lock(stats_mutex);
 				stats.metadata_bytes_received += size;
 			}
 			process_metacube_metadata_block(hdr, pending_data.data() + sizeof(hdr), size);
 		} else {
 			// Send this block on to the servers.
 			{
-				MutexLock lock(&stats_mutex);
+				lock_guard<mutex> lock(stats_mutex);
 				stats.data_bytes_received += size;
 			}
 			char *inner_data = pending_data.data() + sizeof(metacube2_block_header);
@@ -703,7 +691,7 @@ void HTTPInput::add_destination(int stream_index)
 
 InputStats HTTPInput::get_stats() const
 {
-	MutexLock lock(&stats_mutex);
+	lock_guard<mutex> lock(stats_mutex);
 	return stats;
 }
 
@@ -734,7 +722,7 @@ void HTTPInput::process_metacube_metadata_block(const metacube2_block_header &hd
 	double elapsed = now.tv_sec - be64toh(pkt->tv_sec) +
 		1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec)));
 	{
-		MutexLock lock(&stats_mutex);
+		lock_guard<mutex> lock(stats_mutex);
 		stats.latency_sec = elapsed;
 	}
 }