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

Timestamp:

Jan 15, 2019, 1:59:32 PM (6 years ago)

Author:

alain

Message:

1) introduce a dev_ioc_sync_write() function in IOC API,

to improve the DEVFS synchronous update.

2) fix a big bug in both the user_dir_create() and user_dir_destroy()

functions: add an extended pointer on the reference client process
in the function's arguments.

File:

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

trunk/kernel/mm/mapper.c

@@ -28 +28 @@
 #include <hal_uspace.h>
 #include <grdxt.h>
+#include <string.h>
 #include <rwlock.h>
 #include <printk.h>
@@ -41 +42 @@
 #include <vfs.h>
 #include <mapper.h>
+#include <dev_ioc.h>
 
 
@@ -302 +304 @@
 
     // launch I/O operation to load page from device to mapper
-    error = vfs_fs_move_page( XPTR( local_cxy , page ) , true );
+    error = vfs_fs_move_page( XPTR( local_cxy , page ) , IOC_SYNC_READ );
 
     if( error )
@@ -647 +649 @@
 error_t mapper_display_page( xptr_t     mapper_xp,
                              uint32_t   page_id,
-                             uint32_t   nbytes,
-                             char     * string )
-{
-    xptr_t     page_xp;        // extended pointer on page descriptor
-    xptr_t     base_xp;        // extended pointer on page base
-    char       buffer[4096];   // local buffer
-    uint32_t * tab;            // pointer on uint32_t to scan the buffer
-    uint32_t   line;           // line index
-    uint32_t   word;           // word index
+                             uint32_t   nbytes )
+{
+    xptr_t        page_xp;        // extended pointer on page descriptor
+    xptr_t        base_xp;        // extended pointer on page base
+    char          buffer[4096];   // local buffer
+    uint32_t    * tabi;           // pointer on uint32_t to scan buffer
+    char        * tabc;           // pointer on char to scan buffer
+    uint32_t      line;           // line index
+    uint32_t      word;           // word index
+    uint32_t      n;              // char index
+    cxy_t         mapper_cxy;     // mapper cluster identifier
+    mapper_t    * mapper_ptr;     // mapper local pointer
+    vfs_inode_t * inode_ptr;      // inode local pointer
+ 
+    char       name[CONFIG_VFS_MAX_NAME_LENGTH];
 
     if( nbytes > 4096)
@@ -674 +682 @@
     }
 
+    // get cluster and local pointer
+    mapper_cxy = GET_CXY( mapper_xp );
+    mapper_ptr = GET_PTR( mapper_xp );
+
+    // get inode
+    inode_ptr = hal_remote_lpt( XPTR( mapper_cxy , &mapper_ptr->inode ) );
+
+    // get inode name
+    if( inode_ptr == NULL ) strcpy( name , "fat" );
+    else  vfs_inode_get_name( XPTR( mapper_cxy , inode_ptr ) , name );
+    
     // get extended pointer on page base
     base_xp = ppm_page2base( page_xp );
@@ -681 +700 @@
 
     // display 8 words per line
-    tab = (uint32_t *)buffer;
-    printk("\n***** %s : first %d bytes of page %d *****\n", string, nbytes, page_id );
+    tabi = (uint32_t *)buffer;
+    tabc = (char *)buffer;
+    printk("\n***** <%s> first %d bytes of page %d *****\n", name, nbytes, page_id );
     for( line = 0 ; line < (nbytes >> 5) ; line++ )
     {
         printk("%X : ", line );
-        for( word = 0 ; word < 8 ; word++ ) printk("%X ", tab[(line<<3) + word] );
+        for( word = 0 ; word < 8 ; word++ ) printk("%X ", tabi[(line<<3) + word] );
+        printk(" | ");
+        for( n = 0 ; n < 32 ; n++ ) printk("%c", tabc[(line<<5) + n] );
         printk("\n");
     }