Factor all the common thread starting/stopping into a common Thread class.

[cubemap] / input.h

diff --git a/input.h b/input.h
index 8a26ce6d1baad5887fe2b7831618c0fb0304ef9c..14537c85c6010900b8cb6c096cd8f48606ac648b 100644 (file)
--- a/input.h
+++ b/input.h
@@ -4,26 +4,30 @@
 #include <vector>
 #include <string>
 
-class Input {
+#include "thread.h"
+
+class InputProto;
+
+class Input : public Thread {
 public:
        Input(const std::string &stream_id, const std::string &url);
 
-       // Connect to the given URL and start streaming.
-       void run();
+       // Serialization/deserialization.
+       Input(const InputProto &serialized);
+       InputProto serialize() const;
 
-       // Stops the streaming, but lets the file descriptor stay open.
-       void stop();
+       std::string get_url() const { return url; }
 
 private:
-       // Recovers the this pointer and calls do_work().
-       static void *do_work_thunk(void *arg);
-
        // Actually does the download.
-       void do_work();
+       virtual 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);
 
+       // Parses a HTTP response. Returns false if it not a 200.
+       bool parse_response(const std::string &response);
+
        // 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);
@@ -58,6 +62,9 @@ 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.
+       std::string http_header;
+
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 
@@ -67,12 +74,6 @@ private:
 
        // The socket we are downloading on (or -1).
        int sock;       
-
-       // Handle to the thread that actually does the download.
-       pthread_t worker_thread;
-
-       // Whether we should stop or not.
-       volatile bool should_stop;
 };
 
 #endif  // !defined(_INPUT_H)