X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=374441c32b30e604ec436f8cd62b8f058ed761d8;hp=025fd45d84bc9803c75bbfe63dce79df6e34d6c7;hb=b757a4a2ce9d24835b52a185134835762af2f50c;hpb=5b6002ffa927ae9987d978126fa7cc30067ac1f2

diff --git a/httpinput.cpp b/httpinput.cpp
index 025fd45..374441c 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -200,7 +200,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 +274,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 +284,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 +303,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.
@@ -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: {
@@ -578,7 +578,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);