From a975053605a0f041fd2003792d81c80391527e71 Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Mon, 21 Dec 2009 00:11:00 +0100 Subject: Made status bar into a namespace, and added functionnalities --- Source/Kernel/Core/SB.ns.cpp | 101 +++++++++++++++++++++ Source/Kernel/Core/SB.ns.h | 16 ++++ Source/Kernel/Core/Sys.ns.cpp | 7 ++ Source/Kernel/Core/kmain.wtf.cpp | 72 +++++++-------- .../Kernel/Devices/Display/VESADisplay.class.cpp | 2 +- Source/Kernel/Makefile | 1 + Source/Kernel/TaskManager/Process.class.cpp | 2 + Source/Kernel/TaskManager/Task.ns.h | 3 + Source/Kernel/VTManager/SimpleVT.class.cpp | 2 + Source/Kernel/VTManager/SimpleVT.class.h | 4 +- 10 files changed, 167 insertions(+), 43 deletions(-) create mode 100644 Source/Kernel/Core/SB.ns.cpp create mode 100644 Source/Kernel/Core/SB.ns.h (limited to 'Source/Kernel') diff --git a/Source/Kernel/Core/SB.ns.cpp b/Source/Kernel/Core/SB.ns.cpp new file mode 100644 index 0000000..62714a1 --- /dev/null +++ b/Source/Kernel/Core/SB.ns.cpp @@ -0,0 +1,101 @@ +#include "SB.ns.h" +#include +#include +#include +#include + +namespace SB { + +SimpleVT *sb = NULL; + +String msg; + +u16int boot_progress = 0; +bool gone_multi = false; + +Mutex lock(MUTEX_FALSE); + +void init() { + sb = new SimpleVT(1, 80, STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR); + sb->map(0, 0); + sb->hideCursor(); +} + +void reinit() { + if (!gone_multi) return; + lock.waitLock(); + delete sb; + sb = new SimpleVT(1, Disp::mode.textCols, STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR); + sb->map(0, 0); + sb->hideCursor(); + lock.unlock(); +} + +void drawprogress(const String& s) { + *sb << "\nMelon is loading : {"; + for (u32int i = 0; i < boot_progress; i++) *sb << ":"; + *sb << "."; + sb->moveCursor(0, 45); + *sb << "}"; + sb->moveCursor(0, 51); + *sb << "[" << s; + sb->moveCursor(0, 78); + *sb << "]"; +} + +void drawnormal() { + *sb << "\n [Up:" << (s64int)Time::uptime() << "s"; + sb->moveCursor(0, 10); + *sb << "] [Mem:" << (s64int)PhysMem::free() << "/" << (s64int)PhysMem::total(); + sb->moveCursor(0, 28); + *sb << "] [Proc.:" << (s64int)Task::processes->size(); + sb->moveCursor(0, 39); + *sb << "] [Threads:" << (s64int)Task::threads->size(); + sb->moveCursor(0, 52); + *sb << "] [" << msg; + sb->moveCursor(0, sb->width() - 2); + *sb << "]"; +} + +u32int thread(void*) { + while (!gone_multi); //Synchronize + while (1) { + lock.waitLock(); + if (boot_progress != 0) { + drawprogress(msg); + } else { + drawnormal(); + } + lock.unlock(); + Task::currThread()->sleep(100); + } + return 0; +} + +void gomulti() { + new Thread(thread, 0, true); + gone_multi = true; +} + +void progress(const String& s) { + if (gone_multi) { + lock.waitLock(); + boot_progress++; + msg = s; + lock.unlock(); + } else { + boot_progress++; + drawprogress(s); + } +} + +void message(const String& s) { + if (!gone_multi) return; + lock.waitLock(); + boot_progress = 0; + msg = s; + drawnormal(); + lock.unlock(); +} + +} //END NS diff --git a/Source/Kernel/Core/SB.ns.h b/Source/Kernel/Core/SB.ns.h new file mode 100644 index 0000000..687be02 --- /dev/null +++ b/Source/Kernel/Core/SB.ns.h @@ -0,0 +1,16 @@ +#ifndef DEF_SB_NS_H +#define DEF_SB_NS_H + +//StatusBar namespace :) +#include + +namespace SB { + void init(); //Setup status bar with default 80col configuration + void reinit(); //Setup status bar querying Disp:: for text screen width + void gomulti(); //Launch new thread for status bar + void progress(const String& s); //Update progress + void message(const String& s); //Set a message + +} + +#endif diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index 59da244..05e0d7d 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #define DEBUGVT(x) SimpleVT *x = new SimpleVT(4, 56, PANIC_FGCOLOR, PANIC_BGCOLOR); x->map(); x->put('\n'); @@ -95,6 +96,7 @@ void stackTrace(u32int ebp, VirtualTerminal& vt, u32int maxframes, bool isUser) //Used by PANIC() macro (see common.wtf.h) void panic(char *message, char *file, u32int line) { + SB::message("PANIC"); asm volatile("cli"); DEBUGVT(vt); @@ -106,6 +108,7 @@ void panic(char *message, char *file, u32int line) { } void panic(char *message, registers_t *regs, char *file, u32int line) { + SB::message("PANIC"); asm volatile("cli"); SimpleVT vt(15, 70, BSOD_FGCOLOR, BSOD_BGCOLOR); @@ -129,6 +132,7 @@ void panic(char *message, registers_t *regs, char *file, u32int line) { //Used by ASSERT() macro (see common.wtf.h) void panic_assert(char *file, u32int line, char *desc) { + SB::message("ASSERTION FAILED"); asm volatile("cli"); DEBUGVT(vt); @@ -140,17 +144,20 @@ void panic_assert(char *file, u32int line, char *desc) { } void shutdown_cleanup() { + SB::message("Cleaning up system"); asm volatile("cli"); Log::close(); } void reboot() { shutdown_cleanup(); + SB::message("Rebooting..."); outb(0x64, 0xFE); } void halt() { shutdown_cleanup(); + SB::message("Halting"); String message("MELON SEZ : KTHXBYE, U CAN NAOW TURNZ OFF UR COMPUTER."); SimpleVT vt(3, message.size() + 16, HALT_FGCOLOR, HALT_BGCOLOR); vt.map(); diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 2dc0377..83fca7b 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -107,6 +108,7 @@ void selectVideoMode(SimpleVT& v) { u32int n = answer.toInt(); v.unmap(); if (n >= 0 and n < Disp::modes.size() and Disp::setMode(Disp::modes[n])) { + SB::reinit(); return; } else { Disp::setMode(Disp::modes[1]); @@ -116,29 +118,9 @@ void selectVideoMode(SimpleVT& v) { } } -#define STATUS(stat) { \ - progress++; \ - kvt->setColor(STATUSBAR_FGCOLOR, STATUSBAR_BGCOLOR); \ - line = kvt->csrlin(); \ - kvt->moveCursor(0, 0); \ - *kvt << "Melon is loading : {"; \ - for (u32int i = 0; i < progress; i++) *kvt << ":"; \ - *kvt << ". "; \ - kvt->moveCursor(0, 42); \ - *kvt << "} "; \ - kvt->moveCursor(0, 51); \ - *kvt << "[" << stat; \ - kvt->moveCursor(0, 78); \ - *kvt << "] "; \ - kvt->setColor(KVT_FGCOLOR, KVT_BGCOLOR); \ - kvt->moveCursor(line, 0); \ -} - void kmain(multiboot_info_t* mbd, u32int magic) { DEBUG("Entering kmain."); - u16int progress = 0, line; //For logger - if (magic != MULTIBOOT_BOOTLOADER_MAGIC) { Mem::placementAddress = (u32int)&end; //Setup basic stuff so that PANIC will work VGATextOutput *vgaout = new VGATextOutput(); @@ -163,37 +145,41 @@ void kmain(multiboot_info_t* mbd, u32int magic) { VGATextOutput *vgaout = new VGATextOutput(); Disp::setText(vgaout); + SB::init(); + //Create a VT for logging what kernel does - kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR); - kvt->map(0, 0); - *kvt << "Melon is loading :\n"; + SB::progress("Create kernel VT"); + kvt = new ScrollableVT(24, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR); + kvt->map(1, 0); + kvt->moveCursor(0, 0); - STATUS("IDT"); + SB::progress("IDT"); IDT::init(); //Setup interrupts - STATUS("Paging"); + SB::progress("Paging"); u32int totalRam = ((mbd->mem_upper + mbd->mem_lower) * 1024); PhysMem::initPaging(totalRam); //Setup paging - STATUS("GDT"); + SB::progress("GDT"); GDT::init(); //Initialize real GDT, not fake one from loader.wtf.asm PhysMem::removeTemporaryPages(); //Remove useless page mapping - STATUS("Heap"); + SB::progress("Heap"); Mem::createHeap(); //Create kernel heap Dev::registerDevice(vgaout); - STATUS("Timer"); + SB::progress("Timer"); Dev::registerDevice(new Timer()); //Initialize timer String kcmdline((char*)mbd->cmdline); - STATUS("Multitasking"); + SB::progress("Multitasking"); Task::initialize(kcmdline, kvt); //Initialize multitasking + SB::gomulti(); asm volatile("sti"); //*************************************** PARSE COMMAND LINE - STATUS("Parse command line"); + SB::progress("Parse command line"); Vector opts = kcmdline.split(" "); String keymap = "builtin", init = "/System/Applications/PaperWork.app"; String root = "ramfs:0"; @@ -210,15 +196,15 @@ void kmain(multiboot_info_t* mbd, u32int magic) { //*************************************** DEVICE SETUP - STATUS("Keyboard"); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver + SB::progress("Keyboard"); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver Kbd::setFocus(kvt); //Set focus to virtual terminal - STATUS("VESA"); if (enableVESA) Dev::registerDevice(new VESADisplay()); - STATUS("Floppy"); FloppyController::detect(); - STATUS("Hard disk drives"); ATAController::detect(); + SB::progress("VESA"); if (enableVESA) Dev::registerDevice(new VESADisplay()); + SB::progress("Floppy"); FloppyController::detect(); + SB::progress("Hard disk drives"); ATAController::detect(); //*************************************** MOUNT FILESYSTEMS - STATUS("Root filesystem"); + SB::progress("Root filesystem"); { // mount root filesystem if (!VFS::mount(String("/:") += root, kvt, mbd)) PANIC("Cannot mount root filesystem."); } @@ -226,7 +212,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { cwd = VFS::getRootNode(); Task::currProcess()->setCwd(cwd); - STATUS("File systems"); + SB::progress("File systems"); // mount other filesystems for (u32int i = 0; i < mount.size(); i++) { VFS::mount(mount[i], kvt, mbd); @@ -243,35 +229,38 @@ void kmain(multiboot_info_t* mbd, u32int magic) { //*************************************** LOAD SYSTEM STUFF - STATUS("Logging"); + SB::progress("Logging"); Log::init(KL_STATUS); //Setup logging Log::log(KL_STATUS, "kmain : Melon booting."); if (keymap != "builtin") { - STATUS("Keymap"); + SB::progress("Keymap"); if (!Kbd::loadKeymap(keymap)) Log::log(KL_WARNING, String("WARNING : Could not load keymap ") += keymap += ", using built-in keymap instead."); } - STATUS("Users"); + SB::progress("Users"); Usr::load(); //Setup user managment Log::log(KL_STATUS, "kmain : User list loaded"); if (init.empty()) { - STATUS("= LAUNCHING KERNEL SHELL ="); + SB::progress("Start kernel shell"); *kvt << "\n"; new KernelShell(cwd, kvt); + SB::message("Melon is running \\o/"); while (KernelShell::getInstances() > 0) { Task::currThread()->sleep(100); } Sys::halt(); } else { - STATUS("= VIDEO MODE DETECTION ="); + SB::progress("Video mode selection"); selectVideoMode(*kvt); + SB::progress("Logo setup"); //Create a VT for handling the Melon bootup logo SimpleVT *melonLogoVT = new SimpleVT(melonLogoLines, melonLogoCols, TXTLOGO_FGCOLOR, TXTLOGO_BGCOLOR); melonLogoVT->map(1); new Thread(logoAnimation, (void*)melonLogoVT, true); + SB::progress("Launch INIT"); Process* p = Process::run(init, 0); if (p == 0) { PANIC((char*)(u8int*)ByteArray(String("Could not launch init : ") += init)); @@ -284,6 +273,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { p->setInVT(vt); p->setOutVT(vt); p->start(); + SB::message("Init started"); while (p->getState() != P_FINISHED) Task::currThread()->sleep(100); PANIC("Init has terminated"); } diff --git a/Source/Kernel/Devices/Display/VESADisplay.class.cpp b/Source/Kernel/Devices/Display/VESADisplay.class.cpp index 2992910..d06aaee 100644 --- a/Source/Kernel/Devices/Display/VESADisplay.class.cpp +++ b/Source/Kernel/Devices/Display/VESADisplay.class.cpp @@ -313,7 +313,7 @@ bool VESADisplay::textScroll(u16int line, u16int col, u16int height, u16int widt for (u32int i = 0; i < width; i++) { drawChar(line + height - 1, col + i, " ", color); } - m_csrBuff.line--; + if (m_csrBuff.line == line + height - 1) m_csrBuff.line--; drawCsr(); return true; } diff --git a/Source/Kernel/Makefile b/Source/Kernel/Makefile index 0f244d5..6a44ecf 100644 --- a/Source/Kernel/Makefile +++ b/Source/Kernel/Makefile @@ -14,6 +14,7 @@ Objects = Core/loader.wtf.o \ Core/kmain.wtf.o \ Core/Sys.ns.o \ Core/Log.ns.o \ + Core/SB.ns.o \ MemoryManager/Mem.ns.o \ MemoryManager/PhysMem.ns.o \ MemoryManager/GDT.wtf.o \ diff --git a/Source/Kernel/TaskManager/Process.class.cpp b/Source/Kernel/TaskManager/Process.class.cpp index bca5f1c..4c23df0 100644 --- a/Source/Kernel/TaskManager/Process.class.cpp +++ b/Source/Kernel/TaskManager/Process.class.cpp @@ -76,12 +76,14 @@ Process::Process(String binfile, u32int uid) : Ressource(PRIF_OBJTYPE, m_callTab m_userHeap = new Heap(); u32int heapIdxSize = PhysMem::total() * 16 + 0x10000; m_userHeap->create(USERHEAPSTART, USERHEAPINITSIZE + heapIdxSize, heapIdxSize, m_pagedir, true, true); + Task::registerProcess(this); } Process::~Process() { exit(); //Kill all threads delete m_pagedir; delete m_userHeap; + Task::unregisterProcess(this); } void Process::start() { diff --git a/Source/Kernel/TaskManager/Task.ns.h b/Source/Kernel/TaskManager/Task.ns.h index 056e4c0..4d2a48d 100644 --- a/Source/Kernel/TaskManager/Task.ns.h +++ b/Source/Kernel/TaskManager/Task.ns.h @@ -9,6 +9,9 @@ namespace Task { Thread* currThread(); Process* currProcess(); + extern SimpleList *processes; + extern SimpleList *threads; + void initialize(String cmdline, VirtualTerminal *vt); //cmdline should be the bootloader kernel command line, if anybody needs it void doSwitch(); void triggerSwitch(); diff --git a/Source/Kernel/VTManager/SimpleVT.class.cpp b/Source/Kernel/VTManager/SimpleVT.class.cpp index 4a16b54..28f9f98 100644 --- a/Source/Kernel/VTManager/SimpleVT.class.cpp +++ b/Source/Kernel/VTManager/SimpleVT.class.cpp @@ -9,6 +9,7 @@ SimpleVT::SimpleVT(u32int rows, u32int cols, u8int fgcolor, u8int bgcolor) : Vir m_rows = rows; m_cols = cols; m_mapped = false; + m_hideCursor = false; setColor(fgcolor, bgcolor); clear(); @@ -87,6 +88,7 @@ void SimpleVT::scroll() { void SimpleVT::updateCursor() { if (!m_mapped) return; + if (m_hideCursor) return; Disp::moveCursor(m_csrlin + m_maprow, m_csrcol + m_mapcol); } diff --git a/Source/Kernel/VTManager/SimpleVT.class.h b/Source/Kernel/VTManager/SimpleVT.class.h index 6125d10..8639a82 100644 --- a/Source/Kernel/VTManager/SimpleVT.class.h +++ b/Source/Kernel/VTManager/SimpleVT.class.h @@ -10,7 +10,7 @@ class SimpleVT : public VirtualTerminal { u8int m_color; u32int m_maprow, m_mapcol; - bool m_mapped; + bool m_mapped, m_hideCursor; u32int m_csrlin, m_csrcol; @@ -27,6 +27,8 @@ class SimpleVT : public VirtualTerminal { u8int csrlin() { return m_csrlin; } u8int csrcol() { return m_csrcol; } + void hideCursor(bool hide = true) { m_hideCursor = hide; } + void map(s32int row = -1, s32int col = -1); void unmap(); virtual void redraw(); -- cgit v1.2.3