Changeset 445 for trunk/kernel

Timestamp:

May 29, 2018, 9:27:23 AM (7 years ago)

Author:

alain

Message:

Restructure the mini_libc.

Location:

trunk/kernel

Files:

• kern/printk.c (modified) (2 diffs)
• kern/process.c (modified) (3 diffs)
• kern/process.h (modified) (1 diff)
• kern/scheduler.c (modified) (1 diff)
• kernel_config.h (modified) (4 diffs)
• syscalls/shared_include/almos-mkh (deleted)
• syscalls/shared_include/shared_almos.h (added)
• syscalls/shared_include/shared_dirent.h (added)
• syscalls/shared_include/shared_fcntl.h (added)
• syscalls/shared_include/shared_mman.h (added)
• syscalls/shared_include/shared_pthread.h (added)
• syscalls/shared_include/shared_signal.h (added)
• syscalls/shared_include/shared_stat.h (added)
• syscalls/shared_include/shared_stdlib.h (added)
• syscalls/shared_include/shared_syscalls.h (added)
• syscalls/shared_include/shared_time.h (added)
• syscalls/shared_include/shared_unistd.h (added)
• syscalls/shared_include/shared_wait.h (added)
• syscalls/sys_display.c (modified) (1 diff)
• syscalls/sys_exit.c (modified) (1 diff)
• syscalls/sys_thread_yield.c (modified) (1 diff)
• syscalls/syscalls.h (modified) (3 diffs)

trunk/kernel/kern/printk.c

@@ -30 +30 @@
 #include <chdev.h>
 #include <printk.h>
+#include <shared_syscalls.h>
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -416 +417 @@
 
         // suicide
-        hal_core_sleep();
+        sys_exit( EXIT_FAILURE );
     }
 }

trunk/kernel/kern/process.c

@@ -401 +401 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_DESTROY )
-printk("\n[DBG] %s : thread %x enter in cluster %x / pid %x / process %x / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , pid , process , cycle );
+printk("\n[DBG] %s : thread %x enter for process %x in cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , pid , local_cxy , cycle );
 #endif
 
@@ -447 +447 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_DESTROY )
-printk("\n[DBG] %s : thread %x exit / destroyed process %x (pid = %x) / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD , process, pid, cycle );
+printk("\n[DBG] %s : thread %x exit / destroyed process %x in cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , pid, local_cxy, cycle );
 #endif
 
@@ -1379 +1379 @@
     process_txt_detach( XPTR( local_cxy , old_process ) );
 
-    // request old_thread destruction => old_process destruction
+    // block this old_thread 
     thread_block( XPTR( local_cxy , old_thread ) , THREAD_BLOCKED_GLOBAL );
-    hal_atomic_or( &old_thread->flags , THREAD_FLAG_REQ_DELETE );
+
+    // atomically update old_process descriptor term_state to ask
+    // the parent process (wait() function) to delete this old_thread 
+    hal_atomic_or( &old_process->term_state , PROCESS_TERM_EXIT );
 
     hal_fence();

trunk/kernel/kern/process.h

@@ -535 +535 @@
 /*********************************************************************************************
  * This function detach a process, identified by the <process_xp> argument,
- * from the list of process attached to a given TXT terminal.
+ * from the list of process attached to a given TXT terminal. It transfer the TXT ownership,
+ * if the detached process is the TXT owner.
  * The target process descriptor must be in the owner cluster, but the calling thread can
  * be running in any cluster. 

trunk/kernel/kern/scheduler.c

@@ -248 +248 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
-printk("\n[DBG] %s : thread %x in proces %x on core[%x,%d] deleted / cycle %d\n",
+printk("\n[DBG] %s : thread %x in process %x on core[%x,%d] deleted / cycle %d\n",
 __FUNCTION__ , thread->trdid , process->pid , local_cxy , thread->core->lid , cycle );
 #endif

trunk/kernel/kernel_config.h

@@ -97 +97 @@
 #define DEBUG_PROCESS_GET_LOCAL_COPY   0
 #define DEBUG_PROCESS_INIT_CREATE      0
-#define DEBUG_PROCESS_MAKE_EXEC        0
+#define DEBUG_PROCESS_MAKE_EXEC        1
 #define DEBUG_PROCESS_MAKE_FORK        0
 #define DEBUG_PROCESS_REFERENCE_INIT   0
 #define DEBUG_PROCESS_SIGACTION        0
-#define DEBUG_PROCESS_TXT_ATTACH       0
+#define DEBUG_PROCESS_TXT              2
 #define DEBUG_PROCESS_ZERO_CREATE      0
 
@@ -124 +124 @@
 
 #define DEBUG_SYS_DISPLAY              0
-#define DEBUG_SYS_EXEC                 0
-#define DEBUG_SYS_EXIT                 0
+#define DEBUG_SYS_EXEC                 1
+#define DEBUG_SYS_EXIT                 1
 #define DEBUG_SYS_FG                   0
 #define DEBUG_SYS_FORK                 0
 #define DEBUG_SYS_GET_CONFIG           0
 #define DEBUG_SYS_ISATTY               0
-#define DEBUG_SYS_KILL                 0
+#define DEBUG_SYS_KILL                 2
 #define DEBUG_SYS_MMAP                 0
 #define DEBUG_SYS_READ                 0
@@ -139 +139 @@
 #define DEBUG_SYS_THREAD_SLEEP         0
 #define DEBUG_SYS_THREAD_WAKEUP        0
+#define DEBUG_SYS_THREAD_YIELD         2
 #define DEBUG_SYS_TRACE                0
 #define DEBUG_SYS_WAIT                 0
@@ -153 +154 @@
 #define DEBUG_THREAD_KERNEL_CREATE     0
 #define DEBUG_THREAD_KILL              0
-#define DEBUG_THREAD_USER_CREATE       0
+#define DEBUG_THREAD_USER_CREATE       2
 #define DEBUG_THREAD_USER_FORK         0
 #define DEBUG_THREAD_BLOCK             0

trunk/kernel/syscalls/sys_display.c

@@ -244 +244 @@
         chdev_dir_display();
     }
+    ////////////////////////////////
+    else if( type == DISPLAY_DQDT )
+    {
+        dqdt_display();
+    }
     ////
     else 

trunk/kernel/syscalls/sys_exit.c

@@ -86 +86 @@
         thread_delete( XPTR( local_cxy , this ) , pid , true );
     }
-         
+
     // remove process from TXT list
     process_txt_detach( owner_xp );

trunk/kernel/syscalls/sys_thread_yield.c

@@ -22 +22 @@
  */
 
+#include <hal_types.h>
+#include <hal_special.h>
 #include <scheduler.h>
+#include <thread.h>
 
 int sys_thread_yield()
 {
+ 
+#if DEBUG_SYS_THREAD_YIELD
+uint64_t     tm_start;
+uint64_t     tm_end;
+tm_start = hal_get_cycles();
+if( DEBUG_SYS_THREAD_YIELD < tm_start )
+printk("\n[DBG] %s : thread %x deschedule / process %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, (uint32_t)tm_start );
+#endif
+
+    // deschedule
         sched_yield("user request"); 
+
+#if DEBUG_SYS_THREAD_YIELD
+tm_end = hal_get_cycles();
+if( DEBUG_SYS_THREAD_YIELD < tm_start )
+printk("\n[DBG] %s : thread %x resume / process %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, (uint32_t)tm_end );
+#endif
+
         return 0;
 }

trunk/kernel/syscalls/syscalls.h

@@ -195 +195 @@
  ******************************************************************************************
  * @ pathname   : pathname (can be relative or absolute).
- * @ flags      : bit vector attributes (see below).
+ * @ flags      : bit vector attributes (see in shared_fcntl.h file)
  * @ mode       : access rights.
  * @ return file descriptor index in fd_array if success / return -1 if failure.
@@ -572 +572 @@
  * - DISPLAY_VFS             : all files registered in the VFS cache. 
  * - DISPLAY_CHDEV           : all registered channel devices.
+ * - DISPLAY_DQDT            : all DQDT nodes.
  ******************************************************************************************
  * type      : [in] type of display 
@@ -622 +623 @@
 int sys_fg( pid_t   pid );
 
+/****************************************************************************************** 
+ * [49] TBD
+ ******************************************************************************************
+ * @ cxy    : cluster identifier.
+ * @ lid    : core local index.
+ * @ return 0 if success / return -1 if failure.
+ *****************************************************************************************/
 int sys_place( uint32_t cxy,
                uint32_t lid );