X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=cb4779ee3722c949278a7bdb1f4b4501f0a83164;hp=978f600b2deecf829a256cc8451913ef07f16d1e;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=82fcadc063b286db72b3350923f3a9ba52a029f9 diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 978f600b2..cb4779ee3 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -1,38 +1,53 @@ /* Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "wx/wx_util.h" +#include "wx/wx_signal_manager.h" +#include "wx/static_text.h" #include "lib/util.h" -#include "lib/server.h" +#include "lib/encoded_log_entry.h" +#include "lib/encode_server.h" #include "lib/config.h" #include "lib/log.h" +#include "lib/signaller.h" +#include "lib/cross.h" +#include "lib/dcpomatic_log.h" #include +#include #include #include +#include +#include #include using std::cout; using std::string; using std::exception; +using std::list; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::thread; using boost::bind; +using boost::optional; +using boost::dynamic_pointer_cast; enum { ID_status = 1, @@ -40,104 +55,172 @@ enum { ID_timer }; -class MemoryLog : public Log +static unsigned int const log_lines = 32; + +class ServerLog : public Log, public Signaller { public: + ServerLog () + : _fps (0) + {} string get () const { - boost::mutex::scoped_lock (_mutex); - return _log; + string a; + BOOST_FOREACH (string const & i, _log) { + a += i + "\n"; + } + return a; } - string head_and_tail (int amount = 1024) const { - if (int (_log.size ()) < (2 * amount)) { - return _log; + float fps () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _fps; + } + + boost::signals2::signal Appended; + boost::signals2::signal Removed; + +private: + void do_log (shared_ptr entry) + { + time_t const s = entry->seconds (); + struct tm* local = localtime (&s); + if ( + !_last_time || + local->tm_yday != _last_time->tm_yday || + local->tm_year != _last_time->tm_year || + local->tm_hour != _last_time->tm_hour || + local->tm_min != _last_time->tm_min + ) { + char buffer[64]; + strftime (buffer, 64, "%c", local); + append (buffer); } - return _log.substr (0, amount) + _log.substr (_log.size() - amount - 1, amount); + append (entry->message ()); + if (_log.size() > log_lines) { + emit (boost::bind (boost::ref (Removed), _log.front().length())); + _log.pop_front (); + } + _last_time = *local; + + shared_ptr encoded = dynamic_pointer_cast (entry); + if (encoded) { + _history.push_back (encoded->seconds ()); + if (_history.size() > 48) { + _history.pop_front (); + } + if (_history.size() > 2) { + boost::mutex::scoped_lock lm (_state_mutex); + _fps = _history.size() / (_history.back() - _history.front()); + } + } } -private: - void do_log (string m) + void append (string s) { - _log = m; + _log.push_back (s); + emit (boost::bind (boost::ref (Appended), s)); } - string _log; + list _log; + optional _last_time; + std::list _history; + + mutable boost::mutex _state_mutex; + float _fps; }; -static shared_ptr memory_log (new MemoryLog); +static shared_ptr server_log; -#ifdef DCPOMATIC_OSX -class StatusDialog : public wxFrame -#else class StatusDialog : public wxDialog -#endif { public: StatusDialog () + : wxDialog ( + 0, wxID_ANY, _("DCP-o-matic Encode Server"), + wxDefaultPosition, wxDefaultSize, #ifdef DCPOMATIC_OSX - : wxFrame (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP #else - : wxDialog (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER #endif - , _timer (this, ID_timer) + ) { - _sizer = new wxFlexGridSizer (1, 6, 6); - _sizer->AddGrowableCol (0, 1); + wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); - _text = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxTE_READONLY); - _sizer->Add (_text, 1, wxEXPAND); + add_label_to_sizer (state_sizer, this, _("Frames per second"), true); + _fps = new StaticText (this, wxT("")); + state_sizer->Add (_fps); - SetSizer (_sizer); - _sizer->Layout (); + wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); + log_sizer->AddGrowableCol (0, 1); - Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update, this), ID_timer); - _timer.Start (1000); + wxClientDC dc (this); + wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long")); + int const height = (size.GetHeight() + 2) * log_lines; + SetSize (700, height + DCPOMATIC_SIZER_GAP * 2); + + _text = new wxTextCtrl ( + this, wxID_ANY, std_to_wx (server_log->get()), wxDefaultPosition, wxSize (-1, height), + wxTE_READONLY | wxTE_MULTILINE + ); + + log_sizer->Add (_text, 1, wxEXPAND); + + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + overall_sizer->Add (state_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP); + overall_sizer->Add (log_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + SetSizer (overall_sizer); + overall_sizer->Layout (); + + Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update_state, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); + + server_log->Appended.connect (bind (&StatusDialog::appended, this, _1)); + server_log->Removed.connect (bind (&StatusDialog::removed, this, _1)); } private: - void update () + void appended (string s) { - _text->ChangeValue (std_to_wx (memory_log->get ())); - _sizer->Layout (); + (*_text) << s << "\n"; + } + + void removed (int n) + { + _text->Remove (0, n + 1); + } + + void update_state () + { + _fps->SetLabel (wxString::Format ("%.1f", server_log->fps())); } - wxFlexGridSizer* _sizer; wxTextCtrl* _text; - wxTimer _timer; + wxStaticText* _fps; + boost::shared_ptr _timer; }; class TaskBarIcon : public wxTaskBarIcon { public: TaskBarIcon () + : _status (0) { #ifdef DCPOMATIC_WINDOWS - wxIcon icon (std_to_wx ("taskbar_icon")); -#endif -#ifdef DCPOMATIC_LINUX - wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); + wxIcon icon (std_to_wx ("id")); +#else + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif -#ifndef DCPOMATIC_OSX - SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); -#endif - -#ifdef DCPOMATIC_OSX - wxMenu* file = new wxMenu; - file->Append (wxID_EXIT, _("&Exit")); - wxMenuBar* bar = new wxMenuBar; - bar->Append (file, _("&File")); - SetMenuBar (bar); - status (); -#endif + SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server")); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status); - Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit); + Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::status, this), ID_status); + Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit); } wxMenu* CreatePopupMenu () @@ -151,14 +234,18 @@ public: private: void status () { - StatusDialog* d = new StatusDialog; - d->Show (); + if (!_status) { + _status = new StatusDialog (); + } + _status->Show (); } void quit () { wxTheApp->ExitMainLoop (); } + + StatusDialog* _status; }; class App : public wxApp, public ExceptionStore @@ -166,7 +253,6 @@ class App : public wxApp, public ExceptionStore public: App () : wxApp () - , _thread (0) , _icon (0) {} @@ -178,18 +264,50 @@ private: return false; } + wxInitAllImageHandlers (); + + server_log.reset (new ServerLog); + server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); + dcpomatic_log = server_log; + + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + + wxSplashScreen* splash = maybe_show_splash (); + dcpomatic_setup_path_encoding (); dcpomatic_setup_i18n (); dcpomatic_setup (); Config::drop (); + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + + /* Bad things happen (on Linux at least) if the config is reloaded by main_thread; + it seems like there's a race which results in the locked_sstream mutex being + locked before it is initialised. Calling Config::instance() here loads the config + again in this thread, which seems to work around the problem. + */ + Config::instance(); + +#ifdef DCPOMATIC_LINUX + StatusDialog* d = new StatusDialog (); + d->Show (); +#else _icon = new TaskBarIcon; - _thread = new thread (bind (&App::main_thread, this)); +#endif + _thread = thread (bind (&App::main_thread, this)); Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); _timer->Start (1000); + if (splash) { + splash->Destroy (); + } + + SetExitOnFrameDelete (false); + return true; } @@ -201,8 +319,8 @@ private: void main_thread () try { - Server server (memory_log, false); - server.run (Config::instance()->num_local_encoding_threads ()); + EncodeServer server (false, Config::instance()->server_encoding_threads()); + server.run (); } catch (...) { store_current (); } @@ -220,7 +338,22 @@ private: } } - boost::thread* _thread; + void idle () + { + signal_manager->ui_idle (); + } + + void config_failed_to_load () + { + message_dialog (0, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + } + + void config_warning (string m) + { + message_dialog (0, std_to_wx (m)); + } + + boost::thread _thread; TaskBarIcon* _icon; shared_ptr _timer; };