X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=49889f2e28bec81da0e90a51ab43ad8978f3e0c7;hp=9f5e42e6a23b0f5cff0c37b3fecaded17b13b522;hb=97bdb597d4847308ce9d6982505b56a3a09e930b;hpb=418ca367be670db5377ca99462906eb9c73d296b

diff --git a/cubemap.cpp b/cubemap.cpp
index 9f5e42e..49889f2 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -7,131 +7,48 @@
 #include <sys/socket.h>
 #include <pthread.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/epoll.h>
 #include <errno.h>
 #include <vector>
 #include <string>
 #include <map>
+
 #include "metacube.h"
+#include "server.h"
 
 #define NUM_SERVERS 4
 #define STREAM_ID "stream"
 #define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-#define BACKLOG_SIZE 1048576
 #define PORT 9094
 
 using namespace std;
 
-// Locks a pthread mutex, RAII-style.
-class MutexLock {
-public:
-	MutexLock(pthread_mutex_t *mutex);
-	~MutexLock();
-
-private:
-	pthread_mutex_t *mutex;
-};
-	
-MutexLock::MutexLock(pthread_mutex_t *mutex)
-	: mutex(mutex)
-{
-	pthread_mutex_lock(mutex);
-}
-
-MutexLock::~MutexLock()
-{
-	pthread_mutex_unlock(mutex);
-}
-
-struct Client {
-	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA };
-	State state;
-
-	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
-	// this might not be finished.
-	string client_request;
-
-#if 0
-	// What stream we're connecting to; parsed from client_request.
-	// Not relevant for READING_REQUEST.
-	string stream_id;
-#endif
-
-	// Number of bytes we've sent of the header. Only relevant for SENDING_HEADER.
-	size_t header_bytes_sent;
-
-	// Number of bytes we've sent of data. Only relevant for SENDING_DATA.
-	size_t bytes_sent;
-};
-
-struct Stream {
-	// The HTTP response header, plus the video stream header (if any).
-	string header;
-
-	// The stream data itself, stored in a circular buffer.
-	char data[BACKLOG_SIZE];
-
-	// How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
-	// since the buffer wraps.
-	size_t data_size;
-};
+Server *servers = NULL;
 
-class Server {
+class Input {
 public:
-	Server();
+	Input(const string &stream_id);
 
-	// Start a new thread that handles clients.
-	void run();
-	void add_socket(int server_sock);
-	void add_stream(const string &stream_id);
-	void set_header(const string &stream_id, const string &header);
-	void add_data(const string &stream_id, const char *data, size_t bytes);
+	// Connect to the given URL and start streaming.
+	// WARNING: Currently this blocks; it does not run in a separate thread!
+	void run(const string &url);
 
 private:
-	pthread_mutex_t mutex;
-	map<string, Stream> streams;
-
-	// Recover the this pointer, and call do_work().
-	static void *do_work_thunk(void *arg);
-
-	// The actual worker thread.
-	void do_work();
-};
-
-Server::Server()
-{
-	pthread_mutex_init(&mutex, NULL);
-}
-
-void Server::run()
-{
-	pthread_t thread;
-	pthread_create(&thread, NULL, Server::do_work_thunk, this);
-}
-
-void *Server::do_work_thunk(void *arg)
-{
-	Server *server = static_cast<Server *>(arg);
-	server->do_work();
-	return NULL;
-}
-
-void Server::do_work()
-{
-	for ( ;; ) {
-		printf("server thread running\n");
-		sleep(1);
-	}
-}
+	// Recovers the this pointer and calls curl_callback().
+	static size_t curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata);
 
-class Input {
-public:
-	Input();
+	// Stores the given data, looks for Metacube blocks (skipping data if needed),
+	// and calls process_block() for each one.
 	void curl_callback(char *ptr, size_t bytes);
-
-private:
 	void process_block(const char *data, uint32_t size, uint32_t flags);
+
+	// Drops <num_bytes> bytes from the head of <pending_data>,
+	// and outputs a warning.
 	void drop_pending_data(size_t num_bytes);
 
+	string stream_id;
+
 	// Data we have received but not fully processed yet.
 	vector<char> pending_data;
 
@@ -140,9 +57,27 @@ private:
 	bool has_metacube_header;
 };
 
-Input::Input()
-	: has_metacube_header(false)
+Input::Input(const string &stream_id)
+	: stream_id(stream_id),
+	  has_metacube_header(false)
+{
+}
+
+void Input::run(const string &url)
+{
+	CURL *curl = curl_easy_init();
+	curl_easy_setopt(curl, CURLOPT_URL, STREAM_URL);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &Input::curl_callback_thunk);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+	curl_easy_perform(curl);
+}
+
+size_t Input::curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata)
 {
+	Input *input = static_cast<Input *>(userdata);
+	size_t bytes = size * nmemb;
+	input->curl_callback(ptr, bytes);	
+	return bytes;
 }
 	
 void Input::curl_callback(char *ptr, size_t bytes)
@@ -201,9 +136,17 @@ void Input::curl_callback(char *ptr, size_t bytes)
 }
 		
 void Input::process_block(const char *data, uint32_t size, uint32_t flags)
-{
-	// TODO: treat it right here
-	printf("Block: %d bytes, flags=0x%x\n", size, flags);
+{	
+	if (flags & METACUBE_FLAGS_HEADER) {
+		string header(data, data + size);
+		for (int i = 0; i < NUM_SERVERS; ++i) {
+			servers[i].set_header(stream_id, header);
+		}
+	} else { 
+		for (int i = 0; i < NUM_SERVERS; ++i) {
+			servers[i].add_data(stream_id, data, size);
+		}
+	}
 }
 
 void Input::drop_pending_data(size_t num_bytes)
@@ -216,14 +159,6 @@ void Input::drop_pending_data(size_t num_bytes)
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }
 
-size_t curl_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
-{
-	Input *input = static_cast<Input *>(userdata);
-	size_t bytes = size * nmemb;
-	input->curl_callback(ptr, bytes);	
-	return bytes;
-}
-
 int create_server_socket(int port)
 {
 	int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
@@ -260,10 +195,12 @@ int create_server_socket(int port)
 void *acceptor_thread_run(void *arg)
 {
 	int server_sock = int(intptr_t(arg));
+	int num_accepted = 0;
 	for ( ;; ) {
 		sockaddr_in6 addr;
 		socklen_t addrlen = sizeof(addr);
 
+		// Get a new socket.
 		int sock = accept(server_sock, reinterpret_cast<sockaddr *>(&addr), &addrlen);
 		if (sock == -1 && errno == EINTR) {
 			continue;
@@ -273,16 +210,24 @@ void *acceptor_thread_run(void *arg)
 			exit(1);
 		}
 
-		printf("got a socket yaaaay\n");
+		// Set the socket as nonblocking.
+		int one = 1;
+		if (ioctl(sock, FIONBIO, &one) == -1) {
+			perror("FIONBIO");
+			exit(1);
+		}
+
+		// Pick a server, round-robin, and hand over the socket to it.
+		servers[num_accepted % NUM_SERVERS].add_client(sock);
+		++num_accepted;	
 	}
 }
 
-Server *servers = NULL;
-
 int main(int argc, char **argv)
 {
 	servers = new Server[NUM_SERVERS];
 	for (int i = 0; i < NUM_SERVERS; ++i) {
+		servers[i].add_stream(STREAM_ID);
 		servers[i].run();
 	}
 
@@ -291,10 +236,6 @@ int main(int argc, char **argv)
 	pthread_t acceptor_thread;
 	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
 
-	Input input;
-	CURL *curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_URL, STREAM_URL);
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &input);
-	curl_easy_perform(curl);
+	Input input(STREAM_ID);
+	input.run(STREAM_URL);
 }