GUI logging improved

logs::listener resurrected
rpcs3 version: constexpr

Utilities/Log.cpp

@@ -2,6 +2,7 @@
 #include "File.h"
 #include "StrFmt.h"
 
+#include "rpcs3_version.h"
 #include <cstdarg>
 #include <string>
 
@@ -14,15 +15,6 @@ constexpr DECLARE(bijective<logs::level, const char*>::map);
 
 namespace logs
 {
-	struct listener
-	{
-		listener() = default;
-
-		virtual ~listener() = default;
-
-		virtual void log(const channel& ch, level sev, const std::string& text) = 0;
-	};
-
 	class file_writer
 	{
 		// Could be memory-mapped file
@@ -34,10 +26,7 @@ namespace logs
 		virtual ~file_writer() = default;
 
 		// Append raw data
-		void log(const std::string& text);
-
-		// Get current file size (may be used by secondary readers)
-		std::size_t size() const;
+		void log(const char* text, std::size_t size);
 	};
 
 	struct file_listener : public file_writer, public listener
@@ -46,17 +35,19 @@ namespace logs
 			: file_writer(name)
 			, listener()
 		{
+			const std::string& start = fmt::format("\xEF\xBB\xBF" "RPCS3 v%s\n", rpcs3::version.to_string());
+			file_writer::log(start.data(), start.size());
 		}
 
 		// Encode level, current thread name, channel name and write log message
-		virtual void log(const channel& ch, level sev, const std::string& text) override;
+		virtual void log(const message& msg) override;
 	};
 
-	static file_listener& get_logger()
+	static file_listener* get_logger()
 	{
 		// Use magic static
 		static file_listener logger("RPCS3.log");
-		return logger;
+		return &logger;
 	}
 
 	channel GENERAL(nullptr, level::notice);
@@ -69,12 +60,44 @@ namespace logs
 	channel ARMv7("ARMv7");
 }
 
+void logs::listener::add(logs::listener* _new)
+{
+	// Get first (main) listener
+	listener* lis = get_logger();
+
+	// Install new listener at the end of linked list
+	while (lis->m_next || !lis->m_next.compare_and_swap_test(nullptr, _new))
+	{
+		lis = lis->m_next;
+	}
+}
+
 void logs::channel::broadcast(const logs::channel& ch, logs::level sev, const char* fmt...)
 {
 	va_list args;
 	va_start(args, fmt);
-	get_logger().log(ch, sev, fmt::unsafe_vformat(fmt, args));
+	std::string&& text = fmt::unsafe_vformat(fmt, args);
+	std::string&& prefix = g_tls_log_prefix ? g_tls_log_prefix() : "";
 	va_end(args);
+
+	// Prepare message information
+	message msg;
+	msg.ch = &ch;
+	msg.sev = sev;
+	msg.text = text.data();
+	msg.text_size = text.size();
+	msg.prefix = prefix.data();
+	msg.prefix_size = prefix.size();
+
+	// Get first (main) listener
+	listener* lis = get_logger();
+	
+	// Send message to all listeners
+	while (lis)
+	{
+		lis->log(msg);
+		lis = lis->m_next;
+	}
 }
 
 [[noreturn]] extern void catch_all_exceptions();
@@ -85,7 +108,7 @@ logs::file_writer::file_writer(const std::string& name)
 	{
 		if (!m_file.open(fs::get_config_dir() + name, fs::rewrite + fs::append))
 		{
-			throw fmt::exception("Can't create log file %s (error %d)", name, fs::g_tls_error);
+			throw fmt::exception("Can't create log file %s (error %s)", name, fs::g_tls_error);
 		}
 	}
 	catch (...)
@@ -94,54 +117,47 @@ logs::file_writer::file_writer(const std::string& name)
 	}
 }
 
-void logs::file_writer::log(const std::string& text)
+void logs::file_writer::log(const char* text, std::size_t size)
 {
-	m_file.write(text);
+	m_file.write(text, size);
 }
 
-std::size_t logs::file_writer::size() const
+void logs::file_listener::log(const logs::message& msg)
 {
-	return m_file.pos();
-}
-
-void logs::file_listener::log(const logs::channel& ch, logs::level sev, const std::string& text)
-{
-	std::string msg; msg.reserve(text.size() + 200);
+	std::string text; text.reserve(msg.text_size + msg.prefix_size + 200);
 
 	// Used character: U+00B7 (Middle Dot)
-	switch (sev)
+	switch (msg.sev)
 	{
-	case level::always:  msg = u8"·A "; break;
-	case level::fatal:   msg = u8"·F "; break;
-	case level::error:   msg = u8"·E "; break;
-	case level::todo:    msg = u8"·U "; break;
-	case level::success: msg = u8"·S "; break;
-	case level::warning: msg = u8"·W "; break;
-	case level::notice:  msg = u8"·! "; break;
-	case level::trace:   msg = u8"·T "; break;
+	case level::always:  text = u8"·A "; break;
+	case level::fatal:   text = u8"·F "; break;
+	case level::error:   text = u8"·E "; break;
+	case level::todo:    text = u8"·U "; break;
+	case level::success: text = u8"·S "; break;
+	case level::warning: text = u8"·W "; break;
+	case level::notice:  text = u8"·! "; break;
+	case level::trace:   text = u8"·T "; break;
 	}
 
 	// TODO: print time?
 
-	if (auto prefix = g_tls_log_prefix)
+	if (msg.prefix_size > 0)
 	{
-		msg += '{';
-		msg += prefix();
-		msg += "} ";
+		text += fmt::format("{%s} ", msg.prefix);
 	}
 	
-	if (ch.name)
+	if (msg.ch->name)
 	{
-		msg += ch.name;
-		msg += sev == level::todo ? " TODO: " : ": ";
+		text += msg.ch->name;
+		text += msg.sev == level::todo ? " TODO: " : ": ";
 	}
-	else if (sev == level::todo)
+	else if (msg.sev == level::todo)
 	{
-		msg += "TODO: ";
+		text += "TODO: ";
 	}
 	
-	msg += text;
-	msg += '\n';
+	text += msg.text;
+	text += '\n';
 
-	file_writer::log(msg);
+	file_writer::log(text.data(), text.size());
 }