Skip to content

Commit 1cf346b

Browse files
committed
kernel: Prettify logs
1 parent 74afaa6 commit 1cf346b

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

kernel/boot/multiboot.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,34 @@
44

55
static inline void multiboot_dump_mmap(multiboot_info_t *info)
66
{
7+
#ifdef DEBUG
78
if (info->flags & MULTIBOOT_FLAG_MEM_MAP) {
89
klog(LOG_DEBUG, "mem map len : 0x%x\n", info->mmap_len);
910
klog(LOG_DEBUG, "mem map addr : 0x%x\n", info->mmap_addr);
1011

1112
int i = 0;
13+
klog(LOG_DEBUG, LOG_HRULE);
1214
klog(LOG_DEBUG, " | size | base | length | type\n");
13-
klog(LOG_DEBUG, "------------------------------------------------------------------\n");
15+
klog(LOG_DEBUG, LOG_HRULE);
1416
FOREACH_MEMORY_MAP(mmap, info) {
1517
klog(LOG_DEBUG, " %d | 0x%x | 0x%x %x | 0x%x %x | %d\n",
1618
i, mmap->size, mmap->base_addr_high, mmap->base_addr_low,
1719
mmap->len_high, mmap->len_low, mmap->type);
1820
i++;
1921
}
22+
klog(LOG_DEBUG, LOG_HRULE);
2023
} else {
2124
klog(LOG_WARN, "memory map not set\n");
2225
}
26+
#endif
2327
}
2428

25-
void multiboot_dump_info(multiboot_info_t *info)
29+
inline void multiboot_dump_info(multiboot_info_t *info)
2630
{
27-
#ifndef DEBUG
28-
return;
29-
#endif
30-
klog(LOG_DEBUG, "------------ MULTIBOOT DUMP ------------\n");
31+
#ifdef DEBUG
32+
klog(LOG_DEBUG, LOG_HRULE);
33+
klog(LOG_DEBUG, "MULTIBOOT DUMP START\n");
34+
klog(LOG_DEBUG, LOG_HRULE);
3135
klog(LOG_DEBUG, "multiboot header: 0x%x\n", info);
3236
klog(LOG_DEBUG, "flags : 0x%x\n", info->flags);
3337
klog(LOG_DEBUG, "mem lower : 0x%x\n", info->mem_lower);
@@ -39,5 +43,9 @@ void multiboot_dump_info(multiboot_info_t *info)
3943
multiboot_dump_mmap(info);
4044
klog(LOG_DEBUG, "config table : 0x%x\n", info->config_table);
4145
klog(LOG_DEBUG, "bootloader name : %s\n", info->bootloader_name);
42-
klog(LOG_DEBUG, "----------------------------------------\n");
46+
klog(LOG_DEBUG, LOG_HRULE);
47+
klog(LOG_DEBUG, "MULTIBOOT DUMP END\n");
48+
klog(LOG_DEBUG, LOG_HRULE);
49+
klog(LOG_DEBUG, "\n");
50+
#endif
4351
}

kernel/include/logger.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
# define LOG_INFO 2
99
# define LOG_DEBUG 3
1010

11+
# define LOG_HRULE \
12+
"------------------------------------------------------------------------\n"
13+
1114
# ifdef DEBUG
1215
# include<kio.h>
1316
# define klog(LOG_LEVEL, FORMAT, ...) \

kernel/mm/page_frame.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ int page_frame_init(multiboot_info_t *multiboot_info)
6868
num_frames_bitset_frames =
6969
NUM_OF_A_PER_B(num_frames_bitset_lines, BITSET_LINES_PER_FRAME);
7070

71-
klog(LOG_DEBUG, "Number of frames: %d\n", num_frames);
72-
klog(LOG_DEBUG, "Number of bitset lines: %d\nNumber of bitset pages: %d\n",
73-
num_frames_bitset_lines, num_frames_bitset_frames);
74-
7571
/* mark all free pages */
7672
FOREACH_MEMORY_MAP(mmap, multiboot_info) {
7773
if (mmap->type == MULTIBOOT_MEM_TYPE_FREE) {
@@ -96,7 +92,13 @@ void page_frame_dump_map(void)
9692
{
9793
#ifdef DEBUG
9894
uint32_t *frame = frames_bitset;
99-
klog(LOG_DEBUG, "frames_bitset addr: 0x%x\n", frame);
95+
klog(LOG_DEBUG, LOG_HRULE);
96+
klog(LOG_DEBUG, "PAGE FRAMES MEMORY DUMP START\n");
97+
klog(LOG_DEBUG, LOG_HRULE);
98+
klog(LOG_DEBUG, "Number of frames: %d\n", num_frames);
99+
klog(LOG_DEBUG, "Number of bitset lines: %d\n", num_frames_bitset_lines);
100+
klog(LOG_DEBUG, "Number of bitset pages: %d\n", num_frames_bitset_frames);
101+
klog(LOG_DEBUG, "Frames bitmap at 0x%x\n", frame);
100102
for (int j = 0; j < num_frames_bitset_lines; j++) {
101103
klog(LOG_DEBUG, "\n%x: ", FRAME_NUM_TO_PAGE_ADDR(j * FRAMES_PER_BITSET));
102104
for (int k = 0; k < FRAMES_PER_BITSET; k++) {
@@ -108,6 +110,9 @@ void page_frame_dump_map(void)
108110
}
109111
}
110112
klog(LOG_DEBUG, "\n");
113+
klog(LOG_DEBUG, LOG_HRULE);
114+
klog(LOG_DEBUG, "PAGE FRAMES MEMORY DUMP END\n");
115+
klog(LOG_DEBUG, LOG_HRULE);
111116
#endif
112117
}
113118

0 commit comments

Comments
 (0)