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

Timestamp:

Jun 3, 2017, 4:42:49 PM (7 years ago)

Author:

max@…

Message:

cosmetic, and a few typos

File:

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

trunk/kernel/mm/ppm.c

@@ -56 +56 @@
 
 ////////////////////////////////////////////
-inline page_t * ppm_base2page( void * base ) 
+inline page_t * ppm_base2page( void * base )
 {
         ppm_t * ppm = &LOCAL_CLUSTER->ppm;
@@ -105 +105 @@
     // search the buddy page descriptor
     // - merge with current page descriptor if found
-    // - exit to release the current page descriptor if not found 
-    current       = page , 
+    // - exit to release the current page descriptor if not found
+    current       = page ,
     current_index = (uint32_t)(page - ppm->pages_tbl);
-        for( current_order = page->order ; 
+        for( current_order = page->order ;
          current_order < CONFIG_PPM_MAX_ORDER ;
          current_order++ )
@@ -114 +114 @@
                 buddy_index = current_index ^ (1 << current_order);
                 buddy       = pages_tbl + buddy_index;
-    
+
                 if( !page_is_flag( buddy , PG_FREE ) || (buddy->order != current_order) ) break;
 
-        // remove buddy from free list 
+        // remove buddy from free list
                 list_unlink( &buddy->list );
                 ppm->free_pages_nr[current_order] --;
         ppm->total_free_pages -= (1 << current_order);
-    
+
         // merge buddy with current
                 buddy->order = 0;
                 current_index &= buddy_index;
         }
-  
+
     // update merged page descriptor order
         current        = pages_tbl + current_index;
@@ -162 +162 @@
     list_root_init( &ppm->dirty_root );
 
-    // initialize pointer on page descriptors array 
+    // initialize pointer on page descriptors array
         ppm->pages_tbl = (page_t*)( pages_offset << CONFIG_PPM_PAGE_SHIFT );
 
@@ -174 +174 @@
         uint32_t reserved_pages = pages_offset + pages_array;
 
-        // set pages numbers 
+        // set pages numbers
         ppm->pages_nr      = pages_nr;
     ppm->pages_offset  = reserved_pages;
@@ -180 +180 @@
     // initialises all page descriptors in pages_tbl[]
         for( i = 0 ; i < pages_nr ; i++ )
-    { 
+    {
         page_init( &ppm->pages_tbl[i] );
 
@@ -186 +186 @@
         // complete the initialisation when page is allocated [AG]
         // ppm->pages_tbl[i].flags = 0;
-    } 
-
-    // - set PG_RESERVED flag for reserved pages (kernel code & pages_tbl[]) 
+    }
+
+    // - set PG_RESERVED flag for reserved pages (kernel code & pages_tbl[])
     // - release all other pages to populate the free lists
-        for( i = 0 ; i < reserved_pages ; i++) 
+        for( i = 0 ; i < reserved_pages ; i++)
     {
         page_set_flag( &ppm->pages_tbl[i] , PG_RESERVED );
@@ -250 +250 @@
         return NULL;
     }
-  
-    // update free-lists after removing a block 
+
+    // update free-lists after removing a block
         ppm->total_free_pages -= (1 << current_order);
-        ppm->free_pages_nr[current_order] --;  
+        ppm->free_pages_nr[current_order] --;
         current_size = (1 << current_order);
 
@@ -262 +262 @@
                 current_order --;
                 current_size >>= 1;
-    
+
                 remaining_block = block + current_size;
                 remaining_block->order = current_order;
@@ -270 +270 @@
         ppm->total_free_pages += (1 << current_order);
         }
-  
+
     // update page descriptor
     page_clear_flag( block , PG_FREE );
@@ -278 +278 @@
     // release lock protecting free lists
         spinlock_unlock( &ppm->free_lock );
-  
+
     ppm_dmsg("\n[INFO] %s : base = %x / order = %d\n",
              __FUNCTION__ , (uint32_t)ppm_page2base( block ) , order );
@@ -294 +294 @@
 {
         ppm_t * ppm = &LOCAL_CLUSTER->ppm;
-  
+
     // get lock protecting free_pages[] array
         spinlock_lock( &ppm->free_lock );
 
-        ppm_free_pages_nolock( page ); 
+        ppm_free_pages_nolock( page );
 
     // release lock protecting free_pages[] array
@@ -316 +316 @@
 
         printk("\n***  PPM state in cluster %x %s : pages = %d / offset = %d / free = %d ***\n",
-               local_cxy , string , ppm->pages_nr , ppm->pages_offset , ppm->total_free_pages ); 
-        
+               local_cxy , string , ppm->pages_nr , ppm->pages_offset , ppm->total_free_pages );
+
         for( order = 0 ; order < CONFIG_PPM_MAX_ORDER ; order++ )
         {
                 printk("- order = %d / free_pages = %d  [",
                order , ppm->free_pages_nr[order] );
-                
+
                 LIST_FOREACH( &ppm->free_pages_root[order] , iter )
                 {
@@ -328 +328 @@
                         printk("%d," , page - ppm->pages_tbl );
                 }
-    
+
                 printk("]\n", NULL );
         }
@@ -336 +336 @@
 
 }  // end ppm_print()
- 
+
 //////////////////////////u/////////
 void ppm_assert_order( ppm_t * ppm )
@@ -343 +343 @@
         list_entry_t * iter;
         page_t       * page;
-        
+
         for(order=0; order < CONFIG_PPM_MAX_ORDER; order++)
         {
                 if( list_is_empty( &ppm->free_pages_root[order] ) ) continue;
-                
+
                 LIST_FOREACH( &ppm->free_pages_root[order] , iter )
                 {