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

Move more logging infrastructure into kutil

Browse Source
This commit is contained in:
Justin C. Miller
2019-04-06 11:46:53 -07:00
parent 863555ec6b
commit e050d6f151
6 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/kernel/log.cpp
View File

@@ -1,20 +1,12 @@
#include "kutil/constexpr_hash.h"
#include "kutil/memory.h"
#include "console.h"
#include "log.h"
#include "scheduler.h"
namespace logs {
static uint8_t log_buffer[0x10000];
static log::logger g_logger(log_buffer, sizeof(log_buffer));
#define LOG(name, lvl) \
log::area_t name = #name ## _h; \
const char * name ## _name = #name;
#include "log_areas.inc"
#undef LOG
static const uint8_t level_colors[] = {0x07, 0x07, 0x0f, 0x0b, 0x09};
static void
@@ -36,7 +28,7 @@ logger_task()
auto *ent = reinterpret_cast<log::logger::entry *>(buffer);
auto *cons = console::get();
//g_logger.set_immediate(nullptr);
g_logger.set_immediate(nullptr);
log::info(logs::task, "Starting kernel logger task");
scheduler &s = scheduler::get();
@@ -56,15 +48,8 @@ logger_task()
}
}
void init()
void logger_init()
{
new (&g_logger) log::logger(log_buffer, sizeof(log_buffer));
g_logger.set_immediate(output_log);
#define LOG(name, lvl) \
g_logger.register_area(name, name ## _name, log::level ::lvl);
#include "log_areas.inc"
#undef LOG
}
} // namespace logs

12
src/kernel/log.h
View File

@@ -3,15 +3,7 @@
#include "kutil/logger.h"
namespace log = kutil::log;
namespace logs = kutil::logs;
namespace logs {
#define LOG(name, lvl) extern log::area_t name;
#include "log_areas.inc"
#undef LOG
void init();
void logger_init();
void logger_task();
} // namespace logs

9
src/kernel/log_areas.inc
View File

@@ -1,9 +0,0 @@
LOG(apic, info);
LOG(device, info);
LOG(paging, debug);
LOG(driver, info);
LOG(memory, debug);
LOG(fs, info);
LOG(task, debug);
LOG(boot, debug);
LOG(syscall,debug);

4
src/kernel/main.cpp
View File

@@ -37,7 +37,7 @@ init_console()
cons->set_color(0x08, 0x00);
cons->puts(GIT_VERSION " booting...\n");
logs::init();
logger_init();
}
void
@@ -132,7 +132,7 @@ kernel_main(kernel_args *header)
syscall_enable();
scheduler *sched = new (&scheduler::get()) scheduler(devices->get_lapic());
sched->create_kernel_task(-1, logs::logger_task);
sched->create_kernel_task(-1, logger_task);
for (auto &f : ird.files()) {
if (f.executable())