-#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"
}
}
-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)
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);
}
string existing_data;
- if (!read_tempfile(data_fd, &existing_data)) { // Closes data_fd.
+ if (!read_tempfile_and_close(data_fd, &existing_data)) {
exit(1);
}
// 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.