X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=d894bd14d0a85d05783366fb60f0394fcf7c86dc;hp=9b91e0371254e67044a8138424334a21aea4b88c;hb=5812a7b5bb19068cff68c2946aa67a2a132717c7;hpb=528865024d7fdb484b2903e2205b8d00fb0550ef

diff --git a/server.cpp b/server.cpp
index 9b91e03..d894bd1 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"
@@ -107,6 +108,10 @@ void Server::set_header(const string &stream_id, const string &header)
 	
 void Server::add_data(const string &stream_id, const char *data, size_t bytes)
 {
+	if (bytes == 0) {
+		return;
+	}
+
 	MutexLock lock(&mutex);
 	assert(streams.count(stream_id) != 0);
 	Stream *stream = &streams[stream_id];
@@ -122,8 +127,7 @@ void Server::add_data(const string &stream_id, const char *data, size_t bytes)
 	}
 
 	memcpy(stream->data + pos, data, bytes);
-
-	// TODO: wake up clients
+	wake_up_all_clients();
 }
 	
 void Server::process_client(Client *client)
@@ -217,10 +221,18 @@ void Server::process_client(Client *client)
 		}
 
 		// See if we need to split across the circular buffer.
-		int ret;
+		ssize_t ret;
 		if ((client->bytes_sent % BACKLOG_SIZE) + bytes_to_send > BACKLOG_SIZE) {
-			// TODO: writev
-			assert(false);
+			size_t bytes_first_part = BACKLOG_SIZE - (client->bytes_sent % BACKLOG_SIZE);
+
+			iovec iov[2];
+			iov[0].iov_base = const_cast<char *>(stream.data + (client->bytes_sent % BACKLOG_SIZE));
+			iov[0].iov_len = bytes_first_part;
+
+			iov[1].iov_base = const_cast<char *>(stream.data);
+			iov[1].iov_len = bytes_to_send - bytes_first_part;
+
+			ret = writev(client->sock, iov, 2);
 		} else {
 			ret = write(client->sock,
 			            stream.data + (client->bytes_sent % BACKLOG_SIZE),
@@ -231,10 +243,12 @@ void Server::process_client(Client *client)
 			close_client(client);
 			return;
 		}
-		client->bytes_sent += ret;	
-
-		// TODO: put clients to sleep
+		client->bytes_sent += ret;
 
+		if (client->bytes_sent == stream.data_size) {
+			// We don't have any more data for this client, so put it to sleep.
+			put_client_to_sleep(client);
+		}
 		break;
 	}
 	default:
@@ -271,8 +285,41 @@ 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);
 	clients.erase(client->sock);
 }
+	
+void Server::put_client_to_sleep(Client *client)
+{
+	epoll_event ev;
+	ev.events = EPOLLRDHUP;
+	ev.data.fd = client->sock;
+
+	if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
+		perror("epoll_ctl(EPOLL_CTL_MOD)");
+		exit(1);
+	}
+
+	sleeping_clients.push_back(client->sock);
+}
+
+void Server::wake_up_all_clients()
+{
+	for (unsigned i = 0; i < sleeping_clients.size(); ++i) {
+		epoll_event ev;
+		ev.events = EPOLLOUT | EPOLLRDHUP;
+		ev.data.fd = sleeping_clients[i];
+		if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, sleeping_clients[i], &ev) == -1) {
+			perror("epoll_ctl(EPOLL_CTL_MOD)");
+			exit(1);
+		}
+	}
+	sleeping_clients.clear();
+}