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

Timestamp:

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

Author:

max@…

Message:

cosmetic, and a few typos

File:

• trunk/kernel/mm/khm.c (modified) (6 diffs)

trunk/kernel/mm/khm.c

@@ -1 +1 @@
 /*
  * khm.c - kernel heap manager implementation.
- * 
+ *
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
  *          Alain Greiner (2016)
@@ -44 +44 @@
 
     // initialize lock
-        spinlock_init( &khm->lock );  
-    
-    //  compute kernel heap size 
+        spinlock_init( &khm->lock );
+
+    // compute kernel heap size
     intptr_t heap_size = (1 << CONFIG_PPM_HEAP_ORDER) << CONFIG_PPM_PAGE_SHIFT;
 
-    // get kernel heap base from PPM 
+    // get kernel heap base from PPM
     page_t * page      = ppm_alloc_pages( CONFIG_PPM_HEAP_ORDER );
     void   * heap_base = ppm_page2base( page );
@@ -65 +65 @@
 
 /////////////////////////////////
-void * khm_alloc( khm_t    * khm, 
+void * khm_alloc( khm_t    * khm,
                   uint32_t   size )
 {
-        khm_block_t  * current;        
+        khm_block_t  * current;
         khm_block_t  * next;
         uint32_t       effective_size;
@@ -78 +78 @@
     // get lock protecting heap
         spinlock_lock( &khm->lock );
-  
-    // define a starting block to scan existing blocks 
+
+    // define a starting block to scan existing blocks
     if( ((khm_block_t*)khm->next)->size < effective_size ) current = (khm_block_t*)khm->base;
     else                                                   current = (khm_block_t*)khm->next;
 
     // scan all existing blocks to find a large enough free block
-        while( current->busy || (current->size < effective_size)) 
+        while( current->busy || (current->size < effective_size))
         {
         // get next block pointer
                 current = (khm_block_t*)((char*)current + current->size);
-    
+
                 if( (intptr_t)current >= (khm->base + khm->size) )  // heap full
                 {
                         spinlock_unlock(&khm->lock);
 
-                        printk("\n[ERROR] in %s : failed to allocate block of size %d\n", 
+                        printk("\n[ERROR] in %s : failed to allocate block of size %d\n",
                                __FUNCTION__ , effective_size );
                         return NULL;
@@ -133 +133 @@
         khm_block_t * current;
         khm_block_t * next;
-  
+
         if(ptr == NULL) return;
-  
+
         current = (khm_block_t *)((char*)ptr - sizeof(khm_block_t));
- 
+
     // get lock protecting heap
         spinlock_lock(&khm->lock);
 
-    // release block 
+    // release block
         current->busy = 0;
-  
+
     // try to merge released block with the next
         while ( 1 )
-        { 
+        {
         next = (khm_block_t*)((char*)current + current->size);
                 if ( ((intptr_t)next >= (khm->base + khm->size)) || (next->busy == 1) ) break;
@@ -153 +153 @@
 
         if( (intptr_t)current < khm->next ) khm->next = (intptr_t)current;
-  
+
     // release lock protecting heap
         spinlock_unlock( &khm->lock );