Changeset 623 for trunk/kernel/libk/rwlock.c

Timestamp:

Mar 6, 2019, 4:37:15 PM (5 years ago)

Author:

alain

Message:

Introduce three new types of vsegs (KCODE,KDATA,KDEV)
to map the kernel vsegs in the process VSL and GPT.
This now used by both the TSAR and the I86 architectures.

File:

• trunk/kernel/libk/rwlock.c (modified) (12 diffs)

trunk/kernel/libk/rwlock.c

@@ -71 +71 @@
     busylock_acquire( &lock->lock );
 
+#if DEBUG_RWLOCK_TYPE
+uint32_t lock_type = lock->lock.type;
+#endif
+
     // block and deschedule if lock already taken
     while( lock->taken )
@@ -76 +80 @@
 
 #if DEBUG_RWLOCK_TYPE
-uint32_t lock_type = lock->lock.type;
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] READ BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -102 +105 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] READ ACQUIRE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -124 +127 @@
     busylock_acquire( &lock->lock );
 
+#if DEBUG_RWLOCK_TYPE
+uint32_t lock_type = lock->lock.type;
+#endif
+
     // block and deschedule if lock already taken or existing read access
     while( lock->taken || lock->count )
@@ -129 +136 @@
 
 #if DEBUG_RWLOCK_TYPE
-uint32_t lock_type = lock->lock.type;
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] WRITE BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -155 +161 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] WRITE ACQUIRE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -181 +187 @@
 thread_t * this = CURRENT_THREAD;
 uint32_t lock_type = lock->lock.type;
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] READ RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -195 +201 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
@@ -217 +223 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
@@ -251 +257 @@
 thread_t * this = CURRENT_THREAD;
 uint32_t lock_type = lock->lock.type;
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] WRITE RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -264 +270 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
@@ -285 +291 @@
 
 #if DEBUG_RWLOCK_TYPE
-if( DEBUG_RWLOCK_TYPE == lock_type )
+if( (DEBUG_RWLOCK_TYPE == lock_type) || (DEBUG_RWLOCK_TYPE == 1000) )
 printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,