Changeset 624 for trunk/kernel/libk/remote_busylock.c

Timestamp:

Mar 12, 2019, 1:37:38 PM (6 years ago)

Author:

alain

Message:

Fix several bugs to use the instruction MMU in kernel mode
in replacement of the instruction address extension register,
and remove the "kentry" segment.

This version is running on the tsar_generic_iob" platform.

One interesting bug: the cp0_ebase defining the kernel entry point
(for interrupts, exceptions and syscalls) must be initialized
early in kernel_init(), because the VFS initialisation done by
kernel_ini() uses RPCs, and RPCs uses Inter-Processor-Interrup.

File:

• trunk/kernel/libk/remote_busylock.c (modified) (4 diffs)

trunk/kernel/libk/remote_busylock.c

@@ -2 +2 @@
  * remote_busylock.c - remote kernel busy-waiting lock implementation.
  *
- * Authors     Alain Greiner (2016,2017,2018)
+ * Authors     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -87 +87 @@
 #if DEBUG_BUSYLOCK
 uint32_t type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->type ) );
-if( (type != LOCK_CHDEV_TXT0) &&
-    ((uint32_t)hal_get_cycles() > DEBUG_BUSYLOCK) )
+if( type != LOCK_CHDEV_TXT0 )
 {
+    // update thread list of busyslocks
     xptr_t root_xp = XPTR( local_cxy , &this->busylocks_root );
-
-    // update thread list of busyslocks
     xlist_add_last( root_xp , XPTR( lock_cxy  , &lock_ptr->xlist ) );
 }
 #endif
 
-#if( DEBUG_BUSYLOCK && DEBUG_BUSYLOCK_THREAD_XP )
+#if( DEBUG_BUSYLOCK & 1 )
 if( (type != LOCK_CHDEV_TXT0) && 
-    (XPTR( local_cxy , this ) == DEBUG_BUSYLOCK_THREAD_XP) )
+    (this->process->pid == DEBUG_BUSYLOCK_PID) &&
+    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
 {
     printk("\n[%s] thread[%x,%x] ACQUIRE lock %s\n",
@@ -131 +130 @@
 #if DEBUG_BUSYLOCK
 uint32_t type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->type ) );
-if( (type != LOCK_CHDEV_TXT0) && 
-    (XPTR( local_cxy , this ) == DEBUG_BUSYLOCK_THREAD_XP) &&
-    ((uint32_t)hal_get_cycles() > DEBUG_BUSYLOCK) )
+if( type != LOCK_CHDEV_TXT0 ) 
 {
     // remove lock from thread list of busyslocks
@@ -140 +137 @@
 #endif
 
-#if (DEBUG_BUSYLOCK && DEBUG_BUSYLOCK_THREAD_XP )
+#if( DEBUG_BUSYLOCK & 1 )
 if( (type != LOCK_CHDEV_TXT0) && 
-    (XPTR( local_cxy , this ) == DEBUG_BUSYLOCK_THREAD_XP) )
+    (this->process->pid == DEBUG_BUSYLOCK_PID) &&
+    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
 {
     printk("\n[%s] thread[%x,%x] RELEASE lock %s\n",