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

Add temporary log output

Browse Source 
Currently the kernel idle process is an infinite loop printing logs,
with no locking.
This commit is contained in:
Justin C. Miller
2019-03-19 00:51:33 -07:00
parent 39524b2b9f
commit 7fe1b7d1f5
5 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/libraries/kutil/logger.cpp
View File

@@ -9,17 +9,8 @@ namespace log {
using kutil::memset;
using kutil::memcpy;
struct entry_header
{
uint8_t bytes;
uint8_t area;
uint8_t level;
uint8_t sequence;
char message[0];
};
logger *logger::s_log = nullptr;
const char *logger::s_level_names[] = {"debug", " info", " warn", "error", "fatal"};
const char *logger::s_level_names[] = {"", "debug", " info", " warn", "error", "fatal"};
logger::logger() :
m_buffer(nullptr, 0),
@@ -73,18 +64,18 @@ void
logger::output(level severity, area_t area, const char *fmt, va_list args)
{
uint8_t buffer[256];
entry_header *header = reinterpret_cast<entry_header *>(buffer);
header->bytes = sizeof(entry_header);
entry *header = reinterpret_cast<entry *>(buffer);
header->bytes = sizeof(entry);
header->area = area;
header->level = static_cast<uint8_t>(severity);
header->severity = severity;
header->sequence = m_sequence++;
header->bytes +=
vsnprintf(header->message, sizeof(buffer) - sizeof(entry_header), fmt, args);
vsnprintf(header->message, sizeof(buffer) - sizeof(entry), fmt, args);
uint8_t *out;
size_t n = m_buffer.reserve(header->bytes, reinterpret_cast<void**>(&out));
if (n < sizeof(entry_header)) {
if (n < sizeof(entry)) {
m_buffer.commit(0); // Cannot even write the header, abort
return;
}
@@ -96,6 +87,28 @@ logger::output(level severity, area_t area, const char *fmt, va_list args)
m_buffer.commit(n);
}
size_t
logger::get_entry(void *buffer, size_t size)
{
void *out;
size_t out_size = m_buffer.get_block(&out);
entry *ent = reinterpret_cast<entry *>(out);
if (out_size == 0)
return 0;
kassert(out_size >= sizeof(entry), "Couldn't read a full entry");
if (out_size < sizeof(entry))
return 0;
kassert(size >= ent->bytes, "Didn't pass a big enough buffer");
if (size < ent->bytes)
return 0;
memcpy(buffer, out, ent->bytes);
m_buffer.consume(ent->bytes);
return ent->bytes;
}
#define LOG_LEVEL_FUNCTION(name) \
void name (area_t area, const char *fmt, ...) { \
logger *l = logger::s_log; \