X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=7967c76c1ab81599ad6d1368fa4e60c9d2ac0dd6;hp=bf8a8b1dd22e609d6611193ae1cf327c96c3d758;hb=58dd753c464d917dc446e2cbb4c01fd750d4eb87;hpb=37bc14f5b28f66ccc1760f410091f98769616476 diff --git a/httpinput.cpp b/httpinput.cpp index bf8a8b1..7967c76 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +21,6 @@ #include "httpinput.h" #include "log.h" #include "metacube2.h" -#include "mutexlock.h" #include "parse.h" #include "serverpool.h" #include "state.pb.h" @@ -48,20 +49,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; - - last_verbose_connection.tv_sec = -3600; - last_verbose_connection.tv_nsec = 0; + stats.latency_sec = HUGE_VAL; } HTTPInput::HTTPInput(const InputProto &serialized) @@ -84,15 +79,23 @@ 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(); + stats.metadata_bytes_received = serialized.metadata_bytes_received(); 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(); + } else { + stats.latency_sec = HUGE_VAL; } + + last_verbose_connection.tv_sec = -3600; + last_verbose_connection.tv_nsec = 0; } void HTTPInput::close_socket() @@ -102,7 +105,7 @@ void HTTPInput::close_socket() sock = -1; } - MutexLock lock(&stats_mutex); + lock_guard lock(stats_mutex); stats.connect_time = -1; } @@ -121,6 +124,9 @@ InputProto HTTPInput::serialize() const serialized.set_sock(sock); serialized.set_bytes_received(stats.bytes_received); serialized.set_data_bytes_received(stats.data_bytes_received); + if (isfinite(stats.latency_sec)) { + serialized.set_latency_sec(stats.latency_sec); + } serialized.set_connect_time(stats.connect_time); if (encoding == Input::INPUT_ENCODING_METACUBE) { serialized.set_is_metacube_encoded(true); @@ -134,10 +140,12 @@ 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) { - log(WARNING, "[%s] Lookup of '%s' failed (%s).", - url.c_str(), host.c_str(), gai_strerror(err)); + if (!suppress_logging) { + log(WARNING, "[%s] Lookup of '%s' failed (%s).", + url.c_str(), host.c_str(), gai_strerror(err)); + } return -1; } @@ -175,7 +183,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; @@ -205,8 +213,10 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) } // Give the last one as error. - log(WARNING, "[%s] Connect to '%s' failed (%s)", - url.c_str(), host.c_str(), strerror(errno)); + if (!suppress_logging) { + log(WARNING, "[%s] Connect to '%s' failed (%s)", + url.c_str(), host.c_str(), strerror(errno)); + } freeaddrinfo(base_ai); return -1; } @@ -239,12 +249,11 @@ bool HTTPInput::parse_response(const string &request) return false; } - multimap parameters = extract_headers(lines, url); + unordered_multimap parameters = extract_headers(lines, url); // Remove “Content-encoding: metacube”. // TODO: Make case-insensitive. - multimap::iterator encoding_it = - parameters.find("Content-encoding"); + const auto encoding_it = parameters.find("Content-encoding"); if (encoding_it != parameters.end() && encoding_it->second == "metacube") { parameters.erase(encoding_it); } @@ -255,31 +264,26 @@ bool HTTPInput::parse_response(const string &request) if (parameters.count("Server") == 0) { parameters.insert(make_pair("Server", SERVER_IDENTIFICATION)); } else { - for (multimap::iterator it = parameters.begin(); - it != parameters.end(); - ++it) { - if (it->first != "Server") { + for (auto &key_and_value : parameters) { + if (key_and_value.first != "Server") { continue; } - it->second = SERVER_IDENTIFICATION " (reflecting: " + it->second + ")"; + key_and_value.second = SERVER_IDENTIFICATION " (reflecting: " + key_and_value.second + ")"; } } - // Set “Connection: close”. + // Erase “Connection: close”; we'll set it on the sending side if needed. // TODO: Make case-insensitive. parameters.erase("Connection"); - parameters.insert(make_pair("Connection", "close")); // Construct the new HTTP header. http_header = "HTTP/1.0 200 OK\r\n"; - for (multimap::iterator it = parameters.begin(); - it != parameters.end(); - ++it) { - http_header.append(it->first + ": " + it->second + "\r\n"); + for (const auto &key_and_value : parameters) { + http_header.append(key_and_value.first + ": " + key_and_value.second + "\r\n"); } - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->set_header(stream_indices[i], http_header, stream_header); + for (int stream_index : stream_indices) { + servers->set_header(stream_index, http_header, stream_header); } return true; @@ -337,8 +341,8 @@ void HTTPInput::do_work() response.clear(); pending_data.clear(); has_metacube_header = false; - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->set_header(stream_indices[i], "", ""); + for (int stream_index : stream_indices) { + servers->set_header(stream_index, "", ""); } { @@ -389,8 +393,8 @@ void HTTPInput::do_work() request_bytes_sent = 0; } - MutexLock lock(&stats_mutex); - stats.connect_time = time(NULL); + lock_guard lock(stats_mutex); + stats.connect_time = time(nullptr); clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); } break; @@ -458,7 +462,7 @@ void HTTPInput::do_work() if (status == RP_EXTRA_DATA) { char *ptr = static_cast( 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()); } @@ -559,13 +563,13 @@ void HTTPInput::do_work() void HTTPInput::process_data(char *ptr, size_t bytes) { { - MutexLock mutex(&stats_mutex); + lock_guard lock(stats_mutex); stats.bytes_received += bytes; } if (encoding == Input::INPUT_ENCODING_RAW) { - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->add_data(stream_indices[i], ptr, bytes, /*metacube_flags=*/0); + for (int stream_index : stream_indices) { + servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0, /*pts=*/RationalPTS()); } return; } @@ -585,7 +589,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes) char *ptr = static_cast( 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, @@ -633,20 +637,32 @@ void HTTPInput::process_data(char *ptr, size_t bytes) return; } - // Send this block on to the servers. - { - MutexLock lock(&stats_mutex); - stats.data_bytes_received += size; - } - char *inner_data = pending_data.data() + sizeof(metacube2_block_header); - if (flags & METACUBE_FLAGS_HEADER) { - stream_header = string(inner_data, inner_data + size); - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->set_header(stream_indices[i], http_header, stream_header); + // See if this is a metadata block. If so, we don't want to send it on, + // but rather process it ourselves. + // TODO: Keep metadata when sending on to other Metacube users. + if (flags & METACUBE_FLAGS_METADATA) { + { + lock_guard lock(stats_mutex); + stats.metadata_bytes_received += size; } - } - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->add_data(stream_indices[i], inner_data, size, flags); + process_metacube_metadata_block(hdr, pending_data.data() + sizeof(hdr), size); + } else { + // Send this block on to the servers. + { + lock_guard lock(stats_mutex); + stats.data_bytes_received += size; + } + char *inner_data = pending_data.data() + sizeof(metacube2_block_header); + if (flags & METACUBE_FLAGS_HEADER) { + stream_header = string(inner_data, inner_data + size); + for (int stream_index : stream_indices) { + servers->set_header(stream_index, http_header, stream_header); + } + } + for (int stream_index : stream_indices) { + servers->add_data(stream_index, inner_data, size, flags, next_block_pts); + } + next_block_pts = RationalPTS(); } // Consume the block. This isn't the most efficient way of dealing with things @@ -676,6 +692,49 @@ void HTTPInput::add_destination(int stream_index) InputStats HTTPInput::get_stats() const { - MutexLock lock(&stats_mutex); + lock_guard lock(stats_mutex); return stats; } + +void HTTPInput::process_metacube_metadata_block(const metacube2_block_header &hdr, const char *payload, uint32_t payload_size) +{ + if (payload_size < sizeof(uint64_t)) { + log(WARNING, "[%s] Undersized Metacube metadata block (%d bytes); corrupted header?", + url.c_str(), payload_size); + return; + } + + uint64_t type = be64toh(*(const uint64_t *)payload); + if (type == METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP) { + timespec now; + clock_gettime(CLOCK_REALTIME, &now); + + const metacube2_timestamp_packet *pkt = (const metacube2_timestamp_packet *)payload; + if (payload_size != sizeof(*pkt)) { + log(WARNING, "[%s] Metacube timestamp block of wrong size (%d bytes); ignoring.", + url.c_str(), payload_size); + return; + } + + double elapsed = now.tv_sec - be64toh(pkt->tv_sec) + + 1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec))); + { + lock_guard lock(stats_mutex); + stats.latency_sec = elapsed; + } + } else if (type == METACUBE_METADATA_TYPE_NEXT_BLOCK_PTS) { + const metacube2_pts_packet *pkt = (const metacube2_pts_packet *)payload; + if (payload_size != sizeof(*pkt)) { + log(WARNING, "[%s] Metacube pts block of wrong size (%d bytes); ignoring.", + url.c_str(), payload_size); + return; + } + next_block_pts.pts = be64toh(pkt->pts); + next_block_pts.timebase_num = be64toh(pkt->timebase_num); + next_block_pts.timebase_den = be64toh(pkt->timebase_den); + } else { + // Unknown metadata block, ignore + log(INFO, "[%s] Metadata block %llu\n", url.c_str(), type); + return; + } +}