Changeset 611 for trunk/kernel/mm/kmem.c

Timestamp:

Jan 9, 2019, 3:02:51 PM (5 years ago)

Author:

alain

Message:

Introduce sigificant modifs in VFS to support the <ls> command,
and the . and .. directories entries.

File:

• trunk/kernel/mm/kmem.c (modified) (9 diffs)

trunk/kernel/mm/kmem.c

@@ -40 +40 @@
 #include <fatfs.h>
 #include <ramfs.h>
+#include <remote_dir.h>
 #include <remote_sem.h>
 #include <remote_barrier.h>
@@ -100 +101 @@
     else if( type == KMEM_CONDVAR )       return sizeof( remote_condvar_t );
     else if( type == KMEM_MUTEX )         return sizeof( remote_mutex_t );
+    else if( type == KMEM_DIR )           return sizeof( remote_dir_t );
+
         else if( type == KMEM_512_BYTES )     return 512;
 
@@ -128 +131 @@
     else if( type == KMEM_CONDVAR )       return "KMEM_CONDVAR";
     else if( type == KMEM_MUTEX )         return "KMEM_MUTEX";
+    else if( type == KMEM_DIR )           return "KMEM_DIR";
+
         else if( type == KMEM_512_BYTES )     return "KMEM_512_BYTES";
 
@@ -144 +149 @@
 
 #if DEBUG_KMEM
+thread_t * this = CURRENT_THREAD;
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x enter / KCM type %s missing in cluster %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, kmem_type_str( type ), local_cxy, cycle );
+printk("\n[%s] thread[%x,%x] enter / KCM type %s missing in cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, kmem_type_str( type ), local_cxy, cycle );
 #endif
 
@@ -174 +180 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x exit / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, cycle );
+printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif
 
@@ -198 +204 @@
 
 #if DEBUG_KMEM
+thread_t * this = CURRENT_THREAD;
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x enter / type %s / cluster %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, kmem_type_str( type ), local_cxy, cycle );
+printk("\n[%s] thread [%x,%x] enter / %s / size %d / cluster %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+kmem_type_str( type ), size, local_cxy, cycle );
 #endif
 
@@ -222 +230 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x exit / %d page(s) allocated / ppn %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, 1<<size, ppm_page2ppn(XPTR(local_cxy,ptr)), cycle );
+printk("\n[%s] thread[%x,%x] exit / %d page(s) allocated / ppn %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid,
+1<<size, ppm_page2ppn(XPTR(local_cxy,ptr)), cycle );
 #endif
 
@@ -244 +253 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x exit / type %s allocated / base %x / size %d / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, kmem_type_str( type ), (intptr_t)ptr, size, cycle );
+printk("\n[%s] thread[%x,%x] exit / type %s allocated / base %x / size %d / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+kmem_type_str( type ), (intptr_t)ptr, size, cycle );
 #endif
 
@@ -286 +296 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_KMEM < cycle )
-printk("\n[DBG] %s : thread %x exit / type %s allocated / base %x / size %d / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, kmem_type_str(type), (intptr_t)ptr, 
+printk("\n[%s] thread [%x,%x] exit / type %s allocated / base %x / size %d / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, kmem_type_str(type), (intptr_t)ptr, 
 kmem_type_size(type), cycle );
 #endif