Changeset 641 for trunk/kernel/syscalls/sys_munmap.c

Timestamp:

Oct 10, 2019, 1:42:04 PM (5 years ago)

Author:

alain

Message:

• Fix several bugs.
• Introduce the "stat" command in KSH.

This almos-mkh version sucessfully executed the FFT application
(65536 complex points) on the TSAR architecture from 1 to 64 cores.

File:

• trunk/kernel/syscalls/sys_munmap.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_munmap.c

@@ -54 +54 @@
 #if DEBUG_SYS_MUNMAP
 if( DEBUG_SYS_MUNMAP < tm_start )
-printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
-__FUNCTION__ , this, process->pid, (uint32_t)tm_start );
+printk("\n[%s] thread[%x,%x] enter / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, (uint32_t)tm_start );
 #endif
 
@@ -95 +95 @@
                 return -1;
     }
-    else if( (vseg_min == addr_min) && (vseg_min == vseg_max) )  
+    else if( (vseg_min == addr_min) && (vseg_max == addr_max) )  
     {
 
 #if( DEBUG_SYS_MUNMAP & 1 )
-if( DEBUG_SYS_MUNMAP < cycle )
-printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg deleted\n",
-__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+if( DEBUG_SYS_MUNMAP < tm_start )
+printk("\n[%s] thread[%x,%x] unmapped region[%x->%x[ / vseg[%x->%x[ => delete vseg\n",
+__FUNCTION__, process->pid, this->trdid, addr_min, addr_max, vseg_min, vseg_max );
 #endif
         // delete existing vseg
@@ -107 +107 @@
                                 vseg_min );
     }
-    else if( (vseg_min == addr_min) || (vseg_min == vseg_max) )  
+    else if( (vseg_min == addr_min) || (vseg_max == addr_max) )  
     {
 
 #if( DEBUG_SYS_MUNMAP & 1 )
-if( DEBUG_SYS_MUNMAP < cycle )
-printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg resized\n",
-__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+if( DEBUG_SYS_MUNMAP < tm_start )
+printk("\n[%s] thread[%x,%x] unmapped region[%x->%x[ / vseg[%x->%x[ => resize vseg\n",
+__FUNCTION__, process->pid, this->trdid, addr_min, addr_max, vseg_min, vseg_max );
 #endif
         // resize existing vseg
@@ -121 +121 @@
                                 addr_max - addr_min );
     }
-    else     //  vseg_min < addr_min) && (addr_max < vseg_max)          
+    else     //  addr_min > vseg_min) && (addr_max < vseg_max)          
     {
 
 #if( DEBUG_SYS_MUNMAP & 1 )
-if( DEBUG_SYS_MUNMAP < cycle )
-printk("\n[%s] unmapped region[%x->%x[ / vseg[%x->%x[ => vseg resized & new vseg created\n",
-__FUNCTION__, addr_min, addr_max, vseg_min, vseg_max );
+if( DEBUG_SYS_MUNMAP < tm_start )
+printk("\n[%s] thread[%x,%x] unmapped region[%x->%x[ / vseg[%x->%x[ => create new vseg\n",
+__FUNCTION__, process->pid, this->trdid, addr_min, addr_max, vseg_min, vseg_max );
 #endif
         // resize existing vseg
@@ -160 +160 @@
 #if DEBUG_SYS_MUNMAP
 if( DEBUG_SYS_MUNMAP < tm_start )
-printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n",
-__FUNCTION__ , this, process->pid, (uint32_t)tm_end );
+printk("\n[%s] thread [%x,%x] exit / cycle %d\n",
+__FUNCTION__ , process->pid, this->trdid, (uint32_t)tm_end );
 #endif