diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-12-04 00:29:38 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-12-04 00:29:38 +0100 |
| commit | c8e5ee77ee32b0905f611851eb274bd18aaea071 (patch) | |
| tree | 52380e91d6cc1aeb57e35f8eaf6d201e3b5dcd42 | |
| parent | 427613498108fda93f7cbfcb3a9417da50a23958 (diff) | |
mainly improve logging
| -rw-r--r-- | kernel/syscalls.c | 9 | ||||
| -rw-r--r-- | kernel/task.c | 4 | ||||
| -rw-r--r-- | kernel/vmem.c | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/kernel/syscalls.c b/kernel/syscalls.c index 3ec4cfa..d57fe80 100644 --- a/kernel/syscalls.c +++ b/kernel/syscalls.c @@ -136,7 +136,6 @@ int syscall_execve(char *name, char **argv1, char **env1) int arg_count=0; do{arg_count++;}while(argv1[arg_count]!=NULL); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d %d", env_count, arg_count); char **env=temp; temp+=sizeof(char **)*(env_count+1); char **argv=temp; @@ -159,13 +158,11 @@ int syscall_execve(char *name, char **argv1, char **env1) char *arg_var=temp; temp+=sizeof(char *)*(l+1); memcpy(arg_var,argv1[i],l+1); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"arg_var: 0x%08X",arg_var); argv[i]=arg_var; i++; }while(argv1[i]!=NULL); argv[i]=NULL; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d %d", env_count, arg_count); #ifdef LOG_SYSCALLS log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"execve (name=0x%08X(%s), argvs=0x%08X, env=0x%08X)", name,name,argv1,env1); @@ -189,9 +186,9 @@ int syscall_execve(char *name, char **argv1, char **env1) i=0; do{ -// #ifdef LOG_SYSCALLS + #ifdef LOG_SYSCALLS log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"envr %d : 0x%08X : %s" ,i,env[i],env[i]); - // #endif + #endif int l=strlen(env[i]); char *env_var=alloc; alloc+=sizeof(char)*l+1; @@ -211,7 +208,7 @@ int syscall_execve(char *name, char **argv1, char **env1) memcpy(arg_var,argv[i],l+1); argv_new[i]=arg_var; // #ifdef LOG_SYSCALLS - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"arg %d : 0x%08X : %s" ,i,argv_new[i],argv_new[i]); +// log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"arg %d : 0x%08X : %s" ,i,argv_new[i],argv_new[i]); // #endif i++; }while(argv[i]!=NULL); diff --git a/kernel/task.c b/kernel/task.c index 866dcc2..2d52017 100644 --- a/kernel/task.c +++ b/kernel/task.c @@ -106,12 +106,12 @@ uint32_t task_exit(uint32_t oldesp) if(task_list[parent_pid].waiting) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"wakeing up %d ", parent_pid); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"[%d] wake up", parent_pid); task_list[parent_pid].waiting=false; } else { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"set skipwait on %d ", parent_pid); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"[%d] skipwait", parent_pid); task_list[parent_pid].skipwait=true; } diff --git a/kernel/vmem.c b/kernel/vmem.c index ddb3148..3a05598 100644 --- a/kernel/vmem.c +++ b/kernel/vmem.c @@ -173,6 +173,7 @@ pt_entry* vmmngr_ptable_lookup_entry (ptable* p, virtual_addr addr) void vmem_free_dir(pdirectory *dir) { + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"removing pdirectory: 0x%X",dir); } // vmem init and also copies all the shit for FORK @@ -287,7 +288,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir) virt_addr+=1024*4096; } - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"last addr (0x%08X,0x%08X)",phys_addr, virt_addr); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"last addr (0x%08X,0x%08X)",phys_addr, virt_addr); if(copy_dir!=NULL)x86_paging_enable(); |