Changeset 619 for trunk/kernel/kern/thread.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (6 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/kernel/kern/thread.c (modified) (4 diffs)

trunk/kernel/kern/thread.c

@@ -1378 +1378 @@
 }  // end thread_assert_can yield()
 
-//////////////////////////////////////////////////
-void thread_display_busylocks( xptr_t  thread_xp )
-{
-    // get cluster and local pointer of target thread
+//////////////////////////////////////////////////////
+void thread_display_busylocks( xptr_t       thread_xp,
+                               const char * string )
+{
     cxy_t      thread_cxy = GET_CXY( thread_xp );
     thread_t * thread_ptr = GET_PTR( thread_xp );
@@ -1389 +1389 @@
     xptr_t    iter_xp;
 
-    // get target thread TRDID and busylocks
-    trdid_t  trdid = hal_remote_l32(XPTR( thread_cxy , &thread_ptr->trdid ));
-    uint32_t locks = hal_remote_l32(XPTR( thread_cxy , &thread_ptr->busylocks ));
-
-    // get target thread process and PID;
-    process_t * process = hal_remote_lpt(XPTR( thread_cxy , &thread_ptr->process ));
-    pid_t       pid     = hal_remote_l32(XPTR( thread_cxy , &process->pid ));
+    // get relevant info from target trhead descriptor
+    uint32_t    locks   = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->busylocks ) );
+    trdid_t     trdid   = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );
+    process_t * process = hal_remote_lpt( XPTR( thread_cxy , &thread_ptr->process ) );
+    pid_t       pid     = hal_remote_l32( XPTR( thread_cxy , &process->pid ) );
 
     // get extended pointer on root of busylocks
-    xptr_t    root_xp = XPTR( thread_cxy , &thread_ptr->busylocks_root );
+    xptr_t root_xp = XPTR( thread_cxy , &thread_ptr->busylocks_root );
 
     // get pointers on TXT0 chdev
@@ -1412 +1410 @@
 
     // display header 
-    nolock_printk("\n***** thread %x in process %x : %d busylocks at cycle %d\n",
-    trdid, pid, locks, (uint32_t)hal_get_cycles() );
+    nolock_printk("\n***** thread[%x,%x] in <%s> : %d busylocks *****\n",
+    pid, trdid, string, locks );
 
     // scan the xlist of busylocks when required
@@ -1436 +1434 @@
 
     // display a warning
-    printk("\n[WARNING] set the DEBUG_BUSYLOCK parmeter in kernel_config.h"
-    " to display busylocks for thread %x/%x\n", thread_cxy, thread_ptr );
+    printk("\n[WARNING] set the DEBUG_BUSYLOCK parameter in kernel_config.h"
+    " to display busylocks for thread(%x,%x)\n", pid, trdid );
 
 }  // end thread_display_busylock()