X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=50a975cfece1fa70f9535b553fc6c7f322571579;hp=49501831fa7df2805eead2a172b5dab5d77a3320;hb=b1b81d8f5492e48a60f0ed2930a098747928e5c4;hpb=5cd46e39b4063d94f6dc559ae350beeb8406a8f9 diff --git a/httpinput.cpp b/httpinput.cpp index 4950183..50a975c 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include #include #include @@ -16,22 +18,31 @@ #include "httpinput.h" #include "log.h" -#include "metacube.h" +#include "metacube2.h" +#include "mutexlock.h" #include "parse.h" #include "serverpool.h" #include "state.pb.h" +#include "stream.h" +#include "timespec.h" +#include "util.h" #include "version.h" using namespace std; extern ServerPool *servers; - + HTTPInput::HTTPInput(const string &url) : state(NOT_CONNECTED), url(url), has_metacube_header(false), sock(-1) { + pthread_mutex_init(&stats_mutex, NULL); + stats.url = url; + stats.bytes_received = 0; + stats.data_bytes_received = 0; + stats.connect_time = -1; } HTTPInput::HTTPInput(const InputProto &serialized) @@ -41,33 +52,36 @@ HTTPInput::HTTPInput(const InputProto &serialized) request_bytes_sent(serialized.request_bytes_sent()), response(serialized.response()), http_header(serialized.http_header()), + stream_header(serialized.stream_header()), has_metacube_header(serialized.has_metacube_header()), sock(serialized.sock()) { pending_data.resize(serialized.pending_data().size()); memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size()); - string protocol; - parse_url(url, &protocol, &host, &port, &path); // Don't care if it fails. + string protocol, user; + parse_url(url, &protocol, &user, &host, &port, &path); // Don't care if it fails. - // Older versions stored the extra \r\n in the HTTP header. - // Strip it if we find it. - if (http_header.size() >= 4 && - memcmp(http_header.data() + http_header.size() - 4, "\r\n\r\n", 4) == 0) { - http_header.resize(http_header.size() - 2); + pthread_mutex_init(&stats_mutex, NULL); + stats.url = url; + stats.bytes_received = serialized.bytes_received(); + stats.data_bytes_received = serialized.data_bytes_received(); + if (serialized.has_connect_time()) { + stats.connect_time = serialized.connect_time(); + } else { + stats.connect_time = time(NULL); } } void HTTPInput::close_socket() { - int ret; - do { - ret = close(sock); - } while (ret == -1 && errno == EINTR); - - if (ret == -1) { - log_perror("close()"); + if (sock != -1) { + safe_close(sock); + sock = -1; } + + MutexLock lock(&stats_mutex); + stats.connect_time = -1; } InputProto HTTPInput::serialize() const @@ -79,9 +93,13 @@ InputProto HTTPInput::serialize() const serialized.set_request_bytes_sent(request_bytes_sent); serialized.set_response(response); serialized.set_http_header(http_header); + serialized.set_stream_header(stream_header); serialized.set_pending_data(string(pending_data.begin(), pending_data.end())); serialized.set_has_metacube_header(has_metacube_header); serialized.set_sock(sock); + serialized.set_bytes_received(stats.bytes_received); + serialized.set_data_bytes_received(stats.data_bytes_received); + serialized.set_connect_time(stats.connect_time); return serialized; } @@ -89,42 +107,73 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) { addrinfo *ai; int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai); - if (err == -1) { + if (err != 0) { log(WARNING, "[%s] Lookup of '%s' failed (%s).", url.c_str(), host.c_str(), gai_strerror(err)); - freeaddrinfo(ai); return -1; } addrinfo *base_ai = ai; // Connect to everything in turn until we have a socket. - while (ai && !should_stop) { + for ( ; ai && !should_stop(); ai = ai->ai_next) { int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP); if (sock == -1) { // Could be e.g. EPROTONOSUPPORT. The show must go on. continue; } + // Now do a non-blocking connect. This is important because we want to be able to be + // woken up, even though it's rather cumbersome. + + // Set the socket as nonblocking. + int one = 1; + if (ioctl(sock, FIONBIO, &one) == -1) { + log_perror("ioctl(FIONBIO)"); + safe_close(sock); + return -1; + } + + // Do a non-blocking connect. do { err = connect(sock, ai->ai_addr, ai->ai_addrlen); } while (err == -1 && errno == EINTR); - if (err != -1) { - freeaddrinfo(base_ai); - return sock; + if (err == -1 && errno != EINPROGRESS) { + log_perror("connect"); + safe_close(sock); + continue; } - do { - err = close(sock); - } while (err == -1 && errno == EINTR); + // Wait for the connect to complete, or an error to happen. + for ( ;; ) { + bool complete = wait_for_activity(sock, POLLIN | POLLOUT, NULL); + if (should_stop()) { + safe_close(sock); + return -1; + } + if (complete) { + break; + } + } - if (err == -1) { - log_perror("close"); - // Can still continue. + // Check whether it ended in an error or not. + socklen_t err_size = sizeof(err); + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &err_size) == -1) { + log_perror("getsockopt"); + safe_close(sock); + continue; } - ai = ai->ai_next; + errno = err; + + if (err == 0) { + // Successful connect. + freeaddrinfo(base_ai); + return sock; + } + + safe_close(sock); } // Give the last one as error. @@ -134,7 +183,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) return -1; } -bool HTTPInput::parse_response(const std::string &request) +bool HTTPInput::parse_response(const string &request) { vector lines = split_lines(response); if (lines.empty()) { @@ -156,31 +205,14 @@ bool HTTPInput::parse_response(const std::string &request) return false; } - multimap parameters; - for (size_t i = 1; i < lines.size(); ++i) { - size_t split = lines[i].find(":"); - if (split == string::npos) { - log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'", - url.c_str(), lines[i].c_str()); - continue; - } - - string key(lines[i].begin(), lines[i].begin() + split); + multimap parameters = extract_headers(lines, url); - // Skip any spaces after the colon. - do { - ++split; - } while (split < lines[i].size() && lines[i][split] == ' '); - - string value(lines[i].begin() + split, lines[i].end()); - - // Remove “Content-encoding: metacube”. - // TODO: Make case-insensitive. - if (key == "Content-encoding" && value == "metacube") { - continue; - } - - parameters.insert(make_pair(key, value)); + // Remove “Content-encoding: metacube”. + // TODO: Make case-insensitive. + multimap::iterator 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)” @@ -212,8 +244,8 @@ bool HTTPInput::parse_response(const std::string &request) http_header.append(it->first + ": " + it->second + "\r\n"); } - for (size_t i = 0; i < stream_ids.size(); ++i) { - servers->set_header(stream_ids[i], http_header, ""); + for (size_t i = 0; i < stream_indices.size(); ++i) { + servers->set_header(stream_indices[i], http_header, stream_header); } return true; @@ -221,22 +253,44 @@ bool HTTPInput::parse_response(const std::string &request) void HTTPInput::do_work() { - while (!should_stop) { + timespec last_activity; + + // TODO: Make the timeout persist across restarts. + if (state == SENDING_REQUEST || state == RECEIVING_HEADER || state == RECEIVING_DATA) { + int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); + assert(err != -1); + } + + while (!should_stop()) { if (state == SENDING_REQUEST || state == RECEIVING_HEADER || state == RECEIVING_DATA) { - // Since we are non-blocking, we need to wait for the right state first. - // Wait up to 50 ms, then check should_stop. - pollfd pfd; - pfd.fd = sock; - pfd.events = (state == SENDING_REQUEST) ? POLLOUT : POLLIN; - pfd.events |= POLLRDHUP; - - int nfds = poll(&pfd, 1, 50); - if (nfds == 0 || (nfds == -1 && errno == EINTR)) { + // Give the socket 30 seconds since last activity before we time out. + static const int timeout_secs = 30; + + timespec now; + int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &now); + assert(err != -1); + + timespec elapsed = clock_diff(last_activity, now); + if (elapsed.tv_sec >= timeout_secs) { + // Timeout! + log(ERROR, "[%s] Timeout after %d seconds, closing.", url.c_str(), elapsed.tv_sec); + state = CLOSING_SOCKET; continue; } - if (nfds == -1) { - log_perror("poll"); - state = CLOSING_SOCKET; + + // Basically calculate (30 - (now - last_activity)) = (30 + (last_activity - now)). + // Add a second of slack to account for differences between clocks. + timespec timeout = clock_diff(now, last_activity); + timeout.tv_sec += timeout_secs + 1; + assert(timeout.tv_sec > 0 || (timeout.tv_sec >= 0 && timeout.tv_nsec > 0)); + + bool activity = wait_for_activity(sock, (state == SENDING_REQUEST) ? POLLOUT : POLLIN, &timeout); + if (activity) { + err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); + assert(err != -1); + } else { + // OK. Most likely, should_stop was set, or we have timed out. + continue; } } @@ -246,16 +300,24 @@ void HTTPInput::do_work() request_bytes_sent = 0; response.clear(); pending_data.clear(); - for (size_t i = 0; i < stream_ids.size(); ++i) { - servers->set_header(stream_ids[i], "", ""); + has_metacube_header = false; + for (size_t i = 0; i < stream_indices.size(); ++i) { + servers->set_header(stream_indices[i], "", ""); } { - string protocol; // Thrown away. - if (!parse_url(url, &protocol, &host, &port, &path)) { + string protocol, user; // Thrown away. + if (!parse_url(url, &protocol, &user, &host, &port, &path)) { log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str()); break; } + + // Remove the brackets around IPv6 address literals. + // TODO: See if we can join this with the code in parse_ip_address(), + // or maybe even more it into parse_url(). + if (!host.empty() && host[0] == '[' && host[host.size() - 1] == ']') { + host = host.substr(1, host.size() - 2); + } } sock = lookup_and_connect(host, port); @@ -270,6 +332,10 @@ void HTTPInput::do_work() request = "GET " + path + " HTTP/1.0\r\nUser-Agent: cubemap\r\n\r\n"; request_bytes_sent = 0; } + + MutexLock lock(&stats_mutex); + stats.connect_time = time(NULL); + clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); } break; case SENDING_REQUEST: { @@ -319,7 +385,7 @@ void HTTPInput::do_work() RequestParseStatus status = wait_for_double_newline(&response, buf, ret); if (status == RP_OUT_OF_SPACE) { - log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str()); + log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str()); state = CLOSING_SOCKET; continue; } else if (status == RP_NOT_FINISHED_YET) { @@ -333,7 +399,7 @@ void HTTPInput::do_work() char *ptr = static_cast( memmem(response.data(), response.size(), "\r\n\r\n", 4)); assert(ptr != NULL); - extra_data = string(ptr, &response[0] + response.size()); + extra_data = string(ptr + 4, &response[0] + response.size()); response.resize(ptr - response.data()); } @@ -367,7 +433,7 @@ void HTTPInput::do_work() if (ret == 0) { // This really shouldn't happen... - log(ERROR, "[%s] Socket unexpectedly closed while reading header", + log(ERROR, "[%s] Socket unexpectedly closed while reading data", url.c_str()); state = CLOSING_SOCKET; continue; @@ -377,15 +443,7 @@ void HTTPInput::do_work() break; } case CLOSING_SOCKET: { - int err; - do { - err = close(sock); - } while (err == -1 && errno == EINTR); - - if (err == -1) { - log_perror("close"); - } - + close_socket(); state = NOT_CONNECTED; break; } @@ -396,9 +454,12 @@ void HTTPInput::do_work() // If we are still in NOT_CONNECTED, either something went wrong, // or the connection just got closed. // The earlier steps have already given the error message, if any. - if (state == NOT_CONNECTED && !should_stop) { + if (state == NOT_CONNECTED && !should_stop()) { log(INFO, "[%s] Waiting 0.2 second and restarting...", url.c_str()); - usleep(200000); + timespec timeout_ts; + timeout_ts.tv_sec = 0; + timeout_ts.tv_nsec = 200000000; + wait_for_wakeup(&timeout_ts); } } } @@ -406,10 +467,14 @@ void HTTPInput::do_work() void HTTPInput::process_data(char *ptr, size_t bytes) { pending_data.insert(pending_data.end(), ptr, ptr + bytes); + { + MutexLock mutex(&stats_mutex); + stats.bytes_received += bytes; + } for ( ;; ) { // If we don't have enough data (yet) for even the Metacube header, just return. - if (pending_data.size() < sizeof(metacube_block_header)) { + if (pending_data.size() < sizeof(metacube2_block_header)) { return; } @@ -418,13 +483,13 @@ void HTTPInput::process_data(char *ptr, size_t bytes) if (!has_metacube_header) { char *ptr = static_cast( memmem(pending_data.data(), pending_data.size(), - METACUBE_SYNC, strlen(METACUBE_SYNC))); + METACUBE2_SYNC, strlen(METACUBE2_SYNC))); if (ptr == NULL) { // 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, // and then give up. - drop_pending_data(pending_data.size() - (strlen(METACUBE_SYNC) - 1)); + drop_pending_data(pending_data.size() - (strlen(METACUBE2_SYNC) - 1)); return; } else { // Yay, we found the header. Drop everything (if anything) before it. @@ -432,40 +497,68 @@ void HTTPInput::process_data(char *ptr, size_t bytes) has_metacube_header = true; // Re-check that we have the entire header; we could have dropped data. - if (pending_data.size() < sizeof(metacube_block_header)) { + if (pending_data.size() < sizeof(metacube2_block_header)) { return; } } } // Now it's safe to read the header. - metacube_block_header *hdr = reinterpret_cast(pending_data.data()); - assert(memcmp(hdr->sync, METACUBE_SYNC, sizeof(hdr->sync)) == 0); - uint32_t size = ntohl(hdr->size); - uint32_t flags = ntohl(hdr->flags); + metacube2_block_header hdr; + memcpy(&hdr, pending_data.data(), sizeof(hdr)); + assert(memcmp(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync)) == 0); + uint32_t size = ntohl(hdr.size); + uint16_t flags = ntohs(hdr.flags); + uint16_t expected_csum = metacube2_compute_crc(&hdr); + + if (expected_csum != ntohs(hdr.csum)) { + log(WARNING, "[%s] Metacube checksum failed (expected 0x%x, got 0x%x), " + "not reading block claiming to be %d bytes (flags=%x).", + url.c_str(), expected_csum, ntohs(hdr.csum), + size, flags); + + // Drop only the first byte, and let the rest of the code handle resync. + pending_data.erase(pending_data.begin(), pending_data.begin() + 1); + has_metacube_header = false; + continue; + } + if (size > 10485760) { + log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header??", + url.c_str(), size, flags); + } // See if we have the entire block. If not, wait for more data. - if (pending_data.size() < sizeof(metacube_block_header) + size) { + if (pending_data.size() < sizeof(metacube2_block_header) + size) { return; } - // Send this block on to the data. - char *inner_data = pending_data.data() + sizeof(metacube_block_header); + // 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) { - string header(inner_data, inner_data + size); - for (size_t i = 0; i < stream_ids.size(); ++i) { - servers->set_header(stream_ids[i], http_header, 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); } - } else { - for (size_t i = 0; i < stream_ids.size(); ++i) { - servers->add_data(stream_ids[i], inner_data, size); + } else { + StreamStartSuitability suitable_for_stream_start; + if (flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) { + suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START; + } else { + suitable_for_stream_start = SUITABLE_FOR_STREAM_START; + } + for (size_t i = 0; i < stream_indices.size(); ++i) { + servers->add_data(stream_indices[i], inner_data, size, suitable_for_stream_start); } } // Consume the block. This isn't the most efficient way of dealing with things // should we have many blocks, but these routines don't need to be too efficient // anyway. - pending_data.erase(pending_data.begin(), pending_data.begin() + sizeof(metacube_block_header) + size); + pending_data.erase(pending_data.begin(), pending_data.begin() + sizeof(metacube2_block_header) + size); has_metacube_header = false; } } @@ -475,8 +568,20 @@ void HTTPInput::drop_pending_data(size_t num_bytes) if (num_bytes == 0) { return; } - log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?", + log(WARNING, "[%s] Dropping %lld junk bytes; not a Metacube2 stream, or data was dropped from the middle of the stream.", url.c_str(), (long long)num_bytes); + assert(pending_data.size() >= num_bytes); pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes); } +void HTTPInput::add_destination(int stream_index) +{ + stream_indices.push_back(stream_index); + servers->set_header(stream_index, http_header, stream_header); +} + +InputStats HTTPInput::get_stats() const +{ + MutexLock lock(&stats_mutex); + return stats; +}