Tweak the MutexLock implementation slightly, so as to confuse Coverity less.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index f14b0992ce812778d603c3b36c0accc3921b508e..2273e7dd2782535684fa92be5c4b5ad86140d52a 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -11,7 +11,7 @@ class InputProto;
 
 class HTTPInput : public Input {
 public:
-       HTTPInput(const std::string &stream_id, const std::string &url);
+       HTTPInput(const std::string &url);
 
        // Serialization/deserialization.
        HTTPInput(const InputProto &serialized);
@@ -21,6 +21,10 @@ public:
 
        virtual std::string get_url() const { return url; }
 
+       virtual void add_destination(int stream_index);
+
+       virtual InputStats get_stats() const;
+
 private:
        // Actually does the download.
        virtual void do_work();
@@ -48,7 +52,7 @@ private:
        };
        State state;
 
-       std::string stream_id;
+       std::vector<int> stream_indices;
 
        // The URL and its parsed components.
        std::string url;
@@ -65,9 +69,12 @@ private:
        // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
        std::string response;
 
-       // The HTTP respones headers we want to give clients for this input.
+       // The HTTP response headers we want to give clients for this input.
        std::string http_header;
 
+       // The stream heder we want to give clients for this input.
+       std::string stream_header;
+
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 
@@ -76,7 +83,13 @@ private:
        bool has_metacube_header;
 
        // The socket we are downloading on (or -1).
-       int sock;       
+       int sock;
+
+       // Mutex protecting <stats>.
+       mutable pthread_mutex_t stats_mutex;
+
+       // The current statistics for this connection. Protected by <stats_mutex>.
+       InputStats stats;
 };
 
 #endif  // !defined(_HTTPINPUT_H)