Fix an issue where access.log would have the wrong timestamp.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 025fd45d84bc9803c75bbfe63dce79df6e34d6c7..50a975cfece1fa70f9535b553fc6c7f322571579 100644 (file)
--- 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,24 +32,6 @@ 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)
        : state(NOT_CONNECTED),
          url(url),
@@ -200,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<string> lines = split_lines(response);
        if (lines.empty()) {
@@ -274,7 +257,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 +267,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 +286,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 +311,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 +335,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: {
@@ -532,8 +522,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 +568,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);