archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 08:21:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename conlog gui file and set the logbuffer-consumed flag sooner

Browse source
This commit is contained in:
Peter Tissen 2014-06-27 06:01:40 +02:00
parent 21da317453
commit 1ad4380fab
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

179
rpcs3/Gui/ConLogFrame.cpp Normal file
View file

@ -0,0 +1,179 @@
#include "stdafx.h"
#include <wx/listctrl.h>
#include <fstream>
#include <vector>
#include <mutex>
#include "Ini.h"
#include "Utilities/Thread.h"
#include "Utilities/StrFmt.h"
#include "Utilities/Log.h"
#include "Utilities/Log.h"
#include "Gui/ConLogFrame.h"
#include "Utilities/BEType.h"
#include "Emu/Memory/Memory.h"
#include "Emu/System.h"
wxDEFINE_EVENT(EVT_LOG_COMMAND, wxCommandEvent);
//amount of memory in bytes used to buffer log messages for the gui
const int BUFFER_MAX_SIZE = 1024 * 1024;
//amount of characters in the TextCtrl text-buffer for the emulation log
const int GUI_BUFFER_MAX_SIZE = 1024 * 1024;
struct wxWriter : Log::LogListener
{
wxTextCtrl *m_log;
wxTextCtrl *m_tty;
wxTextAttr m_color_white;
wxTextAttr m_color_yellow;
wxTextAttr m_color_red;
MTRingbuffer<char, BUFFER_MAX_SIZE> messages;
std::atomic<bool> newLog;
bool inited;
wxWriter(wxTextCtrl* p_log, wxTextCtrl* p_tty) :
m_color_white(wxColour(255, 255, 255)) ,
m_color_yellow(wxColour(255, 255, 0)) ,
m_color_red(wxColour(255, 0, 0)) ,
m_log(p_log),
m_tty(p_tty),
newLog(false),
inited(false)
{
m_log->Bind(EVT_LOG_COMMAND, [this](wxCommandEvent &evt){this->write(evt);});
}
wxWriter(wxWriter &other) = delete;
//read messages from buffer and write them to the screen
void write(wxCommandEvent &)
{
if (messages.size() > 0)
{
messages.lockGet();
size_t size = messages.size();
std::vector<char> local_messages(size);
messages.popN(&local_messages.front(), size);
messages.unlockGet();
newLog = false;
u32 cursor = 0;
u32 removed = 0;
while (cursor < local_messages.size())
{
Log::LogMessage msg = Log::LogMessage::deserialize(local_messages.data() + cursor, &removed);
cursor += removed;
if (removed <= 0)
{
break;
}
wxTextCtrl *llogcon = (msg.mType == Log::TTY) ? m_tty : m_log;
if (llogcon)
{
switch (msg.mServerity)
{
case Log::Notice:
llogcon->SetDefaultStyle(m_color_white);
break;
case Log::Warning:
llogcon->SetDefaultStyle(m_color_yellow);
break;
case Log::Error:
llogcon->SetDefaultStyle(m_color_red);
break;
default:
break;
}
llogcon->AppendText(wxString(msg.mText));
}
}
if (m_log->GetLastPosition() > GUI_BUFFER_MAX_SIZE)
{
m_log->Remove(0, m_log->GetLastPosition() - (GUI_BUFFER_MAX_SIZE/2));
}
}
}
//put message into the log buffer
void log(Log::LogMessage msg)
{
u8 logLevel = Ini.HLELogLvl.GetValue();
if (msg.mType != Log::TTY && logLevel != 0)
{
if (logLevel > static_cast<u32>(msg.mServerity))
{
return;
}
}
size_t size = msg.size();
std::vector<char> temp_buffer(size);
msg.serialize(temp_buffer.data());
messages.pushRange(temp_buffer.begin(), temp_buffer.end());
if (!newLog.load())
{
newLog = true;
m_log->GetEventHandler()->QueueEvent(new wxCommandEvent(EVT_LOG_COMMAND));
}
}
};
BEGIN_EVENT_TABLE(LogFrame, wxPanel)
EVT_CLOSE(LogFrame::OnQuit)
END_EVENT_TABLE()
LogFrame::LogFrame(wxWindow* parent)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(600, 500))
, m_tabs(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS)
, m_log(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2))
, m_tty(new wxTextCtrl(&m_tabs, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH2))
{
listener.reset(new wxWriter(m_log,m_tty));
m_tty->SetBackgroundColour(wxColour("Black"));
m_log->SetBackgroundColour(wxColour("Black"));
m_tty->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
m_tabs.AddPage(m_log, "Log");
m_tabs.AddPage(m_tty, "TTY");
Log::LogManager::getInstance().getChannel(Log::GENERAL).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::LOADER).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::MEMORY).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::RSX).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::HLE).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::PPU).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::SPU).addListener(listener);
Log::LogManager::getInstance().getChannel(Log::TTY).addListener(listener);
wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL);
s_main->Add(&m_tabs, 1, wxEXPAND);
SetSizer(s_main);
Layout();
Show();
}
LogFrame::~LogFrame()
{
Log::LogManager::getInstance().getChannel(Log::GENERAL).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::LOADER).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::MEMORY).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::RSX).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::HLE).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::PPU).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::SPU).removeListener(listener);
Log::LogManager::getInstance().getChannel(Log::TTY).removeListener(listener);
}
bool LogFrame::Close(bool force)
{
return wxWindowBase::Close(force);
}
void LogFrame::OnQuit(wxCloseEvent& event)
{
event.Skip();
}