X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=643f1a8b0b6c7a0e1bc274a47ae65ebf7e18df76;hp=2bccac39f12a38e546ddc1189bd207dd425d85ab;hb=2bd0c02ac79dc8bc0da62b27d6b1e9f3cea525c6;hpb=c56b0e2487bff246cb90a67c714a5a8b3ad11695

diff --git a/cubemap.cpp b/cubemap.cpp
index 2bccac3..643f1a8 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -5,6 +5,11 @@
 #include <arpa/inet.h>
 #include <curl/curl.h>
 #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>
@@ -14,9 +19,31 @@
 #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;
@@ -52,24 +79,127 @@ struct Stream {
 
 class Server {
 public:
-	void add_socket(int server_sock);
+	Server();
+
+	// Start a new thread that handles clients.
+	void run();
+	void add_client(int 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);
 
 private:
+	pthread_mutex_t mutex;
+
+	// Map from stream ID to stream.
 	map<string, Stream> streams;
+
+	// Map from file descriptor to client.
+	map<int, Client> clients;
+
+	int epoll_fd;
+
+	// Recover the this pointer, and call do_work().
+	static void *do_work_thunk(void *arg);
+
+	// The actual worker thread.
+	void do_work();
 };
 
+Server *servers = NULL;
+
+Server::Server()
+{
+	pthread_mutex_init(&mutex, NULL);
+
+	epoll_fd = epoll_create(1024);  // Size argument is ignored.
+	if (epoll_fd == -1) {
+		perror("epoll_fd");
+		exit(1);
+	}
+}
+
+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 ( ;; ) {
+		MutexLock lock(&mutex);
+		printf("server thread running\n");
+		sleep(1);
+	}
+}
+	
+void Server::add_client(int sock)
+{
+	MutexLock lock(&mutex);
+	Client new_client;
+	new_client.state = Client::READING_REQUEST;
+	new_client.header_bytes_sent = 0;
+	new_client.bytes_sent = 0;
+
+	clients.insert(make_pair(sock, new_client));
+
+	// Start listening on data from this socket.
+	epoll_event ev;
+	ev.events = EPOLLIN;
+	ev.data.fd = sock;
+	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
+		perror("epoll_ctl(EPOLL_CTL_ADD)");
+		exit(1);
+	}
+}
+	
+void Server::add_stream(const string &stream_id)
+{
+	// TODO
+}
+	
+void Server::set_header(const string &stream_id, const string &header)
+{
+	// TODO
+	printf("got header! %lu bytes\n", header.size());
+}
+	
+void Server::add_data(const string &stream_id, const char *data, size_t bytes)
+{
+	// TODO
+}
+
 class Input {
 public:
-	Input();
-	void curl_callback(char *ptr, size_t bytes);
+	Input(const string &stream_id);
+
+	// 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:
+	// Recovers the this pointer and calls curl_callback().
+	static size_t curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata);
+
+	// 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);
 	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;
 
@@ -78,9 +208,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)
@@ -139,11 +287,19 @@ 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)
 {
 	if (num_bytes == 0) {
@@ -154,21 +310,83 @@ 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)
+int create_server_socket(int port)
 {
-	Input *input = static_cast<Input *>(userdata);
-	size_t bytes = size * nmemb;
-	input->curl_callback(ptr, bytes);	
-	return bytes;
+	int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+	if (server_sock == -1) {
+		perror("socket");
+		exit(1);
+	}
+
+	// We want dual-stack sockets. (Sorry, OpenBSD and Windows XP...)
+	int zero = 0;
+	if (setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) == -1) {
+		perror("setsockopt(IPV6_V6ONLY)");
+		exit(1);
+	}
+
+	sockaddr_in6 addr;
+	memset(&addr, 0, sizeof(addr));
+	addr.sin6_family = AF_INET6;
+	addr.sin6_port = htons(port);
+
+	if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {
+		perror("bind");
+		exit(1);
+	}
+
+	if (listen(server_sock, 128) == -1) {
+		perror("listen");
+		exit(1);
+	}
+
+	return server_sock;
+}
+
+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;
+		}
+		if (sock == -1) {
+			perror("accept");
+			exit(1);
+		}
+
+		// 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;	
+	}
 }
 
 int main(int argc, char **argv)
 {
-	Input input;
-	CURL *curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_URL, "http://gruessi.zrh.sesse.net:4013/");
-	// curl_easy_setopt(curl, CURLOPT_URL, "http://www.google.com/");
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &input);
-	curl_easy_perform(curl);
+	servers = new Server[NUM_SERVERS];
+	for (int i = 0; i < NUM_SERVERS; ++i) {
+		servers[i].add_stream(STREAM_ID);
+		servers[i].run();
+	}
+
+	int server_sock = create_server_socket(PORT);
+
+	pthread_t acceptor_thread;
+	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
+
+	Input input(STREAM_ID);
+	input.run(STREAM_URL);
 }