Changeset 437 for trunk/kernel/syscalls

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

Location:

trunk/kernel/syscalls

Files:

• shared_syscalls.h (modified) (1 diff)
• sys_isatty.c (added)
• sys_munmap.c (modified) (3 diffs)
• sys_thread_create.c (modified) (9 diffs)
• syscalls.h (modified) (1 diff)

trunk/kernel/syscalls/shared_syscalls.h

@@ -61 +61 @@
         SYS_CLOSEDIR       = 25,
         SYS_GETCWD         = 26,
-        SYS_UNDEFINED_27   = 27,   ///
+        SYS_ISATTY         = 27, 
         SYS_ALARM          = 28,   
         SYS_RMDIR          = 29,

trunk/kernel/syscalls/sys_munmap.c

@@ -3 +3 @@
  * 
  * Authors       Ghassan Almaless (2008,2009,2010,2011,2012)
- *               Alain Greiner (2016,2017)
+ *               Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -40 +40 @@
     error_t       error;
 
-        uint32_t      tm_start;
-        uint32_t      tm_end;
-
-        tm_start = hal_get_cycles();
-
         thread_t    * this    = CURRENT_THREAD;
         process_t   * process = this->process;
+
+#if CONFIG_DEBUG_SYS_MUNMAP
+uint64_t tm_start;
+uint64_t tm_end;
+tm_start = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_MUNMAP < tm_start )
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n"
+__FUNCTION__ , this, process->pid, (uint32_t)tm_start );
+#endif
 
     // call relevant kernel function
@@ -53 +57 @@
     if ( error )
     {
-        printk("\n[ERROR] in %s : cannot remove mapping\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot remove mapping\n", __FUNCTION__ );
+#endif
                 this->errno = EINVAL;
                 return -1;
     }
 
-    tm_end = hal_get_cycles();
+#if CONFIG_DEBUG_SYS_MUNMAP
+tm_end = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_MUNMAP < tm_start )
+printk("\n[DBG] %s : thread %x exit / process %x / cycle %d\n"
+__FUNCTION__ , this, process->pid, (uint32_t)tm_end );
+#endif
 
-syscall_dmsg("\n[DBG] %s : core[%x,%d] removed vseg in process %x / cycle %d\n"
-"      base = %x / size = %x / cost = %d\n",
-__FUNCTION__, local_cxy , this->core->lid , process->pid , tm_start ,
-vaddr , size , tm_end - tm_start );
+    return 0;
 
-        return 0;
+}  // end sys_munmap()
 
-}  // end sys_mmap()
-

trunk/kernel/syscalls/sys_thread_create.c

@@ -2 +2 @@
  * sys_thread_create.c - creates a new user thread
  *
- * Author     Alain Greiner (2016,2017)
+ * Author     Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -57 +57 @@
         error_t          error;
 
-        uint32_t         tm_start;
-        uint32_t         tm_end;
-
-        tm_start = hal_get_cycles();
-
         // get parent thead pointer, extended pointer, and process 
         parent     = CURRENT_THREAD;
@@ -67 +62 @@
         process    = parent->process;
 
+#if CONFIG_DEBUG_SYS_THREAD_CREATE
+uint64_t tm_start;
+uint64_t tm_end;
+tm_start = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_THREAD_CREATE < tm_start )
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n"
+__FUNCTION__ , parent , process->pid, (uint32_t)tm_start );
+#endif
+
         // check user_attr in user space & copy to kernel space
     if( user_attr != NULL )
@@ -74 +78 @@
             if( error )
             {
-                    printk("\n[ERROR] in %s : user_attr unmapped\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : user_attr unmapped\n", __FUNCTION__ );
+#endif
                     parent->errno = EINVAL;
                     return -1;
@@ -87 +94 @@
         if( error )
         {
-                printk("\n[ERROR] in %s : start_func unmapped\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : start_func unmapped\n", __FUNCTION__ );
+#endif
                 parent->errno = EINVAL;
                 return -1;
@@ -97 +107 @@
         if( error )
         {
-                printk("\n[ERROR] in %s : start_arg unmapped\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : start_arg unmapped\n", __FUNCTION__ );
+#endif
                 parent->errno = EINVAL;
                 return -1;
@@ -110 +123 @@
                     if( cluster_is_undefined( kern_attr.cxy ) )
                     {
-                            printk("\n[ERROR] in %s : illegal target cluster = %x\n",
-                            __FUNCTION__ , kern_attr.cxy );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : illegal target cluster = %x\n", __FUNCTION__ , kern_attr.cxy );
+#endif
                             parent->errno = EINVAL;
                             return -1;
@@ -158 +173 @@
         if( error )
         {
-                printk("\n[ERROR] in %s : cannot create thread\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot create thread\n", __FUNCTION__ );
+#endif
                 return ENOMEM;
         }
@@ -178 +196 @@
     hal_fence();
 
-        tm_end = hal_get_cycles();
-
-syscall_dmsg("\n[DBG] %s : core[%x,%d] created thread %x for process %x / cycle %d\n"
-"      cluster %x / cost = %d cycles\n",
-__FUNCTION__ , local_cxy , parent->core->lid , trdid , process->pid , tm_end ,
-target_cxy , tm_end - tm_start );
+#if CONFIG_DEBUG_SYS_THREAD_CREATE
+tm_end = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_THREAD_CREATE < tm_end )
+printk("\n[DBG] %s : thread %x created thread %x for process %x in cluster %x / cycle %d\n"
+__FUNCTION__, parent, child_ptr, process->pid, target_cxy, (uint32_t)tm_end );
+#endif
 
         return 0;

trunk/kernel/syscalls/syscalls.h

@@ -356 +356 @@
 
 /****************************************************************************************** 
- * [27] This slot is not used.
- *****************************************************************************************/
+ * [27] This function tests whether a given file descriptor dentified by the <file_id>
+ * argument is an open file descriptor referring to a terminal.
+ ******************************************************************************************
+ * @ file_id   : file descriptor index
+ * @ return 1 if it is a TXT device / return 0 if it is not a TXT device.
+ *****************************************************************************************/
+int sys_isatty( uint32_t file_id );
 
 /******************************************************************************************