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

[kernel] Switch logger from bip to ring buffer

Browse Source 
A bip-buffer is good for producer/consumer systems, but ideally logs
will stay in the buffer until they're ousted because they need to be
overwritten. Now they're a regular ring buffer and every entry has an
incremental id. Consumers pass in the last id they've seen, and will get
the next log in the sequence.
This commit is contained in:
Justin C. Miller
2023-02-07 20:19:02 -08:00
parent 0a097ec7d3
commit 393db1e792
5 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user/srv.logger/main.cpp
View File

@@ -22,9 +22,10 @@ j6_handle_t g_handle_sys = j6_handle_invalid;
struct entry
{
uint8_t bytes;
uint8_t area;
uint8_t severity;
uint64_t id : 42;
uint16_t bytes : 11;
uint8_t severity : 4;
uint8_t area : 7;
char message[0];
};
@@ -79,9 +80,11 @@ log_pump_proc(j6_handle_t cout)
if (result != j6_status_ok)
return;
uint64_t seen = 0;
while (true) {
size_t size = buffer_size;
j6_status_t s = j6_system_get_log(g_handle_sys, message_buffer, &size);
j6_status_t s = j6_system_get_log(g_handle_sys, seen, message_buffer, &size);
if (s == j6_err_insufficient) {
free(message_buffer);
@@ -95,6 +98,7 @@ log_pump_proc(j6_handle_t cout)
const entry *e = reinterpret_cast<entry*>(message_buffer);
seen = e->id;
const char *area_name = area_names[e->area];
const char *level_name = level_names[e->severity];
uint8_t level_color = level_colors[e->severity];