Changeset 611 for trunk/kernel/mm/ppm.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/ppm.c (modified) (9 diffs)

trunk/kernel/mm/ppm.c

@@ -210 +210 @@
 
 #if DEBUG_PPM_ALLOC_PAGES
+thread_t * this = CURRENT_THREAD;
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PPM_ALLOC_PAGES < cycle )
-printk("\n[DBG] in %s : thread %x in process %x enter for %d page(s) / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, 1<<order, cycle );
+printk("\n[%s] thread[%x,%x] enter for %d page(s) / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, cycle );
 #endif
 
 #if(DEBUG_PPM_ALLOC_PAGES & 0x1)
 if( DEBUG_PPM_ALLOC_PAGES < cycle )
-ppm_print();
+ppm_print("enter ppm_alloc_pages");
 #endif
 
         ppm_t    * ppm = &LOCAL_CLUSTER->ppm;
 
-        assert( (order < CONFIG_PPM_MAX_ORDER) ,
-    "illegal order argument = %x\n" , order );
+// check order
+assert( (order < CONFIG_PPM_MAX_ORDER) , "illegal order argument = %d\n" , order );
 
         page_t * block = NULL;  
@@ -250 +251 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PPM_ALLOC_PAGES < cycle )
-printk("\n[DBG] in %s : thread %x in process %x cannot allocate %d page(s) / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, 1<<order, cycle );
+printk("\n[%s] thread[%x,%x] cannot allocate %d page(s) / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 1<<order, cycle );
 #endif
 
@@ -289 +290 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PPM_ALLOC_PAGES < cycle )
-printk("\n[DBG] in %s : thread %x in process %x exit for %d page(s) / ppn = %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, 
+printk("\n[%s] thread[%x,%x] exit for %d page(s) / ppn = %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 
 1<<order, ppm_page2ppn(XPTR( local_cxy , block )), cycle );
+#endif
+
+#if(DEBUG_PPM_ALLOC_PAGES & 0x1)
+if( DEBUG_PPM_ALLOC_PAGES < cycle )
+ppm_print("exit ppm_alloc_pages");
 #endif
 
@@ -307 +313 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PPM_FREE_PAGES < cycle )
-printk("\n[DBG] in %s : thread %x in process %x enter for %d page(s) / ppn %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, 
+printk("\n[%s] thread[%x,%x] enter for %d page(s) / ppn %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 
 1<<page->order, ppm_page2ppn(XPTR(local_cxy , page)), cycle );
 #endif
@@ -314 +320 @@
 #if(DEBUG_PPM_FREE_PAGES & 0x1)
 if( DEBUG_PPM_FREE_PAGES < cycle )
-ppm_print();
+ppm_print("enter ppm_free_pages");
 #endif
 
@@ -331 +337 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PPM_FREE_PAGES < cycle )
-printk("\n[DBG] in %s : thread %x in process %x exit for %d page(s) / ppn %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, 
+printk("\n[%s] thread[%x,%x] exit for %d page(s) / ppn %x / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, 
 1<<page->order, ppm_page2ppn(XPTR(local_cxy , page)), cycle );
 #endif
 
+#if(DEBUG_PPM_FREE_PAGES & 0x1)
+if( DEBUG_PPM_FREE_PAGES < cycle )
+ppm_print("exit ppm_free_pages");
+#endif
+
 }  // end ppm_free_pages()
 
-//////////////////////
-void ppm_print( void )
+///////////////////////////////
+void ppm_print( char * string )
 {
         uint32_t       order;
@@ -350 +361 @@
         busylock_acquire( &ppm->free_lock );
 
-        printk("\n***  PPM in cluster %x : %d pages ***\n", local_cxy , ppm->pages_nr );
+        printk("\n***  PPM in cluster %x / %s / %d pages ***\n",
+    local_cxy , string, ppm->pages_nr );
 
         for( order = 0 ; order < CONFIG_PPM_MAX_ORDER ; order++ )
@@ -413 +425 @@
     xptr_t dirty_lock_xp = XPTR( page_cxy , &ppm->dirty_lock );
            
-// printk("\n@@@ %s : before dirty_list lock aquire\n", __FUNCTION__ );
-
         // lock the remote PPM dirty_list
         remote_queuelock_acquire( dirty_lock_xp );
 
-// printk("\n@@@ %s : after dirty_list lock aquire\n", __FUNCTION__ );
-
     // lock the remote page
     remote_busylock_acquire( page_lock_xp );
-
-// printk("\n@@@ %s : after page lock aquire\n", __FUNCTION__ );
 
     // get remote page flags
@@ -466 +472 @@
         }
 
-// printk("\n@@@ %s : before page lock release\n", __FUNCTION__ );
-
     // unlock the remote page
     remote_busylock_release( page_lock_xp );
 
-// printk("\n@@@ %s : after page lock release\n", __FUNCTION__ );
-
         // unlock the remote PPM dirty_list
         remote_queuelock_release( dirty_lock_xp );
-
-// printk("\n@@@ %s : after page lock aquire\n", __FUNCTION__ );
 
         return done;