Add some possibly-useful markers for debugging threads from coredumps.

[dcpomatic.git] / src / lib / butler.cc

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 270abd2d6348dc32f6d7009cfde5683c3f4b8c91..6de5d57904efb7ecb32dfb167aff7f9112db953d 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -27,15 +27,14 @@
 #include "compose.hpp"
 #include "exceptions.h"
 #include "video_content.h"
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 using std::cout;
 using std::pair;
 using std::make_pair;
 using std::string;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 using boost::bind;
 using boost::optional;
 using boost::function;
@@ -180,6 +179,8 @@ void
 Butler::thread ()
 try
 {
+       start_of_thread ("Butler");
+
        while (true) {
                boost::mutex::scoped_lock lm (_mutex);
 
@@ -238,10 +239,21 @@ Butler::get_video (bool blocking, Error* e)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (_suspended || (_video.empty() && !blocking)) {
+       auto setup_error = [this](Error* e, Error::Code fallback) {
                if (e) {
-                       e->code = Error::AGAIN;
+                       if (_died) {
+                               e->code = Error::DIED;
+                               e->message = _died_message;
+                       } else if (_finished) {
+                               e->code = Error::FINISHED;
+                       } else {
+                               e->code = fallback;
+                       }
                }
+       };
+
+       if (_video.empty() && (_finished || _died || (_suspended && !blocking))) {
+               setup_error (e, Error::AGAIN);
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }
 
@@ -251,20 +263,11 @@ Butler::get_video (bool blocking, Error* e)
        }
 
        if (_video.empty()) {
-               if (e) {
-                       if (_died) {
-                               e->code = Error::DIED;
-                               e->message = _died_message;
-                       } else if (_finished) {
-                               e->code = Error::FINISHED;
-                       } else {
-                               e->code = Error::NONE;
-                       }
-               }
+               setup_error (e, Error::NONE);
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }
 
-       pair<shared_ptr<PlayerVideo>, DCPTime> const r = _video.get ();
+       auto const r = _video.get ();
        _summon.notify_all ();
        return r;
 }
@@ -306,7 +309,7 @@ void
 Butler::prepare (weak_ptr<PlayerVideo> weak_video)
 try
 {
-       shared_ptr<PlayerVideo> video = weak_video.lock ();
+       auto video = weak_video.lock ();
        /* If the weak_ptr cannot be locked the video obviously no longer requires any work */
        if (video) {
                LOG_TIMING("start-prepare in %1", thread_id());
@@ -362,7 +365,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate)
 optional<DCPTime>
 Butler::get_audio (float* out, Frame frames)
 {
-       optional<DCPTime> t = _audio.get (out, _audio_channels, frames);
+       auto t = _audio.get (out, _audio_channels, frames);
        _summon.notify_all ();
        return t;
 }
@@ -385,8 +388,8 @@ void
 Butler::player_change (ChangeType type, int property)
 {
        if (property == VideoContentProperty::CROP) {
-               if (type == CHANGE_TYPE_DONE) {
-                       shared_ptr<const Film> film = _film.lock();
+               if (type == ChangeType::DONE) {
+                       auto film = _film.lock();
                        if (film) {
                                _video.reset_metadata (film, _player->video_container_size());
                        }
@@ -396,9 +399,9 @@ Butler::player_change (ChangeType type, int property)
 
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (type == CHANGE_TYPE_PENDING) {
+       if (type == ChangeType::PENDING) {
                ++_suspended;
-       } else if (type == CHANGE_TYPE_DONE) {
+       } else if (type == ChangeType::DONE) {
                --_suspended;
                if (_died || _pending_seek_position) {
                        lm.unlock ();
@@ -407,7 +410,7 @@ Butler::player_change (ChangeType type, int property)
                }
 
                DCPTime seek_to;
-               DCPTime next = _video.get().second;
+               auto next = _video.get().second;
                if (_awaiting && _awaiting > next) {
                        /* We have recently done a player_changed seek and our buffers haven't been refilled yet,
                           so assume that we're seeking to the same place as last time.
@@ -419,7 +422,7 @@ Butler::player_change (ChangeType type, int property)
 
                seek_unlocked (seek_to, true);
                _awaiting = seek_to;
-       } else if (type == CHANGE_TYPE_CANCELLED) {
+       } else if (type == ChangeType::CANCELLED) {
                --_suspended;
        }
 
@@ -430,7 +433,7 @@ Butler::player_change (ChangeType type, int property)
 void
 Butler::text (PlayerText pt, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-       if (type != TEXT_CLOSED_CAPTION) {
+       if (type != TextType::CLOSED_CAPTION) {
                return;
        }