From d57a38d7fa9501a5ec17f75a1efaef9d62df5bef Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 22 Aug 2018 15:16:26 +0200 Subject: improving logging --- fs/ext2.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'fs/ext2.c') diff --git a/fs/ext2.c b/fs/ext2.c index c313775..e685938 100644 --- a/fs/ext2.c +++ b/fs/ext2.c @@ -6,7 +6,6 @@ #include #include -#include "lib/logger/log.h" #include "fs.h" #include "ext2.h" @@ -119,7 +118,7 @@ int ext2_check(uint8_t *ram) ram_read(ptr,&super,sizeof(super),1); if(super.ext2_sig!=0xef53){ - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"addr: 0x%08X",ram); + log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram); panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected"); } } @@ -136,7 +135,7 @@ ext2_inode ext2_get_inode(uint8_t *ram,int inode_num) ram_read(ptr,&super,sizeof(super),1); if(super.ext2_sig!=0xef53) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"addr: 0x%08X",ram); + log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram); panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!"); } @@ -183,7 +182,7 @@ void* ext2_get_indirectstart_double(void *start, uint32_t block_size, uint32_t i int indirect1_idx=block_idx/(block_size/4); int idx=block_idx%(block_size/4); - //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bl: %d : %d / %d",block_idx,indirect1_idx, idx); + //log(FOOLOS_MODULE_NAME,5,"bl: %d : %d / %d",block_idx,indirect1_idx, idx); return ext2_get_indirectstart(start,block_size,dil[indirect1_idx],idx); } @@ -200,7 +199,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max) int sum=0; int count=0; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Loading %d.%d bytes",inode.size_high, inode.size_low); + log(FOOLOS_MODULE_NAME,5,"Loading %d.%d bytes",inode.size_high, inode.size_low); if(inode.size_high>0)panic(FOOLOS_MODULE_NAME,"inode with high.size unsupported, i am sorry."); @@ -247,7 +246,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max) } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Fool Check Sum: 0x%08X for %d bytes",sum,count); + log(FOOLOS_MODULE_NAME,5,"Fool Check Sum: 0x%08X for %d bytes",sum,count); } @@ -265,7 +264,7 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start) if(*path==0)final=true; else(*path=0); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); + log(FOOLOS_MODULE_NAME,20,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); fs_dirent dirs[25]; int count= ext2_read_dir(ram, inode_start,dirs,25); // get dir @@ -274,15 +273,15 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start) { if(!strcmp_l(first,dirs[i].name,0)) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file"); + log(FOOLOS_MODULE_NAME,20,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file"); if(final)return dirs[i].inode; return ext2_filename_to_inode_traverse(ram,last+1,dirs[i].inode); } - //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"no match: %s",dirs[i].name); + //log(FOOLOS_MODULE_NAME,5,"no match: %s",dirs[i].name); } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"file not found!"); + log(FOOLOS_MODULE_NAME,5,"file not found!"); return -1; @@ -306,7 +305,7 @@ int ext2_filename_to_inode(uint8_t *ram, char *path) int ext2_read_dir(uint8_t *ram, int inode_nr,fs_dirent *dirs,int max) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"read_dir : max: %d",max); + log(FOOLOS_MODULE_NAME,20,"read_dir : max: %d",max); ext2_inode inode=ext2_get_inode(ram,inode_nr); char buf[256]; @@ -354,7 +353,7 @@ int ext2_read_dir(uint8_t *ram, int inode_nr,fs_dirent *dirs,int max) i++; }while(buf[i-1]!=0); -// log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"name: %s\n",dirs[c].name); +// log(FOOLOS_MODULE_NAME,5,"name: %s\n",dirs[c].name); c++; -- cgit v1.2.3