Tidy and fix logging.

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

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 7bef82b2658c6b0b0e973b70b2e778593a7ed834..9902c8e84c65bf8d792700f6b2ce5594ea216c4d 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>
@@ -41,17 +42,15 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
+#ifdef HAVE_VALGRIND_H
+#include <valgrind/memcheck.h>
+#endif
 #include <string>
 #include <vector>
 #include <iostream>
 
 #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;
@@ -67,9 +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)
-       , _log (log)
+#else
+       : Server (ENCODE_FRAME_PORT, 2400)
+#endif
        , _verbose (verbose)
        , _num_threads (num_threads)
 {
@@ -134,11 +136,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);
 
@@ -213,7 +215,7 @@ EncodeServer::worker_thread ()
                                cout << e->get() << "\n";
                        }
 
-                       _log->log (e);
+                       dcpomatic_log->log (e);
                }
 
                _full_condition.notify_all ();
@@ -229,10 +231,17 @@ EncodeServer::run ()
        }
 
        for (int i = 0; i < _num_threads; ++i) {
-               _worker_threads.push_back (new thread (bind (&EncodeServer::worker_thread, this)));
+               thread* t = new thread (bind (&EncodeServer::worker_thread, this));
+#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));
+#ifdef DCPOMATIC_LINUX
+       pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast");
+#endif
 
        Server::run ();
 }
@@ -277,9 +286,19 @@ EncodeServer::broadcast_received ()
                if (_verbose) {
                        cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
                }
-               shared_ptr<Socket> socket (new Socket);
+
+               try {
+                       shared_ptr<Socket> socket (new Socket);
+                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), MAIN_SERVER_PRESENCE_PORT));
+                       socket->write (xml.length() + 1);
+                       socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
+               } catch (...) {
+
+               }
+
                try {
-                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), SERVER_PRESENCE_PORT));
+                       shared_ptr<Socket> socket (new Socket);
+                       socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), BATCH_SERVER_PRESENCE_PORT));
                        socket->write (xml.length() + 1);
                        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
                } catch (...) {