Changeset 610 for trunk/kernel/syscalls/sys_opendir.c

Timestamp:

Dec 27, 2018, 7:38:58 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

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

trunk/kernel/syscalls/sys_opendir.c

@@ -2 +2 @@
  * sys_opendir.c - open a directory.
  * 
- * Author        Alain Greiner (2016,2017)
+ * Author        Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -23 +23 @@
 
 #include <hal_kernel_types.h>
+#include <hal_uspace.h>
 #include <thread.h>
 #include <process.h>
@@ -35 +36 @@
                   DIR  ** dirp )
 {
-    printk("\n[ERROR] in %s : not implemented yet\n", __FUNCTION__, pathname, dirp );
-    return -1;
-}  // end sys opendir()
+    error_t       error;
+    vseg_t      * vseg;                   // for user space checking
+    xptr_t        root_inode_xp;          // extended pointer on path root inode
+
+    char          kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
+        
+        thread_t  * this    = CURRENT_THREAD;
+        process_t * process = this->process;
+
+#if (DEBUG_SYS_OPENDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
+    // check DIR buffer in user space
+    error = vmm_get_vseg( process , (intptr_t)dirp, &vseg );
+
+        if( error )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : DIR buffer %x unmapped\n",
+__FUNCTION__ , process->pid , this->trdid, dirp );
+vmm_display( process , false );
+#endif
+                this->errno = EINVAL;
+                return -1;
+        }       
+
+    // check pathname length
+    if( hal_strlen_from_uspace( pathname ) >= CONFIG_VFS_MAX_PATH_LENGTH )
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : pathname too long\n",
+ __FUNCTION__ , process->pid , this->trdid );
+#endif
+        this->errno = ENFILE;
+        return -1;
+    }
+
+    // copy pathname in kernel space
+    hal_strcpy_from_uspace( kbuf , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
+
+#if DEBUG_SYS_OPENDIR
+if( DEBUG_SYS_OPENDIR < tm_start )
+printk("\n[%s] thread[%x,%x] enter for directory <%s> / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, kbuf, (uint32_t)tm_start );
+#endif
+
+    // compute root inode for path 
+    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 ) );
+    }
+
+/*
+    // call the relevant VFS function ???
+    error = vfs_opendir( root_inode_xp,
+                         kbuf );
+    if( error )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot open directory <%s>\n",
+__FUNCTION__ , process->pid , this->trdid , pathname );
+#endif
+                this->errno = ENFILE;
+                return -1;
+        }
+   
+    // copy to user space ???
+*/
+
+    hal_fence();
+
+#if (DEBUG_SYS_OPENDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_OPENDIR
+if( DEBUG_SYS_OPENDIR < tm_end )
+printk("\n[%s] thread[%x,%x] exit for directory <%s> / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, kbuf, (uint32_t)tm_end );
+#endif
+ 
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_OPENDIR] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_OPENDIR] , 1 );
+#endif
+
+        return 0;
+
+}  // end sys_opendir()