X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=5fb55b378610e846f2d74f6074f82f1f95ee58b7;hp=025fd45d84bc9803c75bbfe63dce79df6e34d6c7;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=5b6002ffa927ae9987d978126fa7cc30067ac1f2 diff --git a/httpinput.cpp b/httpinput.cpp index 025fd45..5fb55b3 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -24,6 +24,7 @@ #include "serverpool.h" #include "state.pb.h" #include "stream.h" +#include "timespec.h" #include "util.h" #include "version.h" @@ -31,27 +32,10 @@ using namespace std; extern ServerPool *servers; -namespace { - -// Compute b-a. -timespec clock_diff(const timespec &a, const timespec &b) -{ - timespec ret; - ret.tv_sec = b.tv_sec - a.tv_sec; - ret.tv_nsec = b.tv_nsec - a.tv_nsec; - if (ret.tv_nsec < 0) { - ret.tv_sec--; - ret.tv_nsec += 1000000000; - } - assert(ret.tv_nsec >= 0); - return ret; -} - -} // namespace - -HTTPInput::HTTPInput(const string &url) +HTTPInput::HTTPInput(const string &url, Input::Encoding encoding) : state(NOT_CONNECTED), url(url), + encoding(encoding), has_metacube_header(false), sock(-1) { @@ -65,6 +49,9 @@ HTTPInput::HTTPInput(const string &url) HTTPInput::HTTPInput(const InputProto &serialized) : state(State(serialized.state())), url(serialized.url()), + encoding(serialized.is_metacube_encoded() ? + Input::INPUT_ENCODING_METACUBE : + Input::INPUT_ENCODING_RAW), request(serialized.request()), request_bytes_sent(serialized.request_bytes_sent()), response(serialized.response()), @@ -117,6 +104,12 @@ InputProto HTTPInput::serialize() const serialized.set_bytes_received(stats.bytes_received); serialized.set_data_bytes_received(stats.data_bytes_received); serialized.set_connect_time(stats.connect_time); + if (encoding == Input::INPUT_ENCODING_METACUBE) { + serialized.set_is_metacube_encoded(true); + } else { + assert(encoding == Input::INPUT_ENCODING_RAW); + serialized.set_is_metacube_encoded(false); + } return serialized; } @@ -200,7 +193,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()) { @@ -274,7 +267,7 @@ void HTTPInput::do_work() // TODO: Make the timeout persist across restarts. if (state == SENDING_REQUEST || state == RECEIVING_HEADER || state == RECEIVING_DATA) { - int err = clock_gettime(CLOCK_MONOTONIC, &last_activity); + int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); assert(err != -1); } @@ -284,7 +277,7 @@ void HTTPInput::do_work() static const int timeout_secs = 30; timespec now; - int err = clock_gettime(CLOCK_MONOTONIC, &now); + int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &now); assert(err != -1); timespec elapsed = clock_diff(last_activity, now); @@ -303,7 +296,7 @@ void HTTPInput::do_work() bool activity = wait_for_activity(sock, (state == SENDING_REQUEST) ? POLLOUT : POLLIN, &timeout); if (activity) { - err = clock_gettime(CLOCK_MONOTONIC, &last_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. @@ -328,6 +321,13 @@ void HTTPInput::do_work() 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); @@ -345,7 +345,7 @@ void HTTPInput::do_work() MutexLock lock(&stats_mutex); stats.connect_time = time(NULL); - clock_gettime(CLOCK_MONOTONIC, &last_activity); + clock_gettime(CLOCK_MONOTONIC_COARSE, &last_activity); } break; case SENDING_REQUEST: { @@ -422,8 +422,14 @@ void HTTPInput::do_work() process_data(&extra_data[0], extra_data.size()); } - log(INFO, "[%s] Connected to '%s', receiving data.", - url.c_str(), url.c_str()); + if (encoding == Input::INPUT_ENCODING_RAW) { + log(INFO, "[%s] Connected to '%s', receiving raw data.", + url.c_str(), url.c_str()); + } else { + assert(encoding == Input::INPUT_ENCODING_METACUBE); + log(INFO, "[%s] Connected to '%s', receiving data.", + url.c_str(), url.c_str()); + } state = RECEIVING_DATA; break; } @@ -482,6 +488,15 @@ void HTTPInput::process_data(char *ptr, size_t bytes) 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, SUITABLE_FOR_STREAM_START); + } + return; + } + + assert(encoding == Input::INPUT_ENCODING_METACUBE); + for ( ;; ) { // If we don't have enough data (yet) for even the Metacube header, just return. if (pending_data.size() < sizeof(metacube2_block_header)) { @@ -532,8 +547,8 @@ void HTTPInput::process_data(char *ptr, size_t bytes) has_metacube_header = false; continue; } - if (size > 1048576) { - log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?", + if (size > 10485760) { + log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header??", url.c_str(), size, flags); } @@ -578,7 +593,7 @@ 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 Metacube2 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);