Changeset 611 for trunk/kernel/syscalls/sys_closedir.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_closedir.c (modified) (4 diffs)

trunk/kernel/syscalls/sys_closedir.c

@@ -1 +1 @@
 /*
- * sys_closedir.c - Close an open directory.
+ * sys_closedir.c - Close an open VFS directory.
  * 
- * Author    Alain Greiner  (2016, 2017)
+ * Author    Alain Greiner  (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -22 +22 @@
  */
 
+#include <kernel_config.h>
 #include <hal_kernel_types.h>
 #include <vfs.h>
@@ -27 +28 @@
 #include <thread.h>
 #include <process.h>
+#include <remote_dir.h>
 #include <errno.h>
 #include <syscalls.h>
@@ -34 +36 @@
 int sys_closedir ( DIR * dirp )
 {
-    printk("\n[ERROR] in %s : not implemented yet\n", __FUNCTION__, dirp );
-    return -1;
+    xptr_t         dir_xp;       // extended pointer on remote_dir_t structure
+
+        thread_t  * this    = CURRENT_THREAD;  // client thread
+        process_t * process = this->process;   // client process
+
+#if (DEBUG_SYS_CLOSEDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_CLOSEDIR
+if( DEBUG_SYS_CLOSEDIR < tm_start )
+printk("\n[%s] thread[%x,%x] enter for DIR <%x> / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, dirp, (uint32_t)tm_start );
+#endif
+ 
+    // get extended pointer on kernel remote_dir_t structure from dirp
+    dir_xp  = remote_dir_from_ident( (intptr_t)dirp );
+
+    if( dir_xp == XPTR_NULL )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : DIR pointer %x not registered\n",
+__FUNCTION__ , process->pid , this->trdid, dirp );
+#endif
+                this->errno = EINVAL;
+                return -1;
+        }       
+
+    // delete kernel remote_dir_t structure
+    remote_dir_destroy( dir_xp );
+
+    hal_fence();
+
+#if (DEBUG_SYS_CLOSEDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_CLOSEDIR
+if( DEBUG_SYS_CLOSEDIR < tm_end )
+printk("\n[%s] thread[%x,%x] exit for DIR <%x> / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, dirp, (uint32_t)tm_end );
+#endif
+ 
+#if CONFIG_INSTRUMENTATION_SYSCALLS
+hal_atomic_add( &syscalls_cumul_cost[SYS_CLOSEDIR] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_CLOSEDIR] , 1 );
+#endif
+
+    return 0;
+
 }  // end sys_closedir()