X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=425477c0bedd424ff1a507220c0fb1fed952665b;hp=e61428a97318ec6be30e6a44964a79ac571a7f4a;hb=562cf44b96b5c0260d1a1ab18b2dd2408b6d1fc8;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7

diff --git a/stream.cpp b/stream.cpp
index e61428a..425477c 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,21 +1,22 @@
-#include <arpa/inet.h>
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <netinet/in.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 
-#include "state.pb.h"
 #include "log.h"
 #include "metacube.h"
+#include "state.pb.h"
 #include "stream.h"
 #include "util.h"
 
 using namespace std;
 
-Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding)
-	: stream_id(stream_id),
+Stream::Stream(const string &url, size_t backlog_size, Encoding encoding)
+	: url(url),
 	  encoding(encoding),
 	  data_fd(make_tempfile("")),
           backlog_size(backlog_size),
@@ -30,22 +31,16 @@ Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding)
 Stream::~Stream()
 {
 	if (data_fd != -1) {
-		int ret;
-		do {
-			ret = close(data_fd);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			log_perror("close");
-		}
+		safe_close(data_fd);
 	}
 }
 
-Stream::Stream(const StreamProto &serialized)
-	: stream_id(serialized.stream_id()),
+Stream::Stream(const StreamProto &serialized, int data_fd)
+	: url(serialized.url()),
 	  http_header(serialized.http_header()),
 	  stream_header(serialized.stream_header()),
 	  encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
-	  data_fd(make_tempfile(serialized.data())),
+	  data_fd(data_fd),
 	  backlog_size(serialized.backlog_size()),
 	  bytes_received(serialized.bytes_received()),
 	  mark_pool(NULL)
@@ -73,12 +68,10 @@ StreamProto Stream::serialize()
 	StreamProto serialized;
 	serialized.set_http_header(http_header);
 	serialized.set_stream_header(stream_header);
-	if (!read_tempfile(data_fd, serialized.mutable_data())) {  // Closes data_fd.
-		exit(1);
-	}
+	serialized.add_data_fds(data_fd);
 	serialized.set_backlog_size(backlog_size);
 	serialized.set_bytes_received(bytes_received);
-	serialized.set_stream_id(stream_id);
+	serialized.set_url(url);
 	data_fd = -1;
 	return serialized;
 }
@@ -90,7 +83,7 @@ void Stream::set_backlog_size(size_t new_size)
 	}
 
 	string existing_data;
-	if (!read_tempfile(data_fd, &existing_data)) {  // Closes data_fd.
+	if (!read_tempfile_and_close(data_fd, &existing_data)) {
 		exit(1);
 	}
 
@@ -111,11 +104,20 @@ void Stream::set_backlog_size(size_t new_size)
 
 	// Create a new, empty data file.
 	data_fd = make_tempfile("");
+	if (data_fd == -1) {
+		exit(1);
+	}
 	backlog_size = new_size;
 
 	// Now cheat a bit by rewinding, and adding all the old data back.
 	bytes_received -= existing_data.size();
-	add_data(existing_data.data(), existing_data.size());
+	iovec iov;
+	iov.iov_base = const_cast<char *>(existing_data.data());
+	iov.iov_len = existing_data.size();
+
+	vector<iovec> iovs;
+	iovs.push_back(iov);
+	add_data_raw(iovs);
 }
 
 void Stream::put_client_to_sleep(Client *client)
@@ -123,69 +125,121 @@ void Stream::put_client_to_sleep(Client *client)
 	sleeping_clients.push_back(client);
 }
 
-void Stream::add_data(const char *data, ssize_t bytes)
+// Return a new set of iovecs that contains only the first <bytes_wanted> bytes of <data>.
+vector<iovec> collect_iovecs(const vector<iovec> &data, size_t bytes_wanted)
 {
-	if (encoding == Stream::STREAM_ENCODING_RAW) {
-		add_data_raw(data, bytes);
-	} else if (encoding == STREAM_ENCODING_METACUBE) {
-		metacube_block_header hdr;
-		memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync));
-		hdr.size = htonl(bytes);
-		hdr.flags = htonl(0);
-
-		char *block = new char[bytes + sizeof(hdr)];
-		memcpy(block, &hdr, sizeof(hdr));
-		memcpy(block + sizeof(hdr), data, bytes);
-		add_data_raw(block, bytes + sizeof(hdr));
-		delete[] block;
-	} else {
-		assert(false);
+	vector<iovec> ret;
+	for (size_t i = 0; i < data.size() && bytes_wanted > 0; ++i) {
+		if (data[i].iov_len <= bytes_wanted) {
+			// Consume the entire iovec.
+			ret.push_back(data[i]);
+			bytes_wanted -= data[i].iov_len;
+		} else {
+			// Take only parts of this iovec.
+			iovec iov;
+			iov.iov_base = data[i].iov_base;
+			iov.iov_len = bytes_wanted;	
+			ret.push_back(iov);
+			bytes_wanted = 0;
+		}
 	}
+	return ret;
 }
 
-void Stream::add_data_raw(const char *data, ssize_t bytes)
+// Return a new set of iovecs that contains all of <data> except the first <bytes_wanted> bytes.
+vector<iovec> remove_iovecs(const vector<iovec> &data, size_t bytes_wanted)
 {
-	size_t pos = bytes_received % backlog_size;
-	bytes_received += bytes;
-
-	if (pos + bytes > backlog_size) {
-		ssize_t to_copy = backlog_size - pos;
-		while (to_copy > 0) {
-			int ret = pwrite(data_fd, data, to_copy, pos);
-			if (ret == -1 && errno == EINTR) {
-				continue;
-			}
-			if (ret == -1) {
-				log_perror("pwrite");
-				// Dazed and confused, but trying to continue...
-				break;
-			}
-			pos += ret;
-			data += ret;
-			to_copy -= ret;
-			bytes -= ret;
+	vector<iovec> ret;
+	size_t i;
+	for (i = 0; i < data.size() && bytes_wanted > 0; ++i) {
+		if (data[i].iov_len <= bytes_wanted) {
+			// Consume the entire iovec.
+			bytes_wanted -= data[i].iov_len;
+		} else {
+			// Take only parts of this iovec.
+			iovec iov;
+			iov.iov_base = reinterpret_cast<char *>(data[i].iov_base) + bytes_wanted;
+			iov.iov_len = data[i].iov_len - bytes_wanted;
+			ret.push_back(iov);
+			bytes_wanted = 0;
 		}
-		pos = 0;
 	}
 
-	while (bytes > 0) {
-		int ret = pwrite(data_fd, data, bytes, pos);
-		if (ret == -1 && errno == EINTR) {
-			continue;
-		}
+	// Add the rest of the iovecs unchanged.
+	ret.insert(ret.end(), data.begin() + i, data.end());
+	return ret;
+}
+
+void Stream::add_data_raw(const vector<iovec> &orig_data)
+{
+	vector<iovec> data = orig_data;
+	while (!data.empty()) {
+		size_t pos = bytes_received % backlog_size;
+
+		// Collect as many iovecs as we can before we hit the point
+		// where the circular buffer wraps around.
+		vector<iovec> to_write = collect_iovecs(data, backlog_size - pos);
+		ssize_t ret;
+		do {
+			ret = pwritev(data_fd, to_write.data(), to_write.size(), pos);
+		} while (ret == -1 && errno == EINTR);
+
 		if (ret == -1) {
 			log_perror("pwrite");
 			// Dazed and confused, but trying to continue...
-			break;
+			return;
 		}
-		pos += ret;
-		data += ret;
-		bytes -= ret;
+		bytes_received += ret;
+
+		// Remove the data that was actually written from the set of iovecs.
+		data = remove_iovecs(data, ret);
+	}
+}
+
+void Stream::add_data_deferred(const char *data, size_t bytes)
+{
+	if (encoding == Stream::STREAM_ENCODING_METACUBE) {
+		// Add a Metacube block header before the data.
+		metacube_block_header hdr;
+		memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync));
+		hdr.size = htonl(bytes);
+		hdr.flags = htonl(0);
+
+		iovec iov;
+		iov.iov_base = new char[bytes + sizeof(hdr)];
+		iov.iov_len = bytes + sizeof(hdr);
+
+		memcpy(iov.iov_base, &hdr, sizeof(hdr));
+		memcpy(reinterpret_cast<char *>(iov.iov_base) + sizeof(hdr), data, bytes);
+
+		queued_data.push_back(iov);
+	} else if (encoding == Stream::STREAM_ENCODING_RAW) {
+		// Just add the data itself.
+		iovec iov;
+		iov.iov_base = new char[bytes];
+		memcpy(iov.iov_base, data, bytes);
+		iov.iov_len = bytes;
+
+		queued_data.push_back(iov);
+	} else {
+		assert(encoding == Stream::STREAM_ENCODING_RAW);
 	}
 }
 
-void Stream::wake_up_all_clients()
+void Stream::process_queued_data()
 {
+	if (queued_data.empty()) {
+		return;
+	}
+
+	add_data_raw(queued_data);
+	for (size_t i = 0; i < queued_data.size(); ++i) {
+		char *data = reinterpret_cast<char *>(queued_data[i].iov_base);
+		delete[] data;
+	}
+	queued_data.clear();
+
+	// We have more data, so wake up all clients.
 	if (to_process.empty()) {
 		swap(sleeping_clients, to_process);
 	} else {