X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=f5c117b6dcbad54ac13ac30e89e861f8c5943130;hp=da721e780c2149c566ada02fc7ca9d1c942f4602;hb=8e10e1f98115c96c841cdc6ef5599beb0b6865b1;hpb=ad7d036afd462810aaa1c8686834fa91b2c4e5ae

diff --git a/server.cpp b/server.cpp
index da721e7..f5c117b 100644
--- a/server.cpp
+++ b/server.cpp
@@ -13,6 +13,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <algorithm>
 
 #include "metacube.h"
 #include "server.h"
@@ -33,8 +34,26 @@ Server::Server()
 
 void Server::run()
 {
-	pthread_t thread;
-	pthread_create(&thread, NULL, Server::do_work_thunk, this);
+	should_stop = false;
+	
+	// Joinable is already the default, but it's good to be certain.
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+	pthread_create(&worker_thread, &attr, Server::do_work_thunk, this);
+}
+
+void Server::stop()
+{
+	{
+		MutexLock lock(&mutex);
+		should_stop = true;
+	}
+
+	if (pthread_join(worker_thread, NULL) == -1) {
+		perror("pthread_join");
+		exit(1);
+	}
 }
 
 void *Server::do_work_thunk(void *arg)
@@ -48,13 +67,17 @@ void Server::do_work()
 {
 	for ( ;; ) {
 		int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
-
-		MutexLock lock(&mutex);  // We release the mutex between iterations.
 		if (nfds == -1) {
 			perror("epoll_wait");
 			exit(1);
 		}
-		
+
+		MutexLock lock(&mutex);  // We release the mutex between iterations.
+	
+		if (should_stop) {
+			return;
+		}
+	
 		for (int i = 0; i < nfds; ++i) {
 			int fd = events[i].data.fd;
 			assert(clients.count(fd) != 0);
@@ -75,7 +98,7 @@ void Server::add_client(int sock)
 	MutexLock lock(&mutex);
 	Client new_client;
 	new_client.sock = sock;
-	new_client.client_request.reserve(1024);
+	new_client.request.reserve(1024);
 	new_client.state = Client::READING_REQUEST;
 	new_client.header_bytes_sent = 0;
 	new_client.bytes_sent = 0;
@@ -150,7 +173,7 @@ void Server::process_client(Client *client)
 		}
 
 		// Guard against overlong requests gobbling up all of our space.
-		if (client->client_request.size() + ret > MAX_CLIENT_REQUEST) {
+		if (client->request.size() + ret > MAX_CLIENT_REQUEST) {
 			fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
 			close_client(client);
 			return;
@@ -158,19 +181,19 @@ void Server::process_client(Client *client)
 
 		// See if we have \r\n\r\n anywhere in the request. We start three bytes
 		// before what we just appended, in case we just got the final character.
-		size_t existing_req_bytes = client->client_request.size();
-		client->client_request.append(string(buf, buf + ret));
+		size_t existing_req_bytes = client->request.size();
+		client->request.append(string(buf, buf + ret));
 	
 		size_t start_at = (existing_req_bytes >= 3 ? existing_req_bytes - 3 : 0);
 		const char *ptr = reinterpret_cast<char *>(
-			memmem(client->client_request.data() + start_at, client->client_request.size() - start_at,
+			memmem(client->request.data() + start_at, client->request.size() - start_at,
 			       "\r\n\r\n", 4));
 		if (ptr == NULL) {
 			// OK, we don't have the entire header yet. Fine; we'll get it later.
 			return;
 		}
 
-		if (ptr != client->client_request.data() + client->client_request.size() - 4) {
+		if (ptr != client->request.data() + client->request.size() - 4) {
 			fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
 			close_client(client);
 			return;
@@ -251,7 +274,6 @@ void Server::process_client(Client *client)
 		break;
 	}
 	default:
-		// TODO
 		assert(false);
 	}
 }
@@ -260,9 +282,10 @@ void Server::parse_request(Client *client)
 {
 	// TODO: Actually parse the request. :-)
 	client->stream_id = "stream";
+	client->request.clear();
 
 	// Construct the header.
-	client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+	client->header = "HTTP/1.0 200 OK\r\n  Content-type: video/x-flv\r\nCache-Control: no-cache\r\nContent-type: todo/fixme\r\n\r\n" +
 		streams[client->stream_id].header;
 
 	// Switch states.
@@ -284,6 +307,11 @@ void Server::close_client(Client *client)
 		perror("epoll_ctl(EPOLL_CTL_DEL)");
 		exit(1);
 	}
+
+	// This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
+	vector<int>::iterator new_end =
+		remove(sleeping_clients.begin(), sleeping_clients.end(), client->sock);
+	sleeping_clients.erase(new_end, sleeping_clients.end());
 	
 	// Bye-bye!
 	close(client->sock);