Changeset 433 for trunk/kernel/mm/ppm.c

Timestamp:

Feb 14, 2018, 3:40:19 PM (7 years ago)

Author:

alain

Message:

blip

File:

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

trunk/kernel/mm/ppm.c

@@ -193 +193 @@
         list_add_first( &ppm->free_pages_root[current_order] , &current->list );
         ppm->free_pages_nr[current_order] ++;
-}
+
+}  // end ppm_free_pages_nolock()
 
 ////////////////////////////////////////////
@@ -201 +202 @@
         page_t   * remaining_block;
         uint32_t   current_size;
+ 
+#if CONFIG_DEBUG_PPM_ALLOC_PAGES
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_PPM_ALLOC_PAGES < cycle )
+printk("\n[DBG] in %s : thread %x enter for %d page(s) / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , 1<<order, cycle );
+#endif
+
+#if(CONFIG_DEBUG_PPM_ALLOC_PAGES & 0x1)
+if( CONFIG_DEBUG_PPM_ALLOC_PAGES < cycle )
+ppm_print();
+#endif
 
         ppm_t    * ppm = &LOCAL_CLUSTER->ppm;
@@ -208 +221 @@
 
         page_t * block = NULL;  
-
-        ppm_dmsg("\n[DBG] %s : enters / order = %d\n",
-                 __FUNCTION__ , order );
 
         // take lock protecting free lists
@@ -231 +241 @@
                 spinlock_unlock( &ppm->free_lock );
 
+#if CONFIG_DEBUG_PPM_ALLOC_PAGES
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_PPM_ALLOC_PAGES < cycle )
+printk("\n[DBG] in %s : thread %x cannot allocate %d page(s) at cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , 1<<order, cycle );
+#endif
+
                 return NULL;
         }
@@ -260 +277 @@
         spinlock_unlock( &ppm->free_lock );
 
-        ppm_dmsg("\n[DBG] %s : base = %x / order = %d\n",
-                 __FUNCTION__ , (uint32_t)ppm_page2base( block ) , order );
+#if CONFIG_DEBUG_PPM_ALLOC_PAGES
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_PPM_ALLOC_PAGES < cycle )
+printk("\n[DBG] in %s : thread %x exit / %d page(s) allocated / ppn = %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, 1<<order, ppm_page2ppn(XPTR( local_cxy , block )), cycle );
+#endif
 
         return block;
-}
+
+}  // end ppm_alloc_pages()
 
 
@@ -272 +294 @@
         ppm_t * ppm = &LOCAL_CLUSTER->ppm;
 
+#if CONFIG_DEBUG_PPM_FREE_PAGES
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_PPM_FREE_PAGES < cycle )
+printk("\n[DBG] in %s : thread %x enter for %d page(s) / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , 1<<page->order , cycle );
+#endif
+
+#if(CONFIG_DEBUG_PPM_FREE_PAGES & 0x1)
+if( CONFIG_DEBUG_PPM_FREE_PAGES < cycle )
+ppm_print();
+#endif
+
         // get lock protecting free_pages[] array
         spinlock_lock( &ppm->free_lock );
@@ -279 +313 @@
         // release lock protecting free_pages[] array
         spinlock_unlock( &ppm->free_lock );
+
+#if CONFIG_DEBUG_PPM_FREE_PAGES
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_PPM_FREE_PAGES < cycle )
+printk("\n[DBG] in %s : thread %x exit / %d page(s) released / ppn = %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, 1<<page->order, ppm_page2ppn(XPTR(local_cxy , page)), cycle );
+#endif
+
 }
 
-////////////////////////////
-void ppm_print( ppm_t * ppm,
-                char  * string )
+////////////////
+void ppm_print()
 {
         uint32_t       order;
@@ -289 +330 @@
         page_t       * page;
 
+    ppm_t * ppm = &LOCAL_CLUSTER->ppm;
+
         // get lock protecting free lists
         spinlock_lock( &ppm->free_lock );
 
-        printk("\n***  PPM in cluster %x : %d pages / &pages_tbl = %x / vaddr_base = %x ***\n",
-    local_cxy , ppm->pages_nr , (intptr_t)ppm->pages_tbl , (intptr_t)ppm->vaddr_base );
+        printk("\n***  PPM in cluster %x : %d pages ***\n", local_cxy , ppm->pages_nr );
 
         for( order = 0 ; order < CONFIG_PPM_MAX_ORDER ; order++ )
         {
-                printk("- order = %d / free_pages = %d  [",
+                printk("- order = %d / free_pages = %d\t: ",
                        order , ppm->free_pages_nr[order] );
 
@@ -303 +345 @@
                 {
                         page = LIST_ELEMENT( iter , page_t , list );
-                        printk("%d," , page - ppm->pages_tbl );
+                        printk("%x," , page - ppm->pages_tbl );
                 }
 
-                printk("]\n", NULL );
+                printk("\n");
         }