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

Timestamp:

Oct 5, 2018, 12:01:52 AM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

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

trunk/kernel/mm/khm.c

@@ -1 +1 @@
 /*
- * khm.c - kernel heap manager implementation.
+ * khm.c - Kernel Heap Manager implementation.
  *
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
- *          Alain Greiner (2016)
+ *          Alain Greiner (2016,2017,2018)
  *
  * Copyright (c)  UPMC Sorbonne Universites
@@ -26 +26 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
-#include <spinlock.h>
+#include <busylock.h>
 #include <bits.h>
 #include <printk.h>
@@ -44 +44 @@
 
         // initialize lock
-        spinlock_init( &khm->lock );
+        busylock_init( &khm->lock , LOCK_KHM_STATE );
 
         // compute kernel heap size
@@ -78 +78 @@
 
         // get lock protecting heap
-        uint32_t       irq_state;
-        spinlock_lock_busy( &khm->lock, &irq_state );
+        busylock_acquire( &khm->lock );
 
         // define a starting block to scan existing blocks
@@ -93 +92 @@
                 if( (intptr_t)current >= (khm->base + khm->size) )  // heap full
                 {
-                        spinlock_unlock_busy(&khm->lock, irq_state );
+                        busylock_release(&khm->lock);
 
                         printk("\n[ERROR] in %s : failed to allocate block of size %d\n",
@@ -123 +122 @@
 
         // release lock protecting heap
-        spinlock_unlock_busy( &khm->lock, irq_state );
+        busylock_release( &khm->lock );
 
         return (char*)current + sizeof(khm_block_t);
@@ -141 +140 @@
 
         // get lock protecting heap
-        spinlock_lock(&khm->lock);
+        busylock_acquire(&khm->lock);
 
         assert( (current->busy == 1) , "page already freed" );
@@ -159 +158 @@
 
         // release lock protecting heap
-        spinlock_unlock( &khm->lock );
+        busylock_release( &khm->lock );
 }