Logging improvements to allow prettier displays in the server GUI.

1 files changed, 85 insertions, 15 deletions

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 37fcc34cd..d87683280 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -20,23 +20,30 @@
 #include "wx/wx_util.h"
 #include "wx/wx_signal_manager.h"
 #include "lib/util.h"
+#include "lib/encoded_log_entry.h"
 #include "lib/server.h"
 #include "lib/config.h"
 #include "lib/log.h"
+#include "lib/raw_convert.h"
 #include "lib/signaller.h"
 #include <wx/taskbar.h>
 #include <wx/icon.h>
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
+#include <boost/optional.hpp>
 #include <iostream>
 
 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,
@@ -46,7 +53,7 @@ enum {
 
 static int const log_lines = 32;
 
-class MemoryLog : public Log, public Signaller
+class ServerLog : public Log, public Signaller
 {
 public:
 
@@ -63,24 +70,66 @@ public:
 		return "";
 	}
 
+	float fps () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _fps;
+	}
+
 	boost::signals2::signal<void(string)> Appended;
 	boost::signals2::signal<void(int)> Removed;
 
 private:
-	void do_log (string m)
+	void do_log (shared_ptr<const LogEntry> 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<const EncodedLogEntry> encoded = dynamic_pointer_cast<const EncodedLogEntry> (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<string> _log;
+	optional<struct tm> _last_time;
+	std::list<double> _history;
+
+	mutable boost::mutex _state_mutex;
+	float _fps;
 };
 
-static shared_ptr<MemoryLog> memory_log (new MemoryLog);
+static shared_ptr<ServerLog> server_log (new ServerLog);
 
 class StatusDialog : public wxDialog
 {
@@ -92,8 +141,14 @@ public:
 			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
 			)
 	{
-		_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 wxStaticText (this, wxID_ANY, 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 +156,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 ();
+
+		Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update_state, this));
+		_timer.reset (new wxTimer (this));
+		_timer->Start (1000);
 
-		memory_log->Appended.connect (bind (&StatusDialog::appended, this, _1));
-		memory_log->Removed.connect (bind (&StatusDialog::removed, this, _1));
+		server_log->Appended.connect (bind (&StatusDialog::appended, this, _1));
+		server_log->Removed.connect (bind (&StatusDialog::removed, this, _1));
 	}
 
 private:
@@ -125,8 +187,16 @@ private:
 		_text->Remove (0, n + 1);
 	}
 
-	wxFlexGridSizer* _sizer;
+	void update_state ()
+	{
+		SafeStringStream s;
+		s << fixed << setprecision(1) << server_log->fps ();
+		_fps->SetLabel (std_to_wx (s.str()));
+	}
+
 	wxTextCtrl* _text;
+	wxStaticText* _fps;
+	boost::shared_ptr<wxTimer> _timer;
 };
 
 class TaskBarIcon : public wxTaskBarIcon
@@ -218,7 +288,7 @@ private:
 
 	void main_thread ()
 	try {
-		Server server (memory_log, false);
+		Server server (server_log, false);
 		server.run (Config::instance()->num_local_encoding_threads ());
 	} catch (...) {
 		store_current ();