Changeset 50 for trunk/kernel/libk

Timestamp:

Jun 26, 2017, 3:15:11 PM (7 years ago)

Author:

alain

Message:

bloup

Location:

trunk/kernel/libk

Files:

• remote_rwlock.c (modified) (3 diffs)
• remote_rwlock.h (modified) (1 diff)
• xhtab.c (modified) (4 diffs)

trunk/kernel/libk/remote_rwlock.c

@@ -26 +26 @@
 #include <hal_irqmask.h>
 #include <thread.h>
+#include <printk.h>
 #include <cluster.h>
 #include <scheduler.h>
@@ -185 +186 @@
 
     // compute extended pointers on lock->ticket, lock->owner and thread->remote_locks
-    xptr_t              current_xp = XPTR( lock_cxy   , &lock_ptr->ticket );
+    xptr_t              current_xp = XPTR( lock_cxy   , &lock_ptr->current );
     xptr_t              owner_xp   = XPTR( lock_cxy   , &lock_ptr->owner );
     xptr_t              locks_xp   = XPTR( thread_cxy , &thread_ptr->remote_locks );
@@ -202 +203 @@
 }  // end remote_rwlock_wr_unlock()
 
-
+///////////////////////////////////////////
+void remote_rwlock_print( xptr_t   lock_xp,
+                          char   * comment )
+{
+    uint32_t     ticket;                // first free ticket index
+    uint32_t     current;               // ticket index of current owner 
+    uint32_t     count;                 // current number of reader threads
+    xptr_t       owner;                 // extended pointer on writer thread
+
+    // get cluster and local pointer on remote_rwlock
+    remote_rwlock_t * lock_ptr = (remote_rwlock_t *)GET_PTR( lock_xp );
+    cxy_t             lock_cxy = GET_CXY( lock_xp );
+
+    ticket  = hal_remote_lw ( XPTR( lock_cxy , &lock_ptr->ticket ) );
+    current = hal_remote_lw ( XPTR( lock_cxy , &lock_ptr->current ) );
+    count   = hal_remote_lw ( XPTR( lock_cxy , &lock_ptr->count ) );
+    owner   = hal_remote_lwd( XPTR( lock_cxy , &lock_ptr->owner ) );
+
+    printk("\n*** rwlock <%l> %s : ticket = %d / current = %d / count = %d / owner = %l\n",
+           lock_xp , comment , ticket , current , count , owner ); 
+
+}  // end remote_rwlock_print()
+

trunk/kernel/libk/remote_rwlock.h

@@ -92 +92 @@
 void remote_rwlock_wr_unlock( xptr_t lock_xp );
 
+/***************************************************************************************
+ * Display the lock state on kernel TTY.
+ ***************************************************************************************
+ * @ lock_xp    : extended pointer on the remote rwlock
+ * @ comment    : comment to be printed.
+ **************************************************************************************/
+void remote_rwlock_print( xptr_t   lock_xp,
+                          char   * comment );
+
 #endif

trunk/kernel/libk/xhtab.c

@@ -143 +143 @@
                       xptr_t   xlist_xp )
 {
-
-printk("\n                @@@ xhtab_insert : 0 / name = %s / xhtab_xp = %l / xlist_xp = %l\n",
-       key , xhtab_xp , xlist_xp );
-
     // get xhtab cluster and local pointer 
     cxy_t     xhtab_cxy = GET_CXY( xhtab_xp );
@@ -154 +150 @@
         uint32_t index = xhtab_ptr->index( key );
 
-printk("\n                @@@ xhtab_insert : 1 / name = %s / index = %d\n",
-       key , index );
-
     // take the lock protecting hash table
     remote_rwlock_wr_lock( XPTR( xhtab_cxy , &xhtab_ptr->lock ) );
@@ -168 +161 @@
         remote_rwlock_wr_unlock( XPTR( xhtab_cxy , &xhtab_ptr->lock ) );
 
-printk("\n                @@@ xhtab_insert : 2 / name = %s / item_xp = %l\n",
-       key , item_xp );
-
         return EINVAL;
     }
@@ -183 +173 @@
         // release the lock protecting hash table
         remote_rwlock_wr_unlock( XPTR( xhtab_cxy , &xhtab_ptr->lock ) );
-
-printk("\n                @@@ xhtab_insert : 3 / name = %s / item_xp = %l\n",
-       key , xhtab_ptr->scan( xhtab_xp , index , key ) );
 
         return 0;