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

Timestamp:

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

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/mm/mapper.c (modified) (12 diffs)

trunk/kernel/mm/mapper.c

@@ -36 +36 @@
 #include <kmem.h>
 #include <kcm.h>
+#include <ppm.h>
 #include <page.h>
 #include <cluster.h>
 #include <vfs.h>
 #include <mapper.h>
+
 
 //////////////////////////////////////////////
@@ -83 +85 @@
 
     // initialize mapper lock
-    rwlock_init(  &mapper->lock );
+    rwlock_init(  &mapper->lock , LOCK_MAPPER_STATE );
 
     // initialize waiting threads xlist (empty)
@@ -153 +155 @@
 
     // take mapper lock in READ_MODE
-    rwlock_rd_lock( &mapper->lock );
+    rwlock_rd_acquire( &mapper->lock );
 
     // search page in radix tree
@@ -163 +165 @@
 
         // release the lock in READ_MODE and take it in WRITE_MODE
-        rwlock_rd_unlock( &mapper->lock );
-        rwlock_wr_lock( &mapper->lock );
+        rwlock_rd_release( &mapper->lock );
+        rwlock_wr_acquire( &mapper->lock );
 
         // second test on missing page because the page status can have been modified
@@ -189 +191 @@
                 printk("\n[ERROR] in %s : thread %x cannot allocate a page in cluster %x\n",
                        __FUNCTION__ , this->trdid , local_cxy );
-                rwlock_wr_unlock( &mapper->lock );
+                rwlock_wr_release( &mapper->lock );
                 return NULL;
             }
@@ -204 +206 @@
 
             // release mapper lock from WRITE_MODE
-            rwlock_wr_unlock( &mapper->lock );
+            rwlock_wr_release( &mapper->lock );
 
             if( error )
@@ -239 +241 @@
         {
             // release mapper lock from WRITE_MODE
-            rwlock_wr_unlock( &mapper->lock );
+            rwlock_wr_release( &mapper->lock );
 
             // wait load completion
-            while( 1 )
+            while( page_is_flag( page , PG_INLOAD ) == false ) 
             {
-                // exit waiting loop when loaded
-                if( page_is_flag( page , PG_INLOAD ) == false ) break;
-
-                // deschedule
+                // deschedule without blocking
                 sched_yield("waiting page loading");
             }
@@ -254 +253 @@
     else                          // page available in mapper
     {
-        rwlock_rd_unlock( &mapper->lock );
+        rwlock_rd_release( &mapper->lock );
     }
 
@@ -284 +283 @@
 
     // take mapper lock in WRITE_MODE
-    rwlock_wr_lock( &mapper->lock );
+    rwlock_wr_acquire( &mapper->lock );
 
     // remove physical page from radix tree
@@ -290 +289 @@
 
     // release mapper lock from WRITE_MODE
-    rwlock_wr_unlock( &mapper->lock );
+    rwlock_wr_release( &mapper->lock );
 
     // release page to PPM
@@ -372 +371 @@
         else
         {
-            page_do_dirty( page );
+            ppm_page_do_dirty( page );
             hal_copy_from_uspace( map_ptr , buf_ptr , page_count );
         }
@@ -485 +484 @@
             dst_ptr = base_ptr + page_offset;
 
-            page_do_dirty( page );
+            ppm_page_do_dirty( page );
         }