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

[cubemap] / input.h

diff --git a/input.h b/input.h
index 8a26ce6d1baad5887fe2b7831618c0fb0304ef9c..a00113da80250100fa7917d0ec5c62d8c93fdf2f 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,78 +1,54 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
-#include <vector>
 #include <string>
 
-class Input {
-public:
-       Input(const std::string &stream_id, const std::string &url);
-
-       // Connect to the given URL and start streaming.
-       void run();
-
-       // Stops the streaming, but lets the file descriptor stay open.
-       void stop();
-
-private:
-       // Recovers the this pointer and calls do_work().
-       static void *do_work_thunk(void *arg);
-
-       // Actually does the download.
-       void do_work();
-       
-       // Open a socket that connects to the given host and port. Does DNS resolving.
-       int lookup_and_connect(const std::string &host, const std::string &port);
-
-       // Stores the given data, looks for Metacube blocks (skipping data if needed),
-       // and calls process_block() for each one.
-       void process_data(char *ptr, size_t bytes);
+#include "thread.h"
 
-       // Drops <num_bytes> bytes from the head of <pending_data>,
-       // and outputs a warning.
-       void drop_pending_data(size_t num_bytes);
+class Input;
+class InputProto;
 
-       enum State {
-               NOT_CONNECTED,
-               SENDING_REQUEST,
-               RECEIVING_HEADER,
-               RECEIVING_DATA,
-               CLOSING_SOCKET,  // Due to error.
-       };
-       State state;
+// Extremely rudimentary URL parsing.
+bool parse_url(const std::string &url, std::string *protocol, std::string *host, std::string *port, std::string *path);
 
-       std::string stream_id;
+// Figure out the right type of input based on the URL, and create a new Input of the right type.
+// Will return NULL if unknown.
+Input *create_input(const std::string &url);
+Input *create_input(const InputProto &serialized);
 
-       // The URL and its parsed components.
+// Digested statistics for writing to logs etc.
+struct InputStats {
        std::string url;
-       std::string host, port, path;
 
-       // The HTTP request, with headers and all.
-       // Only relevant for SENDING_REQUEST.
-       std::string request;
+       // The number of bytes we have received so far, including any Metacube headers.
+       //
+       // Not reset across connections.
+       size_t bytes_received;
 
-       // How many bytes we've sent of the request so far.
-       // Only relevant for SENDING_REQUEST.
-       size_t request_bytes_sent;
+       // The number of data bytes we have received so far (or more precisely,
+       // number of data bytes we have sent on to the stream). This excludes Metacube
+       // headers and corrupted data we've skipped.
+       //
+       // Not reset across connections.
+       size_t data_bytes_received;
 
-       // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
-       std::string response;
+       // When the current connection was initiated. -1 if we are not currently connected.
+       time_t connect_time;
 
-       // Data we have received but not fully processed yet.
-       std::vector<char> pending_data;
-
-       // If <pending_data> starts with a Metacube header,
-       // this is true.
-       bool has_metacube_header;
-
-       // The socket we are downloading on (or -1).
-       int sock;       
-
-       // Handle to the thread that actually does the download.
-       pthread_t worker_thread;
+       // TODO: Number of loss events might both be useful,
+       // similar to for clients. Also, per-connection byte counters.
+};
 
-       // Whether we should stop or not.
-       volatile bool should_stop;
+class Input : public Thread {
+public:
+       virtual ~Input();
+       virtual InputProto serialize() const = 0;
+       virtual std::string get_url() const = 0;
+       virtual void close_socket() = 0;
+       virtual void add_destination(int stream_index) = 0;
+
+       // Note: May be called from a different thread, so must be thread-safe.
+       virtual InputStats get_stats() const = 0;
 };
 
 #endif  // !defined(_INPUT_H)