Minor changes in logging

AnKi/Core/DeveloperConsole.cpp

@@ -15,6 +15,7 @@ DeveloperConsole::~DeveloperConsole()
 	{
 		LogItem* item = &m_logItems.getFront();
 		m_logItems.popFront();
+		item->m_threadName.destroy(m_alloc);
 		item->m_msg.destroy(m_alloc);
 		m_alloc.deleteInstance(item);
 	}
@@ -71,10 +72,10 @@ void DeveloperConsole::build(CanvasPtr ctx)
 			ANKI_ASSERT(0);
 		}
 
-		static constexpr Array<const char*, U(LoggerMessageType::kCount)> kMsgText = {"I", "E", "W", "F"};
-		ImGui::TextWrapped("[%s][%s] %s (%s:%d %s)", kMsgText[item.m_type],
+		constexpr Array<const Char*, U(LoggerMessageType::kCount)> kMsgText = {"I", "E", "W", "F"};
+		ImGui::TextWrapped("[%s][%s] %s [%s:%d][%s][%s]", kMsgText[item.m_type],
 						   (item.m_subsystem) ? item.m_subsystem : "N/A ", item.m_msg.cstr(), item.m_file, item.m_line,
-						   item.m_func);
+						   item.m_func, item.m_threadName.cstr());
 
 		ImGui::PopStyleColor();
 	}
@@ -93,7 +94,7 @@ void DeveloperConsole::build(CanvasPtr ctx)
 	// Commands
 	ImGui::Separator();
 	ImGui::PushItemWidth(-1.0f); // Use the whole size
-	if(ImGui::InputText("", &m_inputText[0], m_inputText.getSizeInBytes(), ImGuiInputTextFlags_EnterReturnsTrue,
+	if(ImGui::InputText("##noname", &m_inputText[0], m_inputText.getSizeInBytes(), ImGuiInputTextFlags_EnterReturnsTrue,
 						nullptr, nullptr))
 	{
 		const Error err = m_scriptEnv.evalString(&m_inputText[0]);
@@ -123,6 +124,7 @@ void DeveloperConsole::newLogItem(const LoggerMessageInfo& inf)
 		m_logItems.popFront();
 
 		first->m_msg.destroy(m_alloc);
+		first->m_threadName.destroy(m_alloc);
 
 		// Re-use the log item
 		newLogItem = first;
@@ -137,6 +139,7 @@ void DeveloperConsole::newLogItem(const LoggerMessageInfo& inf)
 	newLogItem->m_file = inf.m_file;
 	newLogItem->m_func = inf.m_func;
 	newLogItem->m_subsystem = inf.m_subsystem;
+	newLogItem->m_threadName.create(m_alloc, inf.m_threadName);
 	newLogItem->m_msg.create(m_alloc, inf.m_msg);
 	newLogItem->m_line = inf.m_line;
 	newLogItem->m_type = inf.m_type;

AnKi/Core/DeveloperConsole.h

@@ -36,9 +36,10 @@ private:
 	class LogItem : public IntrusiveListEnabled<LogItem>
 	{
 	public:
-		const char* m_file;
-		const char* m_func;
-		const char* m_subsystem;
+		const Char* m_file;
+		const Char* m_func;
+		const Char* m_subsystem;
+		String m_threadName;
 		String m_msg;
 		I32 m_line;
 		LoggerMessageType m_type;

AnKi/Util/Logger.cpp

@@ -180,9 +180,9 @@ void Logger::defaultSystemMessageHandler(void*, const LoggerMessageInfo& info)
 		endTerminalColor = "";
 	}
 
-	fprintf(out, "%s[%s][%s][%-15s]%s%s %s (%s:%d %s)%s\n", terminalColorBg, kMessageTypeTxt[U(info.m_type)],
-			info.m_subsystem ? info.m_subsystem : "N/A ", info.m_threadName, endTerminalColor, terminalColor,
-			info.m_msg, info.m_file, info.m_line, info.m_func, endTerminalColor);
+	fprintf(out, "%s[%s][%s]%s%s %s [%s:%d][%s][%s]%s\n", terminalColorBg, kMessageTypeTxt[U(info.m_type)],
+			info.m_subsystem ? info.m_subsystem : "N/A ", endTerminalColor, terminalColor, info.m_msg, info.m_file,
+			info.m_line, info.m_func, info.m_threadName, endTerminalColor);
 #elif ANKI_OS_WINDOWS
 	WORD attribs = 0;
 	FILE* out = nullptr;
@@ -227,10 +227,9 @@ void Logger::defaultSystemMessageHandler(void*, const LoggerMessageInfo& info)
 		SetConsoleTextAttribute(consoleHandle, attribs);
 
 		// Print
-		static_assert(Thread::kThreadNameMaxLength == 15, "See file");
-		fprintf(out, "[%s][%-4s][%-15s] %s (%s:%d %s)\n", kMessageTypeTxt[info.m_type],
-				info.m_subsystem ? info.m_subsystem : "N/A", info.m_threadName, info.m_msg, info.m_file, info.m_line,
-				info.m_func);
+		fprintf(out, "[%s][%-4s] %s [%s:%d][%s][%s]\n", kMessageTypeTxt[info.m_type],
+				info.m_subsystem ? info.m_subsystem : "N/A", info.m_msg, info.m_file, info.m_line, info.m_func,
+				info.m_threadName);
 
 		// Restore state
 		SetConsoleTextAttribute(consoleHandle, savedAttribs);
@@ -258,36 +257,11 @@ void Logger::defaultSystemMessageHandler(void*, const LoggerMessageInfo& info)
 	}
 
 	static_assert(Thread::kThreadNameMaxLength == 15, "See file");
-	__android_log_print(andMsgType, "AnKi", "[%s][%s][%-15s] %s (%s:%d %s)\n", kMessageTypeTxt[info.m_type],
-						info.m_subsystem ? info.m_subsystem : "N/A ", info.m_threadName, info.m_msg, info.m_file,
-						info.m_line, info.m_func);
+	__android_log_print(andMsgType, "AnKi", "[%s][%-4s] %s [%s:%d][%s][%s]\n", kMessageTypeTxt[info.m_type],
+						info.m_subsystem ? info.m_subsystem : "N/A ", info.m_msg, info.m_file, info.m_line, info.m_func,
+						info.m_threadName);
 #else
-	FILE* out = NULL;
-
-	switch(info.m_type)
-	{
-	case LoggerMessageType::kNormal:
-	case LoggerMessageType::kVerbose:
-		out = stdout;
-		break;
-	case LoggerMessageType::kError:
-		out = stderr;
-		break;
-	case LoggerMessageType::kWarning:
-		out = stderr;
-		break;
-	case LoggerMessageType::kFatal:
-		out = stderr;
-		break;
-	default:
-		ANKI_ASSERT(0);
-	}
-
-	fprintf(out, "[%s][%s][%" PRIx64 "] %s (%s:%d %s)\n", kMessageTypeTxt[info.m_type],
-			info.m_subsystem ? info.m_subsystem : "N/A ", info.m_tid, info.m_msg, info.m_file, info.m_line,
-			info.m_func);
-
-	fflush(out);
+#	error "Not implemented"
 #endif
 }