Changeset 604 for trunk/kernel/syscalls/sys_unlink.c

Timestamp:

Dec 3, 2018, 12:18:40 PM (6 years ago)

Author:

alain

Message:

Improve the FAT32 file system to support cat, rm, cp commands.

File:

• trunk/kernel/syscalls/sys_unlink.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_unlink.c

@@ -1 +1 @@
 /*
- * sys_unlink.c - file unlink
+ * sys_unlink.c - file unlink a file
  *
- * Copyright (c) 2008,2009,2010,2011,2012 Ghassan Almaless
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * Author     Alain Greiner (2016,2017,2018)
+ *
+ * Copyright (c)  UPMC Sorbonne Universites
  *
  * This file is part of ALMOS-kernel.
  *
- * ALMOS-kernel is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-kernel is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -17 +18 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <kernel_config.h>
 #include <hal_kernel_types.h>
 #include <hal_uspace.h>
+#include <errno.h>
 #include <vfs.h>
 #include <process.h>
@@ -39 +42 @@
     process_t    * process  = this->process;
 
+#if (DEBUG_SYS_UNLINK || 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 : pathname too long\n", __FUNCTION__ );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : pathname too long\n", __FUNCTION__ );
+#endif
         this->errno = ENFILE;
         return -1;
@@ -50 +60 @@
     hal_strcpy_from_uspace( kbuf , pathname , CONFIG_VFS_MAX_PATH_LENGTH );
 
+#if DEBUG_SYS_UNLINK
+if( DEBUG_SYS_UNLINK < 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;
@@ -69 +85 @@
     if( error )
     {
-        printk("\n[ERROR] in %s : cannot unlink file/dir %s\n",
-               __FUNCTION__ , pathname );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot unlink file/dir %s\n", __FUNCTION__, kbuf );
+#endif
         this->errno = ENFILE;
         return -1;
     }
 
+#if (DEBUG_SYS_UNLINK || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_UNLINK
+if( DEBUG_SYS_UNLINK < 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_UNLINK] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_UNLINK] , 1 );
+#endif
+
     return 0;