ytshih/osc2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: log format

Browse Source
This commit is contained in:
Yi-Ting Shih
2025-04-15 17:49:58 +08:00
parent 3c03c9d383
commit 75edf55dd3
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/lib/mman.c
View File

@@ -47,8 +47,7 @@ void _pull(int idx, size_t sz)
{
if (LCH->state == PAGE_FREE && RCH->state == PAGE_FREE) {
if (CUR->state != PAGE_FREE) {
LOG("free page merged");
DEBUG_MEM((uint64_t)idx);
LOG("free page merged"); DEBUG_MEM((uint64_t)idx);
}
CUR->state = PAGE_FREE;
CUR->size = sz;
@@ -80,8 +79,7 @@ void mman_init()
mman_page_cnt = (mman_memory_end - mman_memory_start) >> 12;
mman_frame_array = simple_alloc((mman_page_cnt << 1) * sizeof(page_header_t));
LOG(mman_memory_start);
LOG(mman_memory_end);
LOG(mman_memory_start); LOG(mman_memory_end);
DEBUG_MEM((uint64_t)mman_page_cnt);
mman_frame_array[0] = (page_header_t){
@@ -185,9 +183,7 @@ void _free_page(uint64_t req, int idx, uint64_t l, uint64_t r)
return;
case PAGE_ALLOCATED:
if (req == l) {
LOG("page freed");
LOG(l);
DEBUG_MEM(r);
LOG("page freed"); LOG(l); DEBUG_MEM(r);
CUR->state = PAGE_FREE;
CUR->size = sz;
return;
@@ -229,9 +225,7 @@ void _reserve_page(uint64_t ql, uint64_t qr, int idx, uint64_t l, uint64_t r)
if (CUR->state != PAGE_FREE)
exit(ERR_INVALID_MEM);
LOG("page reserved");
LOG(l);
DEBUG_MEM(r);
LOG("page reserved"); LOG(l); DEBUG_MEM(r);
CUR->state = PAGE_RESERVED;
CUR->size = 0;
return;
@@ -258,8 +252,6 @@ void reserve_page(void *begin, void *end)
uint64_t ql = ((uint64_t)begin - (uint64_t)mman_memory_start) >> 12;
uint64_t qr = (((uint64_t)end - (uint64_t)mman_memory_start - 1) >> 12) + 1;
LOG("reserve page");
LOG(ql);
DEBUG_MEM(qr);
LOG("reserve page"); LOG(ql); DEBUG_MEM(qr);
_reserve_page(ql, qr, 0, 0, mman_page_cnt);
}