Changeset 657 for trunk/kernel/fs/devfs.c

Timestamp:

Mar 18, 2020, 11:16:59 PM (5 years ago)

Author:

alain

Message:

Introduce remote_buf.c/.h & socket.c/.h files.
Update dev_nic.c/.h files.

File:

• trunk/kernel/fs/devfs.c (modified) (9 diffs)

trunk/kernel/fs/devfs.c

@@ -3 +3 @@
  *
  * Author   Mohamed Lamine Karaoui (2014,2015)
- *          Alain Greiner (2016,2017,2018,2019)
+ *          Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) Sorbonne Universites
@@ -53 +53 @@
 #endif
 
-/////////////////////////////////////
-devfs_ctx_t * devfs_ctx_alloc( void )
+///////////////////////////////////
+xptr_t devfs_ctx_alloc( cxy_t cxy )
 {
     kmem_req_t    req;
@@ -62 +62 @@
     req.flags   = AF_KERNEL | AF_ZERO;
 
-        return kmem_alloc( &req );
+    // allocates devfs context from target cluster 
+        return XPTR( cxy , kmem_remote_alloc( cxy , &req ) );
 }
 
 /////////////////////////////////////////////
-void devfs_ctx_init( devfs_ctx_t * devfs_ctx,
-                     xptr_t        devfs_dev_inode_xp,
-                     xptr_t        devfs_external_inode_xp )
+void devfs_ctx_init( xptr_t     devfs_ctx_xp,
+                     xptr_t     devfs_dev_inode_xp,
+                     xptr_t     devfs_external_inode_xp )
 {
-    devfs_ctx->dev_inode_xp      = devfs_dev_inode_xp;
-    devfs_ctx->external_inode_xp = devfs_external_inode_xp;
-
-    fs_context[FS_TYPE_DEVFS].extend = devfs_ctx;
+    // get cluster and local pointer on remote devfs context
+    devfs_ctx_t * devfs_ctx_ptr = GET_PTR( devfs_ctx_xp );
+    cxy_t         devfs_ctx_cxy = GET_CXY( devfs_ctx_xp );
+
+    // set values in remote devfs context
+    hal_remote_s64( XPTR( devfs_ctx_cxy  , &devfs_ctx_ptr->dev_inode_xp ),
+                    devfs_dev_inode_xp );
+
+    hal_remote_s64( XPTR( devfs_ctx_cxy  , &devfs_ctx_ptr->external_inode_xp ),
+                    devfs_external_inode_xp );
+
+    // register devfs context in the remote fs_context array[] 
+    hal_remote_spt( XPTR( devfs_ctx_cxy , &fs_context[FS_TYPE_DEVFS].extend ),
+                          devfs_ctx_ptr ); 
 }
 
-/////////////////////////////////////////////////
-void devfs_ctx_destroy( devfs_ctx_t * devfs_ctx )
+//////////////////////////////////////////////
+void devfs_ctx_destroy( xptr_t  devfs_ctx_xp )
 {
     kmem_req_t    req;
 
+    // get cluster and local pointer on devfs context
+    devfs_ctx_t * devfs_ctx_ptr = GET_PTR( devfs_ctx_xp );
+    cxy_t         devfs_ctx_cxy = GET_CXY( devfs_ctx_xp );
+
     req.type = KMEM_KCM;
-    req.ptr  = devfs_ctx;
-    kmem_free( &req );
+    req.ptr  = devfs_ctx_ptr;
+
+    // release devfs context descriptor to remote cluster 
+    kmem_remote_free( devfs_ctx_cxy , &req );
 }
 
@@ -95 +112 @@
     vfs_inode_t * inode;
 
+    // get 
+
     // create DEVFS "dev" inode in cluster 0
     error = vfs_add_child_in_parent( 0,                // cxy
@@ -158 +177 @@
 ///////////////////////////////////////////////////
 void devfs_local_init( xptr_t   devfs_dev_inode_xp,
-                       xptr_t   devfs_external_inode_xp,
-                       xptr_t * devfs_internal_inode_xp )
+                       xptr_t   devfs_external_inode_xp )
 {
+    xptr_t        internal_inode_xp;   // extended pointer on <internal> inode
+    vfs_inode_t * internal_inode_ptr;  // local pointer on <internal> inode
     char          node_name[16];
     xptr_t        chdev_xp;
@@ -168 +188 @@
     vfs_inode_t * inode_ptr;
     uint32_t      channel;
-    xptr_t        unused_xp;    // required by add_child_in_parent()
+    xptr_t        unused_xp;           // required by add_child_in_parent()
     error_t       error;
+    
 
 #if DEBUG_DEVFS_LOCAL_INIT 
@@ -179 +200 @@
 #endif
 
-    // create "internal" directory 
+    // create <internal> directory 
     snprintf( node_name , 16 , "internal_%x" , local_cxy );
 
-    error = vfs_add_child_in_parent( local_cxy,
-                                     FS_TYPE_DEVFS,
-                                     devfs_dev_inode_xp,
-                                     node_name,
+    error = vfs_add_child_in_parent( local_cxy,              // target cluster
+                                     FS_TYPE_DEVFS,          // FS type
+                                     devfs_dev_inode_xp,     // parent inode
+                                     node_name,              // child name
                                      &unused_xp,
-                                     devfs_internal_inode_xp );
-
-    // set inode "type" field
-    inode_ptr = GET_PTR( *devfs_internal_inode_xp );
-    inode_ptr->type = INODE_TYPE_DEV;
+                                     &internal_inode_xp );   // child inode
+
+    // set <internal> inode "type" field
+    internal_inode_ptr       = GET_PTR( internal_inode_xp );
+    internal_inode_ptr->type = INODE_TYPE_DEV;
  
     // create dentries <.> and <..> in <internal>
-    error |= vfs_add_special_dentries( *devfs_internal_inode_xp,
+    error |= vfs_add_special_dentries( internal_inode_xp,
                                        devfs_dev_inode_xp );
 
@@ -226 +247 @@
         error = vfs_add_child_in_parent( local_cxy,
                                          FS_TYPE_DEVFS,
-                                         *devfs_internal_inode_xp,
+                                         internal_inode_xp,
                                          chdev_ptr->name,
                                          &unused_xp,
@@ -270 +291 @@
             error = vfs_add_child_in_parent( local_cxy,
                                              FS_TYPE_DEVFS,
-                                             *devfs_internal_inode_xp,
+                                             internal_inode_xp,
                                              chdev_ptr->name,
                                              &unused_xp,