Changeset 313 for trunk/kernel/vfs

Timestamp:

Aug 2, 2017, 3:24:57 PM (7 years ago)

Author:

alain

Message:

RSeveral modifs in the page-fault handling.

Location:

trunk/kernel/vfs

Files:

• vfs.c (modified) (3 diffs)
• vfs.h (modified) (1 diff)

trunk/kernel/vfs/vfs.c

@@ -662 +662 @@
 }  // end vfs_open()
 
-/////////////////////////////////////
-error_t vfs_move( bool_t   to_buffer,
-                  bool_t   is_user,
-                  xptr_t   file_xp,
-                  void   * buffer,
-                  uint32_t size )
+//////////////////////////////////////////
+error_t vfs_user_move( bool_t   to_buffer,
+                       xptr_t   file_xp,
+                       void   * buffer,
+                       uint32_t size )
 {
     assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
@@ -695 +694 @@
         if( file_cxy == local_cxy )
         {
-            error = mapper_move_buffer( mapper,
-                                        to_buffer,
-                                        is_user,
-                                        file_offset,
-                                        buffer,
-                                        size );
+            error = mapper_move_user( mapper,
+                                      to_buffer,
+                                      file_offset,
+                                      buffer,
+                                      size );
         }
         else
         {
-            rpc_mapper_move_buffer_client( file_cxy,
-                                           mapper,
-                                           to_buffer,
-                                           is_user,
-                                           file_offset,
-                                           buffer,
-                                           size,
-                                           &error );
+            rpc_mapper_move_user_client( file_cxy,
+                                         mapper,
+                                         to_buffer,
+                                         true,          // user buffer
+                                         file_offset,
+                                         (uint64_t)(intptr_t)buffer,
+                                         size,
+                                         &error );
         } 
 
@@ -722 +720 @@
         return -1;
     }
-}  // end vfs_move()
+}  // end vfs_user_move()
 
 //////////////////////////////////////

trunk/kernel/vfs/vfs.h

@@ -732 +732 @@
 
 /****************************************************************************************** 
- * This function moves <size> bytes between the file identified by the open file descriptor
- * <file_xp> and a local kernel or user <buffer>, as defined by the <is_user> argument,
- * and taken into account the offset in <file_xp>.
- * The transfer direction is defined by the <to_buffer> argument.
+ * This function moves <size> bytes between a remote file mapper, identified by the 
+ * <file_xp> argument, and a - possibly distributed - user space <buffer>, taken into 
+ * account the offset in <file_xp>. The transfer direction is defined by <to_buffer>.
+ * This function is called by the sys_read() and sys_write() system calls.
  ******************************************************************************************
  * @ to_buffer : mapper -> buffer if true / buffer -> mapper if false. 
- * @ is_user   : user space buffer if true / local kernel buffer if false. 
  * @ file_xp   : extended pointer on the remote file descriptor.
- * @ buffer    : local pointer on buffer.
+ * @ buffer    : user space pointer on buffer (can be physically distributed).
  * @ size      : requested number of bytes from offset.
  * @ returns number of bytes actually transfered / -1 if error.
  *****************************************************************************************/
-error_t vfs_move( bool_t   to_buffer,
-                  bool_t   is_user,
-                  xptr_t   file_xp, 
-                  void   * buffer,
-                  uint32_t size );
+error_t vfs_user_move( bool_t   to_buffer,
+                       xptr_t   file_xp, 
+                       void   * buffer,
+                       uint32_t size );
 
 /******************************************************************************************