From d57a38d7fa9501a5ec17f75a1efaef9d62df5bef Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 22 Aug 2018 15:16:26 +0200 Subject: improving logging --- kernel/mem.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kernel/mem.c') diff --git a/kernel/mem.c b/kernel/mem.c index 444e52b..429587a 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -119,7 +119,7 @@ void* pmmngr_alloc_block () mem_free_blocks--; uint32_t addr = frame * PMMNGR_BLOCK_SIZE; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_FINE,"alloc block (%d) 0x%08X)",frame,addr); + log(FOOLOS_MODULE_NAME,99,"alloc block (%d) 0x%08X)",frame,addr); return (void*)addr; } @@ -137,12 +137,12 @@ void pmmngr_free_block (void* p) } else { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_ERROR,"free block (%d) 0x%08X)",frame,addr); + log(FOOLOS_MODULE_NAME,10,"free block (%d) 0x%08X)",frame,addr); panic(FOOLOS_MODULE_NAME,"trying to free, free physical mem!"); } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_FINE,"free block (%d) 0x%08X)",frame,addr); + log(FOOLOS_MODULE_NAME,99,"free block (%d) 0x%08X)",frame,addr); } @@ -151,7 +151,7 @@ uint32_t mem_init(multiboot_information *info) { if(info->flags&&1<<6) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"memory map of length %d provided by bootloader",info->mmap_length); + log(FOOLOS_MODULE_NAME,5,"memory map of length %d provided by bootloader",info->mmap_length); } else panic(FOOLOS_MODULE_NAME,"Unable to continue without memory map, sorry!"); @@ -160,8 +160,8 @@ uint32_t mem_init(multiboot_information *info) uint64_t memmap=info->mmap_addr; uint64_t length=info->mmap_length; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial stack at: 0x%08X- 0x%08X",stack_top,stack_bottom); + log(FOOLOS_MODULE_NAME,5,"kernel loaded at: 0x%08X- 0x%08X",kernel_start,kernel_end); + log(FOOLOS_MODULE_NAME,5,"initial stack at: 0x%08X- 0x%08X",stack_top,stack_bottom); // count available mem and track high_end of usable memory uint32_t total_mem=0, highest_end; @@ -174,7 +174,7 @@ uint32_t mem_init(multiboot_information *info) uint64_t mem_end=mmap->base_addr+mmap->length; #ifdef MEM_PRINT_MEMORYMAP - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%08X - %08X / type: %s, (size: %d)", + log(FOOLOS_MODULE_NAME,5,"%08X - %08X / type: %s, (size: %d)", (uint32_t)mem_start, (uint32_t)mem_end, memmap_type_to_string[mmap->type-1], mmap->size); #endif @@ -201,7 +201,7 @@ uint32_t mem_init(multiboot_information *info) multiboot_mod *mod=(multiboot_mod *)info->mods_addr; for(int i=0;imods_count;i++) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mod 0x%08X-0x%08X : %s", + log(FOOLOS_MODULE_NAME,5,"mod 0x%08X-0x%08X : %s", mod->mod_start,mod->mod_end, mod->string); mem_min_block=mod->mod_end/PMMNGR_BLOCK_SIZE+1; @@ -218,9 +218,9 @@ uint32_t mem_init(multiboot_information *info) // we deinit everything below mem_min_block anyway pmmngr_deinit_region(0,mem_min_block*PMMNGR_BLOCK_SIZE); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Usable ~%d / %d MB ",mem_free_blocks*4096/1024/1024,total_mem/1024/1024); + log(FOOLOS_MODULE_NAME,5,"Usable ~%d / %d MB ",mem_free_blocks*4096/1024/1024,total_mem/1024/1024); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO, + log(FOOLOS_MODULE_NAME,5, "Free 4K blocks: %d (first free: %d)",mem_free_blocks,mem_min_block); return mem_min_block; -- cgit v1.2.3