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

Timestamp:

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

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

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

trunk/kernel/mm/kmem.c

@@ -3 +3 @@
  *
  * Authors  Ghassan Almaless (2008,2009,2010,2011,2012)
- *          Mohamed Lamine Karaoui (2015)
- *          Alain Greiner (2016)
+ *          Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -28 +27 @@
 #include <hal_special.h>
 #include <printk.h>
-#include <spinlock.h>
-#include <readlock.h>
+#include <busylock.h>
 #include <memcpy.h>
 #include <khm.h>
@@ -51 +49 @@
 #include <kmem.h>
 
-///////////////////////////
+/////////////////////////////////
 void kmem_print_kcm_table( void )
 {
@@ -168 +166 @@
         kcm_init( kcm , type );
 
-        // register it if the KCM pointers Table
+        // register it in the KCM pointers Table
         cluster->kcm_tbl[type] = kcm;
 
@@ -258 +256 @@
                 if( cluster->kcm_tbl[type] == NULL )
                 {
-                        spinlock_lock_busy( &cluster->kcm_lock, &irq_state );
+            // get lock protecting local kcm_tbl[] array
+                        busylock_acquire( &cluster->kcm_lock );
+
+            // create missing KCM
                         error_t error = kmem_create_kcm( type );
-                        spinlock_unlock_busy( &cluster->kcm_lock, irq_state );
-                        if ( error ) return NULL;
+
+            // release lock protecting local kcm_tbl[] array
+                        busylock_release( &cluster->kcm_lock );
+
+                        if ( error ) 
+            {
+                 printk("\n[ERROR] in %s : cannot create KCM type %d in cluster %x\n",
+                 __FUNCTION__, type, local_cxy );
+                 return NULL;
+            }
                 }
 
@@ -269 +278 @@
                 {
                         printk("\n[ERROR] in %s : failed for type %d / size %d in cluster %x\n",
-                            __FUNCTION__ , type , size , local_cxy );
+                    __FUNCTION__ , type , size , local_cxy );
                         return NULL;
                 }