Changeset 611 for trunk/kernel/syscalls/sys_display.c

Timestamp:

Jan 9, 2019, 3:02:51 PM (5 years ago)

Author:

alain

Message:

Introduce sigificant modifs in VFS to support the <ls> command,
and the . and .. directories entries.

File:

• trunk/kernel/syscalls/sys_display.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_display.c

@@ -31 +31 @@
 #include <string.h>
 #include <shared_syscalls.h>
+#include <vfs.h>
+#include <mapper.h>
 
 #include <syscalls.h>
@@ -56 +58 @@
 int sys_display( reg_t  type,
                  reg_t  arg0,
-                 reg_t  arg1 )
+                 reg_t  arg1,
+                 reg_t  arg2 )
 {
 
@@ -278 +281 @@
         thread_display_busylocks( thread_xp );
     }
+    /////////////////////////////////
+    else if( type == DISPLAY_MAPPER )
+    {
+        xptr_t        root_inode_xp;
+        xptr_t        inode_xp;
+        cxy_t         inode_cxy;
+        vfs_inode_t * inode_ptr;
+        xptr_t        mapper_xp;
+        mapper_t    * mapper_ptr;
+
+        char          kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
+
+        char     * path    = (char *)arg0;
+        uint32_t   page_id = (uint32_t)arg1;
+        uint32_t   nbytes  = (uint32_t)arg2;
+
+        // check pathname length
+        if( hal_strlen_from_uspace( path ) >= CONFIG_VFS_MAX_PATH_LENGTH )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s for MAPPER : pathname too long\n",
+ __FUNCTION__ );
+#endif
+            this->errno = ENFILE;
+            return -1;
+        }
+
+        // copy pathname in kernel space
+        hal_strcpy_from_uspace( kbuf , path , CONFIG_VFS_MAX_PATH_LENGTH );
+
+        // compute root inode for pathname 
+        if( kbuf[0] == '/' )                        // absolute path
+        {
+            // use extended pointer on VFS root inode
+            root_inode_xp = process->vfs_root_xp;
+        }
+        else                                        // relative path
+        {
+            // get cluster and local pointer on reference process
+            xptr_t      ref_xp  = process->ref_xp;
+            process_t * ref_ptr = (process_t *)GET_PTR( ref_xp );
+            cxy_t       ref_cxy = GET_CXY( ref_xp );
+
+            // use extended pointer on CWD inode
+            root_inode_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->cwd_xp ) );
+        }
+
+        // get extended pointer on target inode
+        error = vfs_lookup( root_inode_xp,
+                            kbuf,
+                            0,
+                            &inode_xp,
+                            NULL );
+        if( error )
+            {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s for MAPPER : cannot found inode <%s>\n",
+__FUNCTION__ , kbuf );
+#endif
+                    this->errno = ENFILE;
+                    return -1;
+            }
+   
+        // get target inode cluster and local pointer
+        inode_cxy = GET_CXY( inode_xp );
+        inode_ptr = GET_PTR( inode_xp );
+
+        // get extended pointer on target mapper
+        mapper_ptr = hal_remote_lpt( XPTR( inode_cxy , &inode_ptr->mapper ) );
+        mapper_xp  = XPTR( inode_cxy , mapper_ptr );
+
+        // display mapper
+        error = mapper_display_page( mapper_xp , page_id , nbytes , kbuf );
+
+        if( error )
+            {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s for MAPPER : cannot display page %d\n",
+__FUNCTION__ , page_id );
+#endif
+                    this->errno = ENFILE;
+                    return -1;
+            }
+    }
     ////
     else