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

Timestamp:

Aug 7, 2017, 12:50:17 PM (7 years ago)

Author:

alain

Message:

Introduce the delayed context switch if current thread has a lock.

File:

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

trunk/kernel/kern/printk.c

@@ -217 +217 @@
 
 //////////////////////////////////////////////////////////////////////////////////////
-// This static function is called by printk() and user_printk() to build
+// This static function is called by printk(), assert() and nolock_printk() to build
 // a formated string.
 //////////////////////////////////////////////////////////////////////////////////////
@@ -375 +375 @@
 }  // end kernel_printf()
 
-/////////////////////////////////
-void printk( char * format , ...)
+//////////////////////////////////
+void printk( char * format , ... )
 {
     va_list       args;
@@ -401 +401 @@
 }
 
-////////////////////////////////////////
-void nolock_printk( char * format , ...)
+/////////////////////////////////////////
+void nolock_printk( char * format , ... )
 {
     va_list       args;
@@ -412 +412 @@
 }
 
-///////////////////////////////////////////
-inline void assert( bool_t       condition,
-                    const char * function_name,
-                    char       * string )
-{
+////////////////////////////////////
+void assert( bool_t       condition,
+             const char * function_name,
+             char       * format, ... )
+{
+    va_list       args;
+    uint32_t      save_sr;
+
     if( condition == false )
     {
-        printk("\n[PANIC] in %s : %s\n" , function_name , string );
+        // get pointers on TXT0 chdev
+        xptr_t    txt0_xp  = chdev_dir.txt[0];
+        cxy_t     txt0_cxy = GET_CXY( txt0_xp );
+        chdev_t * txt0_ptr = GET_PTR( txt0_xp );
+
+        // get extended pointer on remote TXT0 chdev 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 nolock_printk to print function_name
+        nolock_printk("\n[PANIC] in %s : " , function_name );
+
+        // call kernel_printf on TXT0, in busy waiting to print format
+        va_start( args , format );
+        kernel_printf( 0 , 1 , format , &args );
+        va_end( args );
+
+        // release TXT0 lock
+        remote_spinlock_unlock_busy( lock_xp , save_sr );
+
+        // suicide
         hal_core_sleep();
     }