Changeset 246 for trunk/kernel/mm

Timestamp:

Jul 20, 2017, 12:55:23 PM (7 years ago)

Author:

alain

Message:

Fix a major bug in FATFS : miss handling in the FAT mapper.

Location:

trunk/kernel/mm

Files:

• mapper.c (modified) (4 diffs)
• mapper.h (modified) (2 diffs)

trunk/kernel/mm/mapper.c

@@ -40 +40 @@
 #include <mapper.h>
 
-//////////////////////////
-mapper_t * mapper_create()
+//////////////////////////////////////////////
+mapper_t * mapper_create( vfs_fs_type_t type )
 {
     mapper_t * mapper;
@@ -78 +78 @@
     }
 
+    // initialize mapper type
+    mapper->type = type;
+
     // initialize mapper lock
     rwlock_init(  &mapper->lock );
@@ -139 +142 @@
     error_t       error;
 
-    mapper_dmsg("\n[INFO] %s : enter for page %d / mapper = %x\n",
+    mapper_dmsg("\n[INFO] %s : enters for page %d in mapper %x\n",
                 __FUNCTION__ , index , mapper );
 
@@ -254 +257 @@
     }
 
-    mapper_dmsg("\n[INFO] %s : exit for page %d / page desc = %x\n",
-                __FUNCTION__ , index , page );
+    mapper_dmsg("\n[INFO] %s : exit for page %d in mapper %x / page_desc = %x\n",
+                __FUNCTION__ , index , mapper , page );
 
     return page;

trunk/kernel/mm/mapper.h

@@ -49 +49 @@
  * - The mapper is protected by a blocking "rwlock", to support several simultaneous
  *   readers, and only one writer. This lock implement a busy waiting policy.
- * - The vfs_mapper_move_page() and vfs_mapper_load_all() functions are used to move
- *   pages to or from the file system on device.
+ * - The mapper_get_page() function that return a page descriptor pointer from a page
+ *   index in file is in charge of handling the miss on the mapper cache.
+ * - The vfs_mapper_move_page() function is used to handle miss on one specific page,
+ *   or update a dirty page on device.
+ * - The vfs_mapper_load_all() functions is used to load all pages of a given directory
+ *   into the mapper.
  * - the mapper_move() function is used to move data to or from an user buffer.
  *   This user space buffer can be physically distributed in several clusters.
- * - The mapper_get_page() function that return a page descriptor pointer from a page
- *   index in file is in charge of handling the miss on the mapper cache.
- * - In the present implementation the cache size increases on demand, and the
- *   allocated memory is only released when the mapper/inode is destroyed.
+ * - In the present implementation the cache size for a given file increases on demand,
+ *   and the  allocated memory is only released when the mapper/inode is destroyed.
  ******************************************************************************************/
 
@@ -67 +69 @@
 {
         struct vfs_inode_s * inode;           /*! owner inode                                     */
+    uint32_t             type;        /*! file system type                                */
         grdxt_t              radix;           /*! pages cache implemented as a radix tree         */
         rwlock_t             lock;        /*! several readers / only one writer               */