summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/encoder.cc22
-rw-r--r--src/lib/encoder.h11
-rw-r--r--src/lib/server_finder.cc8
-rw-r--r--src/lib/server_finder.h2
-rw-r--r--src/lib/writer.cc10
-rw-r--r--src/lib/writer.h2
6 files changed, 33 insertions, 22 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index b35f49a1b..00e28e1eb 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -83,7 +83,7 @@ Encoder::begin ()
void
Encoder::end ()
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_queue_mutex);
LOG_GENERAL (N_("Clearing queue of %1"), _queue.size ());
@@ -172,14 +172,20 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pv)
{
_waker.nudge ();
- boost::mutex::scoped_lock lock (_mutex);
+ size_t threads = 0;
+ {
+ boost::mutex::scoped_lock threads_lock (_threads_mutex);
+ threads = _threads.size ();
+ }
+
+ boost::mutex::scoped_lock queue_lock (_queue_mutex);
/* XXX: discard 3D here if required */
/* Wait until the queue has gone down a bit */
- while (_queue.size() >= _threads.size() * 2 && !_terminate) {
+ while (_queue.size() >= threads * 2 && !_terminate) {
LOG_TIMING ("decoder-sleep queue=%1", _queue.size());
- _full_condition.wait (lock);
+ _full_condition.wait (queue_lock);
LOG_TIMING ("decoder-wake queue=%1", _queue.size());
}
@@ -249,12 +255,14 @@ void
Encoder::terminate_threads ()
{
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock queue_lock (_queue_mutex);
_terminate = true;
_full_condition.notify_all ();
_empty_condition.notify_all ();
}
+ boost::mutex::scoped_lock threads_lock (_threads_mutex);
+
for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
if ((*i)->joinable ()) {
(*i)->join ();
@@ -285,7 +293,7 @@ try
while (true) {
LOG_TIMING ("encoder-sleep thread=%1", boost::this_thread::get_id());
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_queue_mutex);
while (_queue.empty () && !_terminate) {
_empty_condition.wait (lock);
}
@@ -367,6 +375,8 @@ Encoder::servers_list_changed ()
/* XXX: could re-use threads */
+ boost::mutex::scoped_lock lm (_threads_mutex);
+
if (!Config::instance()->only_servers_encode ()) {
for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index fbae07a9a..9b1b528bb 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -82,7 +82,7 @@ private:
boost::shared_ptr<const Film> _film;
boost::weak_ptr<Job> _job;
- /** Mutex for _time_history and _last_frame */
+ /** Mutex for _time_history and _video_frames_enqueued */
mutable boost::mutex _state_mutex;
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
@@ -90,16 +90,17 @@ private:
std::list<struct timeval> _time_history;
/** Number of frames that we should keep history for */
static int const _history_size;
-
/** Number of video frames enqueued so far */
int _video_frames_enqueued;
bool _left_done;
bool _right_done;
- bool _terminate;
- std::list<boost::shared_ptr<DCPVideo> > _queue;
+ boost::atomic<bool> _terminate;
+ /** Mutex for _threads */
+ mutable boost::mutex _threads_mutex;
std::list<boost::thread *> _threads;
- mutable boost::mutex _mutex;
+ mutable boost::mutex _queue_mutex;
+ std::list<boost::shared_ptr<DCPVideo> > _queue;
/** condition to manage thread wakeups when we have nothing to do */
boost::condition _empty_condition;
/** condition to manage thread wakeups when we have too much to do */
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 1727016e6..315d8d79d 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -168,7 +168,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
ServerDescription sd (ip, xml->number_child<int> ("Threads"));
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
_servers.push_back (sd);
}
emit (boost::bind (boost::ref (ServersListChanged)));
@@ -180,7 +180,7 @@ ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> so
bool
ServerFinder::server_found (string ip) const
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
list<ServerDescription>::const_iterator i = _servers.begin();
while (i != _servers.end() && i->host_name() != ip) {
++i;
@@ -209,7 +209,7 @@ ServerFinder::drop ()
list<ServerDescription>
ServerFinder::servers () const
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
return _servers;
}
@@ -218,7 +218,7 @@ ServerFinder::config_changed (Config::Property what)
{
if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
_servers.clear ();
}
ServersListChanged ();
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index bd6d79304..76926916d 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -67,7 +67,7 @@ private:
boost::thread* _listen_thread;
std::list<ServerDescription> _servers;
- mutable boost::mutex _mutex;
+ mutable boost::mutex _servers_mutex;
boost::asio::io_service _listen_io_service;
boost::shared_ptr<boost::asio::ip::tcp::acceptor> _listen_acceptor;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2571ce3cb..58b2b8a91 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -160,7 +160,7 @@ Writer::~Writer ()
void
Writer::write (Data encoded, int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -193,7 +193,7 @@ Writer::write (Data encoded, int frame, Eyes eyes)
void
Writer::repeat (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -220,7 +220,7 @@ Writer::repeat (int frame, Eyes eyes)
void
Writer::fake_write (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -316,7 +316,7 @@ try
{
while (true)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (true) {
@@ -459,7 +459,7 @@ catch (...)
void
Writer::terminate_thread (bool can_throw)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
if (_thread == 0) {
return;
}
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 79322bacd..be1d3f69e 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -135,7 +135,7 @@ private:
/** number of FULL frames whose JPEG200 data is currently held in RAM */
int _queued_full_in_memory;
/** mutex for thread state */
- mutable boost::mutex _mutex;
+ mutable boost::mutex _state_mutex;
/** condition to manage thread wakeups when we have nothing to do */
boost::condition _empty_condition;
/** condition to manage thread wakeups when we have too much to do */
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-28 18:32:01 +0000