#include "log.h"
#include "metacube2.h"
-#include "mutexlock.h"
#include "state.pb.h"
#include "stream.h"
#include "util.h"
src_encoding(src_encoding),
data_fd(make_tempfile("")),
backlog_size(backlog_size),
- prebuffering_bytes(prebuffering_bytes),
- bytes_received(0),
- pacing_rate(~0U)
+ prebuffering_bytes(prebuffering_bytes)
{
if (data_fd == -1) {
exit(1);
}
-
- pthread_mutex_init(&queued_data_mutex, NULL);
}
Stream::~Stream()
data_fd(data_fd),
backlog_size(serialized.backlog_size()),
prebuffering_bytes(serialized.prebuffering_bytes()),
- bytes_received(serialized.bytes_received()),
- pacing_rate(~0U)
+ bytes_received(serialized.bytes_received())
{
if (data_fd == -1) {
exit(1);
}
suitable_starting_points.push_back(point);
}
-
- pthread_mutex_init(&queued_data_mutex, NULL);
}
StreamProto Stream::serialize()
return;
}
- MutexLock lock(&queued_data_mutex);
+ lock_guard<mutex> lock(queued_data_mutex);
DataElement data_element;
data_element.metacube_flags = metacube_flags;
// 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);
+ lock_guard<mutex> lock(queued_data_mutex);
if (queued_data.empty()) {
return;
}