X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=8c6abed5babbbe19bfaca78c3313e6c02cbd48ed;hp=e7579f74b166648227c0e53bfc74396909a3a3a2;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hpb=49cbd002a4b681d8d2c091b0053ea7fe9430d94a diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index e7579f74b..8c6abed5b 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -1,42 +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, @@ -44,11 +55,14 @@ enum { ID_timer }; -static int const log_lines = 32; +static unsigned int const log_lines = 32; -class MemoryLog : public Log, public Signaller +class ServerLog : public Log, public Signaller { public: + ServerLog () + : _fps (0) + {} string get () const { string a; @@ -63,37 +77,89 @@ public: return ""; } + float fps () const { + boost::mutex::scoped_lock lm (_state_mutex); + return _fps; + } + boost::signals2::signal Appended; boost::signals2::signal Removed; private: - void do_log (string m) + void do_log (shared_ptr entry) { - _log.push_back (m); - emit (boost::bind (boost::ref (Appended), m)); + 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); + } + + 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()); + } + } + } + + void append (string s) + { + _log.push_back (s); + emit (boost::bind (boost::ref (Appended), s)); } 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; class StatusDialog : public wxDialog { public: StatusDialog () : wxDialog ( - 0, wxID_ANY, _("DCP-o-matic encode server"), + 0, wxID_ANY, _("DCP-o-matic Encode Server"), wxDefaultPosition, wxDefaultSize, +#ifdef DCPOMATIC_OSX + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP +#else wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER +#endif ) { - _sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); - _sizer->AddGrowableCol (0, 1); + wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); + + add_label_to_sizer (state_sizer, this, _("Frames per second"), true); + _fps = new StaticText (this, wxT("")); + state_sizer->Add (_fps); + + wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP); + log_sizer->AddGrowableCol (0, 1); wxClientDC dc (this); wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long")); @@ -101,17 +167,24 @@ public: SetSize (700, height + DCPOMATIC_SIZER_GAP * 2); _text = new wxTextCtrl ( - this, wxID_ANY, std_to_wx (memory_log->get()), wxDefaultPosition, wxSize (-1, height), + this, wxID_ANY, std_to_wx (server_log->get()), wxDefaultPosition, wxSize (-1, height), wxTE_READONLY | wxTE_MULTILINE ); - _sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + log_sizer->Add (_text, 1, wxEXPAND); - SetSizer (_sizer); - _sizer->Layout (); + 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 (); - memory_log->Appended.connect (bind (&StatusDialog::appended, this, _1)); - memory_log->Removed.connect (bind (&StatusDialog::removed, this, _1)); + 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: @@ -125,8 +198,14 @@ private: _text->Remove (0, n + 1); } - wxFlexGridSizer* _sizer; + void update_state () + { + _fps->SetLabel (wxString::Format ("%.1f", server_log->fps())); + } + wxTextCtrl* _text; + wxStaticText* _fps; + boost::shared_ptr _timer; }; class TaskBarIcon : public wxTaskBarIcon @@ -136,18 +215,17 @@ public: : _status (0) { #ifdef DCPOMATIC_WINDOWS - wxIcon icon (std_to_wx ("taskbar_icon")); + wxIcon icon (std_to_wx ("id")); #else - wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif - SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); + 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 () @@ -161,7 +239,9 @@ public: private: void status () { - _status = new StatusDialog (); + if (!_status) { + _status = new StatusDialog (); + } _status->Show (); } @@ -178,7 +258,6 @@ class App : public wxApp, public ExceptionStore public: App () : wxApp () - , _thread (0) , _icon (0) {} @@ -190,6 +269,17 @@ 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 (); @@ -198,13 +288,31 @@ private: 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; } @@ -216,8 +324,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 (); } @@ -240,7 +348,17 @@ private: signal_manager->ui_idle (); } - boost::thread* _thread; + 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; };