Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 2603732c890041ff45fb6a0b356d640427e74aca..5884df09aae9642ccea356b640a9d4491ef4fa3e 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -33,6 +33,7 @@
 #include "player_video.h"
 #include "compose.hpp"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
 #include <dcp/raw_convert.h>
@@ -50,11 +51,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...)    _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_ERROR(...)      _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-#define LOG_ERROR_NC(...)   _log->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
-
 using std::string;
 using std::vector;
 using std::list;
@@ -70,13 +66,12 @@ using dcp::Size;
 using dcp::Data;
 using dcp::raw_convert;
 
-EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
+EncodeServer::EncodeServer (bool verbose, int num_threads)
 #if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0
        : Server (ENCODE_FRAME_PORT)
 #else
        : Server (ENCODE_FRAME_PORT, 2400)
 #endif
-       , _log (log)
        , _verbose (verbose)
        , _num_threads (num_threads)
 {
@@ -93,27 +88,30 @@ EncodeServer::~EncodeServer ()
        }
 
        BOOST_FOREACH (boost::thread* i, _worker_threads) {
-               /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
-                  can't throw exceptions from a destructor.
-               */
-               if (i->joinable ()) {
+               try {
                        i->join ();
+               } catch (...) {
+
                }
                delete i;
        }
 
-       if (_broadcast.socket) {
-               _broadcast.socket->close ();
+       {
+               boost::mutex::scoped_lock lm (_broadcast.mutex);
+               if (_broadcast.socket) {
+                       _broadcast.socket->close ();
+                       delete _broadcast.socket;
+                       _broadcast.socket = 0;
+               }
        }
+
        _broadcast.io_service.stop ();
-       if (_broadcast.thread) {
-               /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
-                  can't throw exceptions from a destructor.
-               */
-               if (_broadcast.thread->joinable ()) {
-                       _broadcast.thread->join ();
+       if (_broadcast.thread.joinable()) {
+               try {
+                       _broadcast.thread.join ();
+               } catch (...) {
+
                }
-               delete _broadcast.thread;
        }
 }
 
@@ -141,11 +139,11 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
 
        shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
 
-       DCPVideo dcp_video_frame (pvf, xml, _log);
+       DCPVideo dcp_video_frame (pvf, xml);
 
        gettimeofday (&after_read, 0);
 
-       Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
+       Data encoded = dcp_video_frame.encode_locally ();
 
        gettimeofday (&after_encode, 0);
 
@@ -220,7 +218,7 @@ EncodeServer::worker_thread ()
                                cout << e->get() << "\n";
                        }
 
-                       _log->log (e);
+                       dcpomatic_log->log (e);
                }
 
                _full_condition.notify_all ();
@@ -236,16 +234,16 @@ EncodeServer::run ()
        }
 
        for (int i = 0; i < _num_threads; ++i) {
-               thread* t = new thread (bind (&EncodeServer::worker_thread, this));
+               boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
+               _worker_threads.push_back (t);
 #ifdef DCPOMATIC_LINUX
                pthread_setname_np (t->native_handle(), "encode-server-worker");
 #endif
-               _worker_threads.push_back (t);
        }
 
-       _broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this));
+       _broadcast.thread = thread (bind(&EncodeServer::broadcast_thread, this));
 #ifdef DCPOMATIC_LINUX
-       pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast");
+       pthread_setname_np (_broadcast.thread.native_handle(), "encode-server-broadcast");
 #endif
 
        Server::run ();
@@ -311,10 +309,13 @@ EncodeServer::broadcast_received ()
                }
        }
 
-       _broadcast.socket->async_receive_from (
-               boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
-               _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
-               );
+       boost::mutex::scoped_lock lm (_broadcast.mutex);
+       if (_broadcast.socket) {
+               _broadcast.socket->async_receive_from (
+                       boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+                       _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
+                       );
+       }
 }
 
 void
@@ -322,6 +323,9 @@ EncodeServer::handle (shared_ptr<Socket> socket)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
+       Waker waker;
+       waker.nudge ();
+
        /* Wait until the queue has gone down a bit */
        while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
                _full_condition.wait (lock);