X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.h;h=1cea2f541f31aabe027f4b4ce41f5ef20cf64c14;hp=8b536c47f32d644e4c7e195b12420c5bbc26a201;hb=70c47a998c5aa2eb536c3c8f71f3178cd217a14d;hpb=e20ad47985bdda71b7b58c26932dad9a3a50c066;ds=sidebyside

diff --git a/input.h b/input.h
index 8b536c4..1cea2f5 100644
--- a/input.h
+++ b/input.h
@@ -1,86 +1,56 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
-#include <vector>
+#include <stddef.h>
+#include <time.h>
 #include <string>
 
-class InputProto;
-
-class Input {
-public:
-	Input(const std::string &stream_id, const std::string &url);
-
-	// Serialization/deserialization.
-	Input(const InputProto &serialized);
-	InputProto serialize() const;
-
-	// Connect to the given URL and start streaming.
-	void run();
-
-	// 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);
+#include "thread.h"
 
-	// 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);
-
-	// 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 *user, 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;
 
-	// How many bytes we've sent of the request so far.
-	// Only relevant for SENDING_REQUEST.
-	size_t request_bytes_sent;
+	// The number of bytes we have received so far, including any Metacube headers.
+	//
+	// Not reset across connections.
+	size_t bytes_received;
 
-	// The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
-	std::string response;
+	// 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;
 
-	// Data we have received but not fully processed yet.
-	std::vector<char> pending_data;
+	// When the current connection was initiated. -1 if we are not currently connected.
+	time_t connect_time;
 
-	// 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)