Two minor cleanups in the stats code.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index a3a950b03a9876c33fbd1de794e25549eea0b7c9..1bd14dee87c7d022de1bea1d128059f43428aa8c 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -18,6 +18,7 @@
 #include "httpinput.h"
 #include "log.h"
 #include "metacube.h"
+#include "mutexlock.h"
 #include "parse.h"
 #include "serverpool.h"
 #include "state.pb.h"
@@ -34,6 +35,10 @@ HTTPInput::HTTPInput(const string &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;
 }
 
 HTTPInput::HTTPInput(const InputProto &serialized)
@@ -58,6 +63,11 @@ HTTPInput::HTTPInput(const InputProto &serialized)
            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();
 }
 
 void HTTPInput::close_socket()
@@ -79,6 +89,8 @@ InputProto HTTPInput::serialize() const
        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);
        return serialized;
 }
 
@@ -420,6 +432,10 @@ 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.
@@ -458,8 +474,8 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                uint32_t size = ntohl(hdr->size);
                uint32_t flags = ntohl(hdr->flags);
 
-               if (size > 65535) {
-                       log(WARNING, "[%s] Metacube block of %x bytes (flags=%x); corrupted header?",
+               if (size > 262144) {
+                       log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
                                url.c_str(), size, flags);
                }
 
@@ -468,16 +484,26 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        return;
                }
 
-               // Send this block on to the data.
+               // Send this block on to the servers.
+               {
+                       MutexLock lock(&stats_mutex);
+                       stats.data_bytes_received += size;
+               }
                char *inner_data = pending_data.data() + sizeof(metacube_block_header);
                if (flags & METACUBE_FLAGS_HEADER) {
                        string header(inner_data, inner_data + size);
                        for (size_t i = 0; i < stream_indices.size(); ++i) {
                                servers->set_header(stream_indices[i], http_header, header);
                        }
-               } else { 
+               } 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);
+                               servers->add_data(stream_indices[i], inner_data, size, suitable_for_stream_start);
                        }
                }
 
@@ -500,3 +526,8 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
        pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }
 
+InputStats HTTPInput::get_stats() const
+{
+       MutexLock lock(&stats_mutex);
+       return stats;
+}