From d57a38d7fa9501a5ec17f75a1efaef9d62df5bef Mon Sep 17 00:00:00 2001
From: Miguel <m.i@gmx.at>
Date: Wed, 22 Aug 2018 15:16:26 +0200
Subject: improving logging

---
 kernel/syscalls.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'kernel/syscalls.c')

diff --git a/kernel/syscalls.c b/kernel/syscalls.c
index db23a17..baa341f 100644
--- a/kernel/syscalls.c
+++ b/kernel/syscalls.c
@@ -1,6 +1,5 @@
 #define FOOLOS_MODULE_NAME "syscalls"
 
-#include "lib/logger/log.h"
 #include "lib/string/string.h"
 #include "fs/fs.h"
 #include "fs/ext2.h"
@@ -56,7 +55,7 @@ int syscall_gettimeofday(struct timeval *tv, struct timezone *tz)
 int syscall_lseek(int file,int ptr,int dir) 
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"lseek (file=%d, ptr=%d, dir=%d)", file,ptr,dir);
+    log(FOOLOS_MODULE_NAME,5,"lseek (file=%d, ptr=%d, dir=%d)", file,ptr,dir);
     #endif
 
     panic(FOOLOS_MODULE_NAME,"unhandled syscall: lseek");
@@ -68,7 +67,7 @@ int syscall_lseek(int file,int ptr,int dir)
 int syscall_write(int file, char *buf, int len)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"[%d] write(file=%d, buf=0x%08X, len=%d)", task_get_current_pid(),file,buf,len);
+    log(FOOLOS_MODULE_NAME,5,"[%d] write(file=%d, buf=0x%08X, len=%d)", task_get_current_pid(),file,buf,len);
     #endif
 
     for(int i=0;i<len;i++)
@@ -82,7 +81,7 @@ int syscall_write(int file, char *buf, int len)
 int syscall_read(int file, char *buf, int len)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"read(file=%d, buf=0x%08X, len=%d)", file,buf,len);
+    log(FOOLOS_MODULE_NAME,5,"read(file=%d, buf=0x%08X, len=%d)", file,buf,len);
     #endif
     //file 0 = stdin ,  file 1 = stdout , file 2 = stderr
 
@@ -107,7 +106,7 @@ int syscall_read(int file, char *buf, int len)
 int syscall_readdir(const char *name,fs_dirent *dirs,int max)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"readdir(name=0x%08X, dirs=0x%08X,  %d)", name,dirs,max);
+    log(FOOLOS_MODULE_NAME,5,"readdir(name=0x%08X, dirs=0x%08X,  %d)", name,dirs,max);
     #endif
 
     return fs_readdir(name,dirs,max);
@@ -118,7 +117,7 @@ int syscall_poll(int file)
 {
     file=2; //workaround
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"has data waiting?");
+    log(FOOLOS_MODULE_NAME,5,"has data waiting?");
     #endif
 
     return fd_has(&fds[file]);
@@ -128,7 +127,7 @@ int syscall_poll(int file)
 int syscall_tune(int v1,int v2, int v3)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"tuning request");
+    log(FOOLOS_MODULE_NAME,5,"tuning request");
     #endif
 
     // osbolete
@@ -150,15 +149,15 @@ int syscall_tune(int v1,int v2, int v3)
 
 int copy_args(char **in, char **out)
 {
-    //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"copy_args(0x%08x, 0x%08X)",in,out);
+    //log(FOOLOS_MODULE_NAME,5,"copy_args(0x%08x, 0x%08X)",in,out);
     int count=0;
     while(in[count]!=NULL)
     {
-//	log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"args(0x%08x: %s)",in[count],out);
+//	log(FOOLOS_MODULE_NAME,5,"args(0x%08x: %s)",in[count],out);
 	count++;
     };
 
-  //  log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"copy_args : count: %d",count);
+  //  log(FOOLOS_MODULE_NAME,5,"copy_args : count: %d",count);
     
     char **pos=out;
     pos+=sizeof(char **)*(count+1); 
@@ -180,7 +179,7 @@ int copy_args(char **in, char **out)
 int syscall_execve(char *name, char **argv, char **env)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"execve (name=0x%08X(%s), argvs=0x%08X,  env=0x%08X)", name,name,argv,env);
+    log(FOOLOS_MODULE_NAME,5,"execve (name=0x%08X(%s), argvs=0x%08X,  env=0x%08X)", name,name,argv,env);
     #endif
 
     int arg_count=0;
@@ -212,14 +211,14 @@ int syscall_execve(char *name, char **argv, char **env)
     if(!entry_global)
     {
 	#ifdef LOG_SYSCALLS
-	log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"execve: bailing out!");
+	log(FOOLOS_MODULE_NAME,5,"execve: bailing out!");
 	#endif
 	return -1; // errror loading
     }
 
     /* try to move this to asm */
     //    asm volatile("jmp ."); // loop forever
-    //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"returning to jump addy (0x%08X)", entry_global);
+    //log(FOOLOS_MODULE_NAME,5,"returning to jump addy (0x%08X)", entry_global);
 
     asm volatile("mov $0x8fff000,%esp"); // set stack at high end of process image
 
@@ -248,7 +247,7 @@ int get_max_fd()
 int syscall_open(char *name, int flags, int mode)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"open (name=0x%08X(\"%s\"), flags=%d,  mode=%d)",name, name,flags,mode);
+    log(FOOLOS_MODULE_NAME,5,"open (name=0x%08X(\"%s\"), flags=%d,  mode=%d)",name, name,flags,mode);
     #endif
     
     if( next_fifo>=MAX_FIFOS || next_fd>=MAX_FD)panic(FOOLOS_MODULE_NAME,"we ran out of fd's or fifo's");
@@ -287,7 +286,7 @@ int syscall_open(char *name, int flags, int mode)
 int syscall_close(int file,int none1,int none2)  
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"close (file=%d)", file);
+    log(FOOLOS_MODULE_NAME,5,"close (file=%d)", file);
     #endif
 
     //if(file!=0&&file!=1&&file!=2)
@@ -300,7 +299,7 @@ int syscall_close(int file,int none1,int none2)
 int syscall_isatty(int file,int none1,int none2)  
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"isatty (file=%d)", file);
+    log(FOOLOS_MODULE_NAME,5,"isatty (file=%d)", file);
     #endif
 
     return 1;
@@ -318,7 +317,7 @@ uint32_t syscall_sbrk(int incr, int none1, int none2)
     task_set_brk(alloc);
 
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"sbrk (incr=%d) = 0x%08X", incr,oldalloc);
+    log(FOOLOS_MODULE_NAME,5,"sbrk (incr=%d) = 0x%08X", incr,oldalloc);
     #endif
 
     return oldalloc;
@@ -328,7 +327,7 @@ uint32_t syscall_sbrk(int incr, int none1, int none2)
 int syscall_stat(const char *path, struct stat *st,int none)
 {
     #ifdef LOG_SYSCALLS
-    log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"stat (path=0x%08X,stat=0x%08X)", path,st);
+    log(FOOLOS_MODULE_NAME,5,"stat (path=0x%08X,stat=0x%08X)", path,st);
     #endif
 
     st->st_mode = S_IFCHR;
-- 
cgit v1.2.3