X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpinput.cpp;h=c0cfc03bbe6d619bb152aa7a7e265b3d76fef10d;hb=3b73724f08274a2c5a435d6a834bc10fcf3db41b;hp=49333c5f4357c48fa00184c6822931b95759d4b6;hpb=c065a02f889b0f1166215278a9430ed1f560f0c2;p=cubemap diff --git a/httpinput.cpp b/httpinput.cpp index 49333c5..c0cfc03 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,9 @@ HTTPInput::HTTPInput(const string &url, Input::Encoding encoding) 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; @@ -76,7 +79,9 @@ 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()) + sock(serialized.sock()), + num_connection_attempts(0), + suppress_logging(false) { pending_data.resize(serialized.pending_data().size()); memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size()); @@ -88,11 +93,20 @@ HTTPInput::HTTPInput(const InputProto &serialized) 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); } + 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() @@ -121,6 +135,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); @@ -247,8 +264,7 @@ bool HTTPInput::parse_response(const string &request) // 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); } @@ -259,13 +275,11 @@ 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 + ")"; } } @@ -276,14 +290,12 @@ bool HTTPInput::parse_response(const string &request) // 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; @@ -341,8 +353,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, "", ""); } { @@ -568,8 +580,8 @@ void HTTPInput::process_data(char *ptr, size_t 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); } return; } @@ -637,20 +649,31 @@ 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) { + { + MutexLock 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); + 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); } - } - for (size_t i = 0; i < stream_indices.size(); ++i) { - servers->add_data(stream_indices[i], inner_data, size, flags); } // Consume the block. This isn't the most efficient way of dealing with things @@ -683,3 +706,35 @@ InputStats HTTPInput::get_stats() const MutexLock 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) { + // Unknown metadata block, ignore. + return; + } + + 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))); + { + MutexLock lock(&stats_mutex); + stats.latency_sec = elapsed; + } +}