X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=stream.cpp;h=ab08a0f7ad85f34d458e9c41b40bbf5d7ccfe721;hb=5605c88a27fcf64ea8f6fd6cbb52dada73856ee0;hp=e61428a97318ec6be30e6a44964a79ac571a7f4a;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7;p=cubemap

diff --git a/stream.cpp b/stream.cpp
index e61428a..ab08a0f 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,14 +1,15 @@
-#include <arpa/inet.h>
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <netinet/in.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.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"
 
@@ -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::Stream(const StreamProto &serialized, int data_fd)
 	: stream_id(serialized.stream_id()),
 	  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,9 +68,7 @@ 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);
@@ -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,6 +104,9 @@ 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.