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

Timestamp:

Mar 12, 2019, 1:37:38 PM (5 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/busylock.c (modified) (4 diffs)

trunk/kernel/libk/busylock.c

@@ -2 +2 @@
  * busylock.c - local kernel-busy waiting lock implementation.
  *
- * Authors     Alain Greiner (2016,2017,2018)
+ * Authors     Alain Greiner (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -76 +76 @@
 
 #if DEBUG_BUSYLOCK
-if( (lock->type != LOCK_CHDEV_TXT0) && 
-    ((uint32_t)hal_get_cycles() > DEBUG_BUSYLOCK) )
+if( lock->type != LOCK_CHDEV_TXT0 ) 
 {
+    // update thread list of busylocks
     xptr_t root_xp = XPTR( local_cxy , &this->busylocks_root );
-
-    // update thread list of busylocks
     xlist_add_last( root_xp , XPTR( local_cxy , &lock->xlist ) );
 }
 #endif
 
-#if( DEBUG_BUSYLOCK && DEBUG_BUSYLOCK_THREAD_XP )
+#if( DEBUG_BUSYLOCK & 1 )
 if( (lock->type != LOCK_CHDEV_TXT0) && 
-    (XPTR( local_cxy , this ) == DEBUG_BUSYLOCK_THREAD_XP) )
+    (this->process->pid == DEBUG_BUSYLOCK_PID) &&
+    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
 {
-    // get cluster and local pointer of target thread
-    cxy_t      thread_cxy = GET_CXY( DEBUG_BUSYLOCK_THREAD_XP );
-    thread_t * thread_ptr = GET_PTR( DEBUG_BUSYLOCK_THREAD_XP );
-
-    // display message on kernel TXT0
     printk("\n[%s] thread[%x,%x] ACQUIRE lock %s\n",
     __FUNCTION__, this->process->pid, this->trdid, lock_type_str[lock->type] );
@@ -120 +114 @@
 
 #if DEBUG_BUSYLOCK
-if( (lock->type != LOCK_CHDEV_TXT0) && 
-    ((uint32_t)hal_get_cycles() > DEBUG_BUSYLOCK) )
+if( lock->type != LOCK_CHDEV_TXT0 ) 
 {
     // remove lock from thread list of busylocks
@@ -128 +121 @@
 #endif
 
-#if( DEBUG_BUSYLOCK && DEBUG_BUSYLOCK_THREAD_XP )
+#if( DEBUG_BUSYLOCK & 1 )
 if( (lock->type != LOCK_CHDEV_TXT0) && 
-    (XPTR( local_cxy , this ) == DEBUG_BUSYLOCK_THREAD_XP) )
+    (this->process->pid == DEBUG_BUSYLOCK_PID) &&
+    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
 {
-    // get cluster and local pointer of target thread
-    cxy_t      thread_cxy = GET_CXY( DEBUG_BUSYLOCK_THREAD_XP );
-    thread_t * thread_ptr = GET_PTR( DEBUG_BUSYLOCK_THREAD_XP );
-
-    // display message on kernel TXT0
     printk("\n[%s] thread[%x,%x] RELEASE lock %s\n",
     __FUNCTION__, this->process->pid, this->trdid, lock_type_str[lock->type] );