Changeset 651 for trunk/kernel/syscalls/sys_lseek.c

Timestamp:

Nov 14, 2019, 11:50:09 AM (4 years ago)

Author:

alain

Message:

1) Improve the VMM MMAP allocator: implement the "buddy" algorithm
to allocate only aligned blocks.
2) fix a bug in the pthread_join() / pthread_exit() mmechanism.

File:

• trunk/kernel/syscalls/sys_lseek.c (modified) (6 diffs)

trunk/kernel/syscalls/sys_lseek.c

@@ -1 +1 @@
 /*
- * kern/sys_lseek.c - set the read/write offset of an opened file 
+ * kern/sys_lseek.c - Kernel function implementing the lseek system call.
  * 
- * Copyright (c) 2008,2009,2010,2011,2012 Ghassan Almaless
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * AUthor        Alain Greiner (2016,2017,2018,2019)
+s
+ * Copyright (c) UPMC Sorbonne Universites
  *
- * This file is part of ALMOS-kernel.
+ * This file is part of ALMOS-MKH.
  *
- * 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
  */
@@ -31 +32 @@
 #include <process.h>
 
-////////////////////////////////
-int sys_lseek (uint32_t file_id,
-               uint32_t offset,
-               uint32_t whence )
+/////////////////////////////////
+int sys_lseek ( uint32_t file_id,
+                uint32_t offset,
+                uint32_t whence )
 {
         error_t    error;
@@ -43 +44 @@
         process_t * process = this->process;
 
+#if (DEBUG_SYS_LSEEK || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_start = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_LSEEK
+if( DEBUG_SYS_LSEEK < tm_start )
+printk("\n[%s] thread[%x,%x] enter / file_id %d / offset %d / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, file_id, offset, (uint32_t)tm_start );
+#endif
+
     // check file_id argument
         if( file_id >= CONFIG_PROCESS_FILE_MAX_NR )
         {
-        printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
-               __FUNCTION__ , file_id );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,%x] illegal file descriptor index %d\n",
+__FUNCTION__ , process->pid, this->trdid, file_id );
+#endif
                 this->errno = EBADFD;
                 return -1;
@@ -57 +71 @@
     if( file_xp == XPTR_NULL )
     {
-        printk("\n[ERROR] in %s : undefined file descriptor index = %d\n",
-               __FUNCTION__ , file_id );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,%x] undefined fd_id %d\n",
+__FUNCTION__, process->pid, this->trdid, file_id );
+#endif
                 this->errno = EBADFD;
                 return -1;
     }
 
-        /* FIXME: file may be closed in parallel 
-         * of seek/read/write/mmap ..etc 
-         * so file may be NULL or invalid */
+// FIXME: file may be closed in parallel of seek/read/write/mmap ..etc 
 
     // call relevant VFS function
@@ -72 +87 @@
         if( error )
         {
-        printk("\n[ERROR] in %s : cannot seek file = %d\n",
-               __FUNCTION__ , file_id );
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,%x] cannot seek file_id %d\n",
+__FUNCTION__, process->pid, this->trdid, file_id );
+#endif
                 this->errno = error;
                 return -1;
         }
+
+#if (DEBUG_SYS_LSEEK || CONFIG_INSTRUMENTATION_SYSCALLS)
+uint64_t     tm_end = hal_get_cycles();
+#endif
+
+#if DEBUG_SYS_LSEEK
+if( DEBUG_SYS_LSEEK < 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_LSEEK] , tm_end - tm_start );
+hal_atomic_add( &syscalls_occurences[SYS_LSEEK] , 1 );
+#endif
   
         return new_offset;