#include "log.h"
#include "metacube2.h"
+#include "mutexlock.h"
#include "state.pb.h"
#include "stream.h"
#include "util.h"
bytes_received(0),
last_suitable_starting_point(-1),
mark_pool(NULL),
+ pacing_rate(~0U),
queued_data_last_starting_point(-1)
{
if (data_fd == -1) {
exit(1);
}
+
+ pthread_mutex_init(&queued_data_mutex, NULL);
}
Stream::~Stream()
backlog_size(serialized.backlog_size()),
bytes_received(serialized.bytes_received()),
mark_pool(NULL),
+ pacing_rate(~0U),
queued_data_last_starting_point(-1)
{
if (data_fd == -1) {
exit(1);
}
- // Split old-style headers into HTTP and video headers.
- if (!serialized.header().empty()) {
- string header = serialized.header();
- size_t split = header.find("\r\n\r\n");
- if (split == string::npos) {
- http_header = header;
- stream_header = "";
- } else {
- http_header = header.substr(0, split + 2); // Split off the second \r\n.
- stream_header = header.substr(split, string::npos);
- }
- }
+ assert(serialized.has_last_suitable_starting_point());
+ last_suitable_starting_point = serialized.last_suitable_starting_point();
- // Older versions did not set last_suitable_starting_point.
- if (serialized.has_last_suitable_starting_point()) {
- last_suitable_starting_point = serialized.last_suitable_starting_point();
- } else {
- last_suitable_starting_point = bytes_received;
- }
+ pthread_mutex_init(&queued_data_mutex, NULL);
}
StreamProto Stream::serialize()
void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
{
+ MutexLock lock(&queued_data_mutex);
assert(suitable_for_stream_start == SUITABLE_FOR_STREAM_START ||
suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START);
if (suitable_for_stream_start == SUITABLE_FOR_STREAM_START) {
void Stream::process_queued_data()
{
- if (queued_data.empty()) {
- return;
+ std::vector<iovec> queued_data_copy;
+ int queued_data_last_starting_point_copy = -1;
+
+ // Hold the lock for as short as possible, since add_data_raw() can possibly
+ // write to disk, which might disturb the input thread.
+ {
+ MutexLock lock(&queued_data_mutex);
+ if (queued_data.empty()) {
+ return;
+ }
+
+ swap(queued_data, queued_data_copy);
+ swap(queued_data_last_starting_point, queued_data_last_starting_point_copy);
}
// Update the last suitable starting point for the stream,
// if the queued data contains such a starting point.
- assert(queued_data_last_starting_point < ssize_t(queued_data.size()));
- if (queued_data_last_starting_point >= 0) {
+ assert(queued_data_last_starting_point_copy < ssize_t(queued_data_copy.size()));
+ if (queued_data_last_starting_point_copy >= 0) {
last_suitable_starting_point = bytes_received;
- for (int i = 0; i < queued_data_last_starting_point; ++i) {
- last_suitable_starting_point += queued_data[i].iov_len;
+ for (int i = 0; i < queued_data_last_starting_point_copy; ++i) {
+ last_suitable_starting_point += queued_data_copy[i].iov_len;
}
}
- 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);
+ add_data_raw(queued_data_copy);
+ for (size_t i = 0; i < queued_data_copy.size(); ++i) {
+ char *data = reinterpret_cast<char *>(queued_data_copy[i].iov_base);
delete[] data;
}
- queued_data.clear();
- queued_data_last_starting_point = -1;
// We have more data, so wake up all clients.
if (to_process.empty()) {