Changeset 610 for trunk/kernel/syscalls/sys_chdir.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_chdir.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_chdir.c

@@ -1 +1 @@
 /*
- * sys_chdir: change process current working directory
+ * sys_chdir.c - kernel function implementing the "chdir" syscall.
  *
- * Author    Alain Greiner (2016,2017)
+ * Author    Alain Greiner (2016,2017,2018)
  *
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * Copyright (c) UPMC Sorbonne Universites
  *
  * This file is part of ALMOS-MKH.
@@ -38 +38 @@
 {
     error_t   error;
+    vseg_t  * vseg; 
+    xptr_t    root_inode_xp;
+
     char      kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
 
     thread_t  * this    = CURRENT_THREAD;
     process_t * process = this->process;
+
+#if (DEBUG_SYS_CHDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
 
     // check pathname length
@@ -48 +55 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : pathname too long / thread %x in process %x\n",
-__FUNCTION__, this->trdid, process->pid );
+printk("\n[ERROR] in %s : pathname too long / thread[%x,%x]\n",
+__FUNCTION__, process->pid, this->trdid );
 #endif
-        this->errno = ENFILE;
+        this->errno = EINVAL;
         return -1;
     }
+
+    // check pathname in user space
+    if( vmm_get_vseg( process, (intptr_t)pathname , &vseg ) )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : user buffer unmapped %x for thread[%x,%x]\n",
+__FUNCTION__ , (intptr_t)pathname , process->pid, this->trdid );
+#endif
+                this->errno = EINVAL;
+        return -1;
+        }
 
     // copy pathname in kernel space
     hal_strcpy_from_uspace( kbuf , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
 
-    printk("\n[ERROR] in %s : not implemented yet\n", __FUNCTION__ );
-    return -1;
+#if DEBUG_SYS_CHDIR
+if( DEBUG_SYS_CHDIR < tm_start )
+printk("\n[%s] thread[%x,%x] enter for <%s> / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, kbuf, (uint32_t)tm_start );
+#endif
 
-    // 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 );
+    // 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 );
 
-    // get extended pointer on cwd lock in reference process
-    // xptr_t lock_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+        // use extended pointer on CWD inode
+        root_inode_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->cwd_xp ) );
+    }
 
-    // get cwd lock in read mode
-    // remote_rwlock_rd_acquire( lock_xp );
-
-    // TODO ce n'et pas au VFS de le faire [AG]
-    // error = vfs_chdir( process->vfs_cwd_xp , kbuf );
-
-    // release cwd lock
-    // remote_rwlock_rd_release( lock_xp );
+    // call the relevant VFS function
+    error = vfs_chdir( root_inode_xp , kbuf );
 
     if( error )
     {
-        printk("\n[ERROR] in %s : cannot change current directory\n", __FUNCTION__ );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot change CWD\n",
+__FUNCTION__ , process->pid , this->trdid );
+#endif
         this->errno = error;
         return -1;
     }
 
+    hal_fence();
+
+#if (DEBUG_SYS_CHDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_CHDIR
+if( DEBUG_SYS_CHDIR < tm_end )
+printk("\n[%s] thread[%x,%x] exit  / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, (uint32_t)tm_end );
+#endif
+ 
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_CHDIR] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_CHDIR] , 1 );
+#endif
+
     return 0;
 }