Changeset 610 for trunk/kernel/syscalls/sys_mkdir.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_mkdir.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_mkdir.c

@@ -1 +1 @@
 /*
- * sys_mkdir.c - Create a new directory in file system.
+ * sys_mkdir.c - creates a new directory in VFS 
  *
- * Author    Alain Greiner (2016,2017)
+ * Author     Alain Greiner (2016,2017,2018)
  *
- * Copyright (c) UPMC Sorbonne Universites
+ * Copyright (c)  UPMC Sorbonne Universites
  *
- * This file is part of ALMOS-MKH.
+ * This file is part of ALMOS-kernel.
  *
  * ALMOS-MKH is free software; you can redistribute it and/or modify it
@@ -22 +22 @@
  */
 
+#include <kernel_config.h>
 #include <hal_kernel_types.h>
 #include <hal_uspace.h>
+#include <errno.h>
 #include <vfs.h>
-#include <vmm.h>
-#include <errno.h>
 #include <process.h>
 #include <thread.h>
 #include <printk.h>
 
-///////////////////////////////////
-int sys_mkdir( char     * pathname,
-               uint32_t   mode __attribute__((unused)) )
+#include <syscalls.h>
+
+////////////////////////////////////
+int sys_mkdir ( char     * pathname,
+                uint32_t   rights __attribute__((unused)) )
 {
-    error_t        error;
-    char           kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
+    error_t   error;
+    xptr_t    root_inode_xp;                     // extended pointer on root inode
+    char      kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
 
     thread_t     * this     = CURRENT_THREAD;
     process_t    * process  = this->process;
 
-    // check fd_array not full
-    if( process_fd_array_full() )
+#if (DEBUG_SYS_MKDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
+    // check pathname length
+    if( hal_strlen_from_uspace( pathname ) >= CONFIG_VFS_MAX_PATH_LENGTH )
     {
-        printk("\n[ERROR] in %s : file descriptor array full for process %x\n",
-               __FUNCTION__ , process->pid );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : pathname too long\n", __FUNCTION__ );
+#endif
         this->errno = ENFILE;
         return -1;
     }
 
-    // check pathname length
-    if( hal_strlen_from_uspace( pathname ) >= CONFIG_VFS_MAX_PATH_LENGTH )
+    // copy pathname in kernel space
+    hal_strcpy_from_uspace( kbuf , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
+
+#if DEBUG_SYS_MKDIR
+if( DEBUG_SYS_MKDIR < 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
+ 
+    // compute root inode for path 
+    if( kbuf[0] == '/' )                        // absolute path
     {
-        printk("\n[ERROR] in %s : pathname too long\n", __FUNCTION__ );
+        // 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 relevant VFS function
+    error  = vfs_mkdir( root_inode_xp , kbuf , rights );
+
+    if( error )
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot create directory <%s>\n", __FUNCTION__, kbuf );
+#endif
         this->errno = ENFILE;
         return -1;
     }
 
-    printk("\n[ERROR] in %s : not implemented yet\n", __FUNCTION__ );
-    return -1;
-    
-    // copy pathname in kernel space
-    hal_strcpy_from_uspace( kbuf , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
+#if (DEBUG_SYS_MKDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#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 );
-
-    // get extended pointer on cwd inode
-    // xptr_t cwd_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->vfs_cwd_xp ) );
-
-    // get the cwd lock in read mode from reference process
-    // remote_rwlock_rd_lock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
-
-    // call the relevant VFS function
-    // error = vfs_mkdir( cwd_xp,
-    //                   kbuf,
-    //                   mode );
-
-    // release the cwd lock
-    // remote_rwlock_rd_unlock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
-
-    if( error )
-    {
-        printk("\n[ERROR] in %s : cannot create directory %s\n",
-               __FUNCTION__ , kbuf );
-        this->errno = error;
-        return -1;
-    }
+#if DEBUG_SYS_MKDIR
+if( DEBUG_SYS_MKDIR < tm_end )
+printk("\n[%s] thread[%x,%x] exit for <%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_MKDIR] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_MKDIR] , 1 );
+#endif
 
     return 0;
-}
+
+} // end sys_mkdir()