Changeset 629 for trunk/kernel/libk/queuelock.c

Timestamp:

May 17, 2019, 9:27:04 AM (5 years ago)

Author:

alain

Message:

Remove the "giant" rwlock protecting the GPT, and
use the GPT_LOCKED attribute in each PTE to prevent
concurrent modifications of one GPT entry.
The version number has been incremented to 2.1.

File:

• trunk/kernel/libk/queuelock.c (modified) (6 diffs)

trunk/kernel/libk/queuelock.c

@@ -2 +2 @@
  * queuelock.c - local kernel lock with waiting queue implementation.
  *
- * Authors   Alain Greiner     (2016,2017,2018)
+ * Authors   Alain Greiner     (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -47 +47 @@
 #if DEBUG_QUEUELOCK_TYPE
 thread_t * this = CURRENT_THREAD;
-if( DEBUG_QUEUELOCK_TYPE == type )
+if( (type      == DEBUG_QUEUELOCK_TYPE) &&
+    (lock      == DEBUG_QUEUELOCK_PTR ) &&
+    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
 printk("\n[%s] thread[%x,%x] initialise lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -75 +77 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (DEBUG_QUEUELOCK_TYPE == lock_type) || (DEBUG_QUEUELOCK_TYPE == 1000) )
+if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+    (lock      == DEBUG_QUEUELOCK_PTR ) &&
+    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
 printk("\n[%s ] thread[%x,%x] BLOCK on q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -100 +104 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (DEBUG_QUEUELOCK_TYPE == lock_type) || (DEBUG_QUEUELOCK_TYPE == 1000) )
+if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+    (lock      == DEBUG_QUEUELOCK_PTR ) &&
+    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
 printk("\n[%s] thread[%x,%x] ACQUIRE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -126 +132 @@
 uint32_t   lock_type = lock->lock.type;
 thread_t * this      = CURRENT_THREAD;
-if( (DEBUG_QUEUELOCK_TYPE == lock_type) || (DEBUG_QUEUELOCK_TYPE == 1000) )
+if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+    (lock      == DEBUG_QUEUELOCK_PTR ) &&
+    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
 printk("\n[%s] thread[%x,%x] RELEASE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -142 +150 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (DEBUG_QUEUELOCK_TYPE == lock_type) || (DEBUG_QUEUELOCK_TYPE == 1000) )
+if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+    (lock      == DEBUG_QUEUELOCK_PTR ) &&
+    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
 printk("\n[%s] thread[%x,%x] UNBLOCK thread [%x,%x] / q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,