X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=d8c68fc4f5117df388d9d9c852f351ce92f8d330;hp=855e21c9767587fba2590fccadb47cdb5de852c5;hb=4fcea4a90506f45311daf49a58b02a3723e6a5ff;hpb=a0ad2d9d955fcb5f0aa3cf4f89999c34e8408124

diff --git a/server.cpp b/server.cpp
index 855e21c..d8c68fc 100644
--- a/server.cpp
+++ b/server.cpp
@@ -91,6 +91,21 @@ StreamProto Stream::serialize() const
 	return serialized;
 }
 
+void Stream::put_client_to_sleep(Client *client)
+{
+	sleeping_clients.push_back(client);
+}
+
+void Stream::wake_up_all_clients()
+{
+	if (to_process.empty()) {
+		swap(sleeping_clients, to_process);
+	} else {
+		to_process.insert(to_process.end(), sleeping_clients.begin(), sleeping_clients.end());
+		sleeping_clients.clear();
+	}
+}
+
 Server::Server()
 {
 	pthread_mutex_init(&mutex, NULL);
@@ -162,7 +177,7 @@ void Server::do_work()
 		if (should_stop) {
 			return;
 		}
-	
+
 		for (int i = 0; i < nfds; ++i) {
 			int fd = events[i].data.fd;
 			assert(clients.count(fd) != 0);
@@ -175,6 +190,16 @@ void Server::do_work()
 
 			process_client(client);
 		}
+
+		for (map<string, Stream *>::iterator stream_it = streams.begin();
+		     stream_it != streams.end();
+		     ++stream_it) {
+			Stream *stream = stream_it->second;
+			for (size_t i = 0; i < stream->to_process.size(); ++i) {
+				process_client(stream->to_process[i]);
+			}
+			stream->to_process.clear();
+		}
 	}
 }
 
@@ -201,13 +226,15 @@ void Server::add_client(int sock)
 
 	// Start listening on data from this socket.
 	epoll_event ev;
-	ev.events = EPOLLIN | EPOLLRDHUP;
+	ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
 	ev.data.u64 = 0;  // Keep Valgrind happy.
 	ev.data.fd = sock;
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
 		perror("epoll_ctl(EPOLL_CTL_ADD)");
 		exit(1);
 	}
+
+	process_client(&clients[sock]);
 }
 
 void Server::add_client_from_serialized(const ClientProto &client)
@@ -215,6 +242,7 @@ void Server::add_client_from_serialized(const ClientProto &client)
 	MutexLock lock(&mutex);
 	Stream *stream = find_stream(client.stream_id());
 	clients.insert(make_pair(client.sock(), Client(client, stream)));
+	Client *client_ptr = &clients[client.sock()];
 
 	// Start listening on data from this socket.
 	epoll_event ev;
@@ -231,6 +259,13 @@ void Server::add_client_from_serialized(const ClientProto &client)
 		perror("epoll_ctl(EPOLL_CTL_ADD)");
 		exit(1);
 	}
+
+	if (client_ptr->state == Client::SENDING_DATA && 
+	    client_ptr->bytes_sent == client_ptr->stream->data_size) {
+		client_ptr->stream->put_client_to_sleep(client_ptr);
+	} else {
+		process_client(client_ptr);
+	}
 }
 
 void Server::add_stream(const string &stream_id)
@@ -283,7 +318,7 @@ void Server::add_data(const string &stream_id, const char *data, size_t bytes)
 	}
 
 	memcpy(stream->data + pos, data, bytes);
-	wake_up_all_clients();
+	stream->wake_up_all_clients();
 }
 
 // See the .h file for postconditions after this function.	
@@ -402,14 +437,17 @@ sending_header_or_error_again:
 		// This is postcondition #3.
 		client->state = Client::SENDING_DATA;
 		client->bytes_sent = client->stream->data_size;
-		sleeping_clients.push_back(client);
+		client->stream->put_client_to_sleep(client);
 		return;
 	}
 	case Client::SENDING_DATA: {
 		// See if there's some data we've lost. Ideally, we should drop to a block boundary,
 		// but resync will be the mux's problem.
-		const Stream *stream = client->stream;
+		Stream *stream = client->stream;
 		size_t bytes_to_send = stream->data_size - client->bytes_sent;
+		if (bytes_to_send == 0) {
+			return;
+		}
 		if (bytes_to_send > BACKLOG_SIZE) {
 			fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
 			        client->sock,
@@ -457,7 +495,7 @@ sending_header_or_error_again:
 		if (client->bytes_sent == stream->data_size) {
 			// We don't have any more data for this client, so put it to sleep.
 			// This is postcondition #3.
-			put_client_to_sleep(client);
+			stream->put_client_to_sleep(client);
 		} else {
 			// XXX: Do we need to go another round here to explicitly
 			// get the EAGAIN?
@@ -488,7 +526,7 @@ int Server::parse_request(Client *client)
 	}
 
 	client->stream_id = request_tokens[1];
-	client->stream = streams[client->stream_id];
+	client->stream = find_stream(client->stream_id);
 	client->request.clear();
 
 	return 200;  // OK!
@@ -542,9 +580,14 @@ void Server::close_client(Client *client)
 	}
 
 	// This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
-	vector<Client *>::iterator new_end =
-		remove(sleeping_clients.begin(), sleeping_clients.end(), client);
-	sleeping_clients.erase(new_end, sleeping_clients.end());
+	if (client->stream != NULL) {
+		vector<Client *>::iterator new_end =
+			remove(client->stream->sleeping_clients.begin(),
+			       client->stream->sleeping_clients.end(),
+			       client);
+		client->stream->sleeping_clients.erase(
+			new_end, client->stream->sleeping_clients.end());
+	}
 	
 	// Bye-bye!
 	int ret;
@@ -559,20 +602,6 @@ void Server::close_client(Client *client)
 	clients.erase(client->sock);
 }
 	
-void Server::put_client_to_sleep(Client *client)
-{
-	sleeping_clients.push_back(client);
-}
-
-void Server::wake_up_all_clients()
-{
-	vector<Client *> to_process;
-	swap(sleeping_clients, to_process);
-	for (unsigned i = 0; i < to_process.size(); ++i) {
-		process_client(to_process[i]);
-	}
-}
-	
 Stream *Server::find_stream(const string &stream_id)
 {
 	map<string, Stream *>::iterator it = streams.find(stream_id);