Changeset 564 for trunk/kernel/kern/printk.c

Timestamp:

Oct 4, 2018, 11:47:36 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/kern/printk.c (modified) (12 diffs)

trunk/kernel/kern/printk.c

@@ -26 +26 @@
 #include <hal_special.h>
 #include <dev_txt.h>
-#include <remote_spinlock.h>
+#include <remote_busylock.h>
 #include <cluster.h>
 #include <thread.h>
@@ -201 +201 @@
 // @ args      : va_list of arguments.
 //////////////////////////////////////////////////////////////////////////////////////
-static void kernel_printf( char     * format, 
-                           va_list  * args ) 
+static void kernel_printf( const char * format, 
+                           va_list    * args ) 
 {
 
@@ -352 +352 @@
 {
     va_list       args;
-    reg_t         save_sr;
 
     // get pointers on TXT0 chdev
@@ -359 +358 @@
     chdev_t * txt0_ptr = GET_PTR( txt0_xp );
 
-    // get extended pointer on remote TXT0 chdev lock
+    // get extended pointer on remote TXT0 lock
     xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
-    // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( lock_xp , &save_sr );
-
-    // call kernel_printf on TXT0, in busy waiting mode
+    // get TXT0 lock
+    remote_busylock_acquire( lock_xp );
+
+    // display format on TXT0 in busy waiting mode
     va_start( args , format );
     kernel_printf( format , &args );
     va_end( args );
 
-    // release lock
-    remote_spinlock_unlock_busy( lock_xp , save_sr );
+    // release TXT0 lock
+    remote_busylock_release( lock_xp );
 }
 
@@ -386 +385 @@
 
 ////////////////////////////////////
-void __panic( const char * file_name,
-              const char * function_name,
-              uint32_t     line,
-              cycle_t      cycle,
-              const char * format,
-              ... )
+void panic( const char * file_name,
+            const char * function_name,
+            uint32_t     line,
+            cycle_t      cycle,
+            const char * format,
+            ... )
 {
     // get pointers on TXT0 chdev
@@ -399 +398 @@
 
     // get extended pointer on remote TXT0 lock
-    xptr_t lock_txt0_xp = XPTR(txt0_cxy, &txt0_ptr->wait_lock);
-
-    // get TXT0 lock in busy waiting mode
-    {
-        uint32_t save_sr;
-        remote_spinlock_lock_busy(lock_txt0_xp, &save_sr);
-
-        thread_t *current = CURRENT_THREAD;
-        nolock_printk(
-            "\n[PANIC] in %s: line %d | funct %s | cycle %d\n"
-            "core[%x,%d] | thread %x in process %x\n"
-            "            | thread_ptr %x | procress_ptr %x\n",
+    xptr_t lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
+
+    // get TXT0 lock 
+    remote_busylock_acquire( lock_xp );
+
+    // get calling thread
+    thread_t * current = CURRENT_THREAD;
+
+    // print generic infos
+    nolock_printk(
+            "\n[PANIC] in %s: line %d | function %s | cycle %d\n"
+            "core[%x,%d] | thread %x (%x) in process %x (%x)\n",
             file_name, line, function_name, (uint32_t) cycle,
-            local_cxy, current->core->lid, current->trdid, current->process->pid,
-            current, current->process);
-
-        // call kernel_printf on TXT0, in busy waiting to print format
-        va_list args;
-        va_start(args, format);
-        kernel_printf(format, &args);
-        va_end(args);
-
-        // release TXT0 lock
-        remote_spinlock_unlock_busy(lock_txt0_xp, save_sr);
-    }
+            local_cxy, current->core->lid, 
+            current->trdid, current,
+            current->process->pid, current->process );
+
+    // call kernel_printf to print format
+    va_list args;
+    va_start(args, format);
+    kernel_printf(format, &args);
+    va_end(args);
+
+    // release TXT0 lock
+    remote_busylock_release( lock_xp );
 
     // suicide
@@ -432 +431 @@
 void puts( char * string ) 
 {
-    uint32_t   save_sr;
     uint32_t   n = 0;
 
@@ -443 +441 @@
     chdev_t * txt0_ptr = GET_PTR( txt0_xp );
 
-    // get extended pointer on remote TXT0 chdev lock
+    // get extended pointer on remote TXT0 lock
     xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
-    // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( lock_xp , &save_sr );
+    // get TXT0 lock 
+    remote_busylock_acquire( lock_xp );
 
     // display string on TTY0
     dev_txt_sync_write( string , n );
 
-    // release TXT0 lock in busy waiting mode
-    remote_spinlock_unlock_busy( lock_xp , save_sr );
+    // release TXT0 lock
+    remote_busylock_release( lock_xp );
 }
 
@@ -464 +462 @@
     char      buf[10];
     uint32_t  c;
-    uint32_t  save_sr;
 
     buf[0] = '0';
@@ -484 +481 @@
     xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
-    // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( lock_xp , &save_sr );
+    // get TXT0 lock 
+    remote_busylock_acquire( lock_xp );
 
     // display string on TTY0
     dev_txt_sync_write( buf , 10 );
 
-    // release TXT0 lock in busy waiting mode
-    remote_spinlock_unlock_busy( lock_xp , save_sr );
+    // release TXT0 lock
+    remote_busylock_release( lock_xp );
 }
 
@@ -501 +498 @@
     char      buf[18];
     uint32_t  c;
-    uint32_t  save_sr;
 
     buf[0] = '0';
@@ -521 +517 @@
     xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
-    // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( lock_xp , &save_sr );
+    // get TXT0 lock 
+    remote_busylock_acquire( lock_xp );
 
     // display string on TTY0
     dev_txt_sync_write( buf , 18 );
 
-    // release TXT0 lock in busy waiting mode
-    remote_spinlock_unlock_busy( lock_xp , save_sr );
+    // release TXT0 lock
+    remote_busylock_release( lock_xp );
 }