X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=715e31c4a162f8d9ce168969901ae3ca4253a8c9;hp=5b74319d71f77645c99b45452b0a677298316901;hb=7ec54788f88dde7b083ba6cfd30732b32295b54a;hpb=a0fe013448d188b324c00383cfd91695d9d3d076 diff --git a/httpinput.cpp b/httpinput.cpp index 5b74319..715e31c 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -20,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" @@ -49,22 +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, nullptr); 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 +71,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 +79,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, nullptr); stats.url = url; stats.bytes_received = serialized.bytes_received(); stats.data_bytes_received = serialized.data_bytes_received(); @@ -116,7 +105,7 @@ void HTTPInput::close_socket() sock = -1; } - MutexLock lock(&stats_mutex); + lock_guard lock(stats_mutex); stats.connect_time = -1; } @@ -178,6 +167,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) if (ioctl(sock, FIONBIO, &one) == -1) { log_perror("ioctl(FIONBIO)"); safe_close(sock); + freeaddrinfo(base_ai); return -1; } @@ -260,17 +250,15 @@ bool HTTPInput::parse_response(const string &request) return false; } - multimap parameters = extract_headers(lines, url); + HTTPHeaderMultimap parameters = extract_headers(lines, url); // Remove “Content-encoding: metacube”. - // TODO: Make case-insensitive. - const auto 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); } // Change “Server: foo” to “Server: metacube/0.1 (reflecting: foo)” - // TODO: Make case-insensitive. // XXX: Use a Via: instead? if (parameters.count("Server") == 0) { parameters.insert(make_pair("Server", SERVER_IDENTIFICATION)); @@ -283,10 +271,8 @@ bool HTTPInput::parse_response(const string &request) } } - // Set “Connection: close”. - // TODO: Make case-insensitive. + // Erase “Connection: close”; we'll set it on the sending side if needed. parameters.erase("Connection"); - parameters.insert(make_pair("Connection", "close")); // Construct the new HTTP header. http_header = "HTTP/1.0 200 OK\r\n"; @@ -354,7 +340,8 @@ void HTTPInput::do_work() pending_data.clear(); has_metacube_header = false; for (int stream_index : stream_indices) { - servers->set_header(stream_index, "", ""); + // Don't zero out the header; it might still be of use to HLS clients. + servers->set_unavailable(stream_index); } { @@ -405,7 +392,7 @@ void HTTPInput::do_work() request_bytes_sent = 0; } - MutexLock lock(&stats_mutex); + lock_guard lock(stats_mutex); stats.connect_time = time(nullptr); clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); } @@ -575,13 +562,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 (int stream_index : stream_indices) { - servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0); + servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0, /*pts=*/RationalPTS()); } return; } @@ -654,14 +641,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 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 lock(stats_mutex); stats.data_bytes_received += size; } char *inner_data = pending_data.data() + sizeof(metacube2_block_header); @@ -672,8 +659,9 @@ void HTTPInput::process_data(char *ptr, size_t bytes) } } for (int stream_index : stream_indices) { - servers->add_data(stream_index, inner_data, size, flags); + 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 @@ -703,7 +691,7 @@ void HTTPInput::add_destination(int stream_index) InputStats HTTPInput::get_stats() const { - MutexLock lock(&stats_mutex); + lock_guard lock(stats_mutex); return stats; } @@ -716,25 +704,36 @@ void HTTPInput::process_metacube_metadata_block(const metacube2_block_header &hd } 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); + 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; + } - 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); + 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; } - - 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; - } }