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

Timestamp:

Jul 17, 2017, 8:42:59 AM (7 years ago)

Author:

alain

Message:

Bug fix in kernel_init
-This line, and those below, will be ignored--

M params.mk
M kernel_config.h
M Makefile
M hdd/virt_hdd.dmg
M tools/bootloader_tsar/boot.c
M kernel/libk/bits.h
M kernel/libk/elf.c
M kernel/libk/xhtab.c
M kernel/libk/elf.h
M kernel/libk/xhtab.h
M kernel/devices/dev_pic.c
M kernel/mm/vmm.c
M kernel/mm/mapper.c
M kernel/mm/mapper.h
M kernel/vfs/devfs.h
M kernel/vfs/vfs.c
M kernel/vfs/vfs.h
M kernel/vfs/devfs.c
M kernel/kern/chdev.h
M kernel/kern/kernel_init.c
M kernel/kern/process.c
M kernel/kern/process.h
M hal/tsar_mips32/core/hal_remote.c
M hal/tsar_mips32/drivers/soclib_pic.c

File:

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

trunk/kernel/mm/mapper.c

@@ -88 +88 @@
 
     return mapper;
-}
+
+}  // end mapper_create()
 
 ///////////////////////////////////////////
@@ -127 +128 @@
 
     return 0;
-}
+
+}  // end mapper_destroy()
 
 ////////////////////////////////////////////
@@ -137 +139 @@
     error_t       error;
 
+    mapper_dmsg("\n[INFO] %s : enter for page %d / mapper = %x\n",
+                __FUNCTION__ , index , mapper );
+
     thread_t * this = CURRENT_THREAD;
 
@@ -148 +153 @@
     if( ( page == NULL) || page_is_flag( page , PG_INLOAD ) )  // page not available
     {
+
         // release the lock in READ_MODE and take it in WRITE_MODE
         rwlock_rd_unlock( &mapper->lock );
@@ -160 +166 @@
         if ( page == NULL )   // missing page => load it from file system
         {
+            mapper_dmsg("\n[INFO] %s : missing page => load from FS\n", __FUNCTION__ );
+
             // allocate one page from PPM
             req.type  = KMEM_PAGE;
@@ -237 +245 @@
                 sched_yield();
             }
-
-        }
-
-        return page;
-    }
-    else
-    {
-         // release lock from READ_MODE
-         rwlock_rd_unlock( &mapper->lock );
-
-         return page;
-    }
-}
+        }
+    }
+    else                          // page available in mapper
+    {
+
+        rwlock_rd_unlock( &mapper->lock );
+    }
+
+    mapper_dmsg("\n[INFO] %s : exit for page %d / page desc = %x\n",
+                __FUNCTION__ , index , page );
+
+    return page;
+
+}  // end mapper_get_page()
 
 ///////////////////////////////////////////////
@@ -282 +291 @@
 
     return 0;
-}
+
+}  // end mapper_release_page()
 
 /////////////////////////////////////////
@@ -298 +308 @@
     uint8_t  * map_ptr;        // current mapper  address
     uint8_t  * buf_ptr;        // current buffer  address
+ 
+    mapper_dmsg("\n[INFO] %s : enter / to_buf = %d / buffer = %x\n",
+                __FUNCTION__ , to_buffer , buffer );
 
     // compute offsets of first and last bytes in file
@@ -347 +360 @@
     }
 
+    mapper_dmsg("\n[INFO] %s : exit for buffer %x\n",
+                __FUNCTION__, buffer );
+
     return 0;
-}
-
+
+}  // end mapper_move()
+