Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added more debug info

Browse Source
This commit is contained in:
Alex 2023-03-06 17:38:43 +02:00
parent 8bbe1489db
commit eb93510e53
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
GUI/GraphicalUserInterface.cpp
View File

@ -12,6 +12,10 @@ extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_start;
extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end; extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end;
extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_size; extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_size;
#ifdef DEBUG
uint64_t FIi = 0, PDi = 0, PWi = 0, PWWi = 0, PCi = 0, mmi = 0;
#endif
namespace GraphicalUserInterface namespace GraphicalUserInterface
{ {
void GUI::FetchInputs() void GUI::FetchInputs()
@ -200,7 +204,8 @@ namespace GraphicalUserInterface
{ {
if (DesktopBufferRepaint) if (DesktopBufferRepaint)
{ {
PutRect(this->DesktopBuffer, this->Desktop, 0x404040); // PutRect(this->DesktopBuffer, this->Desktop, 0x404040);
memset(this->DesktopBuffer->Data, 0x404040, this->DesktopBuffer->Size);
DesktopBufferRepaint = false; DesktopBufferRepaint = false;
} }
// Well... I have to do some code optimization on DrawOverBitmap. It's too slow and it's not even using SIMD // Well... I have to do some code optimization on DrawOverBitmap. It's too slow and it's not even using SIMD
@ -534,13 +539,39 @@ namespace GraphicalUserInterface
*/ */
while (IsRunning) while (IsRunning)
{ {
#ifdef DEBUG
FIi = CPU::Counter();
#endif
FetchInputs(); FetchInputs();
#ifdef DEBUG
FIi = CPU::Counter() - FIi;
PDi = CPU::Counter();
#endif
PaintDesktop(); PaintDesktop();
#ifdef DEBUG
PDi = CPU::Counter() - PDi;
PWi = CPU::Counter();
#endif
PaintWidgets(); PaintWidgets();
#ifdef DEBUG
PWi = CPU::Counter() - PWi;
PWWi = CPU::Counter();
#endif
PaintWindows(); PaintWindows();
#ifdef DEBUG
PWWi = CPU::Counter() - PWWi;
PCi = CPU::Counter();
#endif
PaintCursor(); PaintCursor();
#ifdef DEBUG
PCi = CPU::Counter() - PCi;
mmi = CPU::Counter();
#endif
memcpy(Display->GetBuffer(200)->Buffer, this->BackBuffer->Data, this->BackBuffer->Size); memcpy(Display->GetBuffer(200)->Buffer, this->BackBuffer->Data, this->BackBuffer->Size);
Display->SetBuffer(200); Display->SetBuffer(200);
#ifdef DEBUG
mmi = CPU::Counter() - mmi;
#endif
} }
} }

47
Recovery/RecoveryMain.cpp
View File

@ -11,6 +11,13 @@ using Tasking::TaskTrustLevel;
using Tasking::TCB; using Tasking::TCB;
using namespace GraphicalUserInterface; using namespace GraphicalUserInterface;
#ifdef DEBUG
extern uint64_t FIi, PDi, PWi, PWWi, PCi, mmi;
#endif
extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_start;
extern uintptr_t _binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end;
namespace Recovery namespace Recovery
{ {
WidgetCollection *wdgDbgWin = nullptr; WidgetCollection *wdgDbgWin = nullptr;
@ -21,11 +28,17 @@ namespace Recovery
while (wdgDbgWin == nullptr || DbgWin == nullptr) while (wdgDbgWin == nullptr || DbgWin == nullptr)
TaskManager->Sleep(100); TaskManager->Sleep(100);
wdgDbgWin->CreateLabel({10, 0, 0, 0}, "Scheduler Ticks / Last Task Ticks"); wdgDbgWin->CreateLabel({5, 0, 0, 0}, "Scheduler Ticks / Last Task Ticks");
GraphicalUserInterface::Handle SchedLblHnd = wdgDbgWin->CreateLabel({10, 20, 0, 0}, "0000000000000000 / 0000000000000000"); GraphicalUserInterface::Handle SchedLblHnd = wdgDbgWin->CreateLabel({5, 15, 0, 0}, "0000000000000000 / 0000000000000000");
wdgDbgWin->CreateLabel({10, 60, 0, 0}, "Memory Usage"); wdgDbgWin->CreateLabel({5, 40, 0, 0}, "Memory Usage");
GraphicalUserInterface::Handle MemLblHnd = wdgDbgWin->CreateLabel({10, 80, 0, 0}, "0MB / 0GB (0MB reserved) 0%"); GraphicalUserInterface::Handle MemLblHnd = wdgDbgWin->CreateLabel({5, 55, 0, 0}, "0MB / 0GB (0MB reserved) 0%");
wdgDbgWin->CreateLabel({5, 95, 0, 0}, "GUI Info");
wdgDbgWin->CreateLabel({5, 110, 0, 0}, " Fetch Inputs / Paint Desktop / Paint Widgets");
GraphicalUserInterface::Handle GUI1LblHnd = wdgDbgWin->CreateLabel({5, 125, 0, 0}, "0000000000000000 / 0000000000000000 / 0000000000000000");
wdgDbgWin->CreateLabel({5, 140, 0, 0}, " Paint Windows / Paint Cursor / Memset & Update");
GraphicalUserInterface::Handle GUI2LblHnd = wdgDbgWin->CreateLabel({5, 155, 0, 0}, "0000000000000000 / 0000000000000000 / 0000000000000000");
DbgWin->AddWidget(wdgDbgWin); DbgWin->AddWidget(wdgDbgWin);
@ -37,8 +50,8 @@ namespace Recovery
{ {
sprintf(TicksText, "%016ld / %016ld", TaskManager->GetSchedulerTicks(), TaskManager->GetLastTaskTicks()); sprintf(TicksText, "%016ld / %016ld", TaskManager->GetSchedulerTicks(), TaskManager->GetLastTaskTicks());
wdgDbgWin->SetText(SchedLblHnd, TicksText); wdgDbgWin->SetText(SchedLblHnd, TicksText);
static int RefreshCounter = 100; static int RefreshMemCounter = 0;
if (RefreshCounter-- == 0) if (RefreshMemCounter-- == 0)
{ {
MemUsed = KernelAllocator.GetUsedMemory(); MemUsed = KernelAllocator.GetUsedMemory();
MemTotal = KernelAllocator.GetTotalMemory(); MemTotal = KernelAllocator.GetTotalMemory();
@ -46,10 +59,22 @@ namespace Recovery
int MemPercent = (MemUsed * 100) / MemTotal; int MemPercent = (MemUsed * 100) / MemTotal;
sprintf(TicksText, "%ldMB / %ldGB (%ldMB reserved) %d%%", TO_MB(MemUsed), TO_GB(MemTotal), TO_MB(MemReserved), MemPercent); sprintf(TicksText, "%ldMB / %ldGB (%ldMB reserved) %d%%", TO_MB(MemUsed), TO_GB(MemTotal), TO_MB(MemReserved), MemPercent);
wdgDbgWin->SetText(MemLblHnd, TicksText); wdgDbgWin->SetText(MemLblHnd, TicksText);
RefreshCounter = 100; RefreshMemCounter = 50;
} }
sprintf(TicksText, "Debug - %ldx%ld", DbgWin->GetPosition().Width, DbgWin->GetPosition().Height); sprintf(TicksText, "Debug - %ldx%ld", DbgWin->GetPosition().Width, DbgWin->GetPosition().Height);
DbgWin->SetTitle(TicksText); DbgWin->SetTitle(TicksText);
#ifdef DEBUG
static int RefreshGUIDbgCounter = 0;
if (RefreshGUIDbgCounter-- == 0)
{
sprintf(TicksText, "%016ld / %016ld / %016ld", FIi, PDi, PWi);
wdgDbgWin->SetText(GUI1LblHnd, TicksText);
sprintf(TicksText, "%016ld / %016ld / %016ld", PWWi, PCi, mmi);
wdgDbgWin->SetText(GUI2LblHnd, TicksText);
RefreshGUIDbgCounter = 5;
}
#endif
TaskManager->Sleep(100); TaskManager->Sleep(100);
} }
} }
@ -100,14 +125,16 @@ namespace Recovery
RecWin->AddWidget(wdgRecWin); RecWin->AddWidget(wdgRecWin);
Rect DebugWindow; Rect DebugWindow;
DebugWindow.Width = 370; DebugWindow.Width = 390;
DebugWindow.Height = 100; DebugWindow.Height = 190;
DebugWindow.Left = 25; DebugWindow.Left = 5;
DebugWindow.Top = 25; DebugWindow.Top = 25;
DbgWin = new Window(gui, DebugWindow, "Debug"); DbgWin = new Window(gui, DebugWindow, "Debug");
gui->AddWindow(DbgWin); gui->AddWindow(DbgWin);
wdgDbgWin = new WidgetCollection(DbgWin); wdgDbgWin = new WidgetCollection(DbgWin);
Video::Font *NewFont = new Video::Font(&_binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_start, &_binary_Files_tamsyn_font_1_11_Tamsyn7x14r_psf_end, Video::FontType::PCScreenFont2);
wdgDbgWin->ReplaceFont(NewFont);
TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (IP)RecoveryThreadWrapper)->SetPriority(Tasking::TaskPriority::Idle); TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (IP)RecoveryThreadWrapper)->SetPriority(Tasking::TaskPriority::Idle);
} }