justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[util] Add util::format replacement for snprintf

Browse Source 
The printf library I have been using, while useful, has way more than I
need in it, and had comparably huge stack space requirements. This
change adds a new util::format() which is a replacement for snprintf,
but with only the features used by kernel logging.

The logger has been changed to use it, as well as the few instances of
snprintf in the interrupt handling code before calling kassert.

Also part of this change: the logger's (now vestigial) immediate output
handling code is removed, as well as the "sequence" field on log
message headers.
This commit is contained in:
Justin C. Miller
2022-03-13 17:59:56 -07:00
parent 24f324552a
commit bb0d30610e
8 changed files with 167 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/kernel/interrupts.cpp
View File

@@ -1,5 +1,5 @@
#include <stdint.h>
#include <util/format.h>
#include "assert.h"
#include "cpu.h"
@@ -10,7 +10,6 @@
#include "logger.h"
#include "memory.h"
#include "objects/process.h"
#include "printf/printf.h"
#include "scheduler.h"
#include "vm_space.h"
@@ -105,10 +104,10 @@ isr_handler(cpu_state *regs)
(!ti) ? "GDT" :
"LDT";
snprintf(message, sizeof(message), "General Protection Fault, error:0x%lx%s %s[%d]",
util::format({message, sizeof(message)}, "General Protection Fault, error:0x%lx%s %s[%d]",
regs->errorcode, regs->errorcode & 1 ? " external" : "", table, index);
} else {
snprintf(message, sizeof(message), "General Protection Fault, error:%lx%s",
util::format({message, sizeof(message)}, "General Protection Fault, error:%lx%s",
regs->errorcode, regs->errorcode & 1 ? " external" : "");
}
kassert(false, message, regs);
@@ -129,7 +128,7 @@ isr_handler(cpu_state *regs)
if (cr2 && space.handle_fault(cr2, ft))
break;
snprintf(message, sizeof(message),
util::format({message, sizeof(message)},
"Page fault: %016lx%s%s%s%s%s", cr2,
(regs->errorcode & 0x01) ? " present" : "",
(regs->errorcode & 0x02) ? " write" : "",
@@ -157,7 +156,7 @@ isr_handler(cpu_state *regs)
return;
default:
snprintf(message, sizeof(message), "Unknown interrupt 0x%lx", regs->interrupt);
util::format({message, sizeof(message)}, "Unknown interrupt 0x%lx", regs->interrupt);
kassert(false, message, regs);
}