Use C++11 std::mutex and std::lock_guard instead of our RAII wrapper.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index 6b0c87512dffee116dea7c86c89404a5e0090e56..31819f947ec54f4e225e95609e6fb86562867898 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,18 +1,19 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <pthread.h>
 #include <stddef.h>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "input.h"
+#include "metacube2.h"
 
 class InputProto;
 
 class HTTPInput : public Input {
 public:
-       HTTPInput(const std::string &url);
+       HTTPInput(const std::string &url, Input::Encoding encoding);
 
        // Serialization/deserialization.
        HTTPInput(const InputProto &serialized);
@@ -44,6 +45,8 @@ private:
        // and outputs a warning.
        void drop_pending_data(size_t num_bytes);
 
+       void process_metacube_metadata_block(const metacube2_block_header &hdr, const char *payload, uint32_t payload_size);
+
        enum State {
                NOT_CONNECTED,
                SENDING_REQUEST,
@@ -59,6 +62,9 @@ private:
        std::string url;
        std::string host, port, path;
 
+       // What the input stream is to be interpreted as (normally Metacube).
+       Input::Encoding encoding;
+
        // The HTTP request, with headers and all.
        // Only relevant for SENDING_REQUEST.
        std::string request;
@@ -81,16 +87,27 @@ private:
 
        // If <pending_data> starts with a Metacube header,
        // this is true.
-       bool has_metacube_header;
+       bool has_metacube_header = false;
 
        // The socket we are downloading on (or -1).
-       int sock;
+       int sock = -1;
 
        // Mutex protecting <stats>.
-       mutable pthread_mutex_t stats_mutex;
+       mutable std::mutex stats_mutex;
 
        // The current statistics for this connection. Protected by <stats_mutex>.
        InputStats stats;
+
+       // Number of (started) connection attempts since last data byte was successfully read.
+       unsigned num_connection_attempts = 0;
+
+       // If set, don't log anything related to connections.
+       // (Only set if we've had enough unsuccessful connection attempts.)
+       bool suppress_logging = false;
+
+       // Last time we made a connection with logging enabled.
+       // (Initially at some point before the epoch.)
+       timespec last_verbose_connection { -3600, 0 };
 };
 
 #endif  // !defined(_HTTPINPUT_H)