Changeset 466 for soft/giet_vm/giet_common/tty0.c

Timestamp:

Dec 12, 2014, 4:55:06 PM (10 years ago)

Author:

alain

Message:

1) Introducing a hierarchical, distributed lock, implemented as a

Sliced Binary Tree (sbt_lock_t) in the locks.c and locks.h files.

2) Introducing a kernel level distributed, remote_malloc() service,

In the kernel_malloc.c and kernel_malloc.h files.
This service requires one heap[x][y] global vseg per cluster.
This service is used by the distributed lock.

File:

• soft/giet_vm/giet_common/tty0.c (modified) (11 diffs)

soft/giet_vm/giet_common/tty0.c

@@ -10 +10 @@
 #include <hard_config.h>
 #include <tty0.h>
+#include <stdarg.h>
 #include <tty_driver.h>
-#include <stdarg.h>
 #include <utils.h>
 #include <locks.h>
@@ -114 +114 @@
 }
 
-//////////////////////////////////
-void _printf( char * format, ... ) 
-{
-    va_list ap;
-    va_start(ap, format);
-    unsigned int save_sr;                   // to save SR value in critical section
-
-    // get TTY lock
-    _it_disable( &save_sr );
-    _simple_lock_acquire( &_tty_tx_lock[0] );
+//////////////////////////////////////////////////////////
+static void _kernel_printf( char * format, va_list* args ) 
+{
 
 printf_text:
@@ -143 +136 @@
     }
 
-    // release TTY lock
-    _simple_lock_release( &_tty_tx_lock[0] );
-    _it_restore( &save_sr );
-
-    va_end(ap);
     return;
 
@@ -163 +151 @@
             case ('c'):             /* char conversion */
             {
-                int val = va_arg( ap, int );
+                int val = va_arg( *args , int );
                 len = 1;
                 buf[0] = val;
@@ -171 +159 @@
             case ('d'):             /* 32 bits decimal signed  */
             {
-                int val = va_arg( ap, int );
+                int val = va_arg( *args , int );
                 if (val < 0) 
                 {
@@ -188 +176 @@
             case ('u'):             /* 32 bits decimal unsigned  */
             {
-                unsigned int val = va_arg( ap, unsigned int );
+                unsigned int val = va_arg( *args , unsigned int );
                 for(i = 0; i < 10; i++) 
                 {
@@ -200 +188 @@
             case ('x'):             /* 32 bits hexadecimal unsigned */
             {
-                unsigned int val = va_arg( ap, unsigned int );
+                unsigned int val = va_arg( *args , unsigned int );
                 if ( _tty0_write( "0x" , 2 ) ) goto return_error;
                 for(i = 0; i < 8; i++) 
@@ -213 +201 @@
             case ('l'):            /* 64 bits hexadecimal unsigned */
             {
-                unsigned long long val = va_arg( ap, unsigned long long );
+                unsigned long long val = va_arg( *args , unsigned long long );
                 if ( _tty0_write( "0x" , 2 ) ) goto return_error;
                 for(i = 0; i < 16; i++) 
@@ -226 +214 @@
             case ('s'):             /* string */
             {
-                char* str = va_arg( ap, char* );
+                char* str = va_arg( *args , char* );
                 while (str[len]) 
                 {
@@ -246 +234 @@
 
     {
-        // release TTY lock
-        _simple_lock_release( &_tty_tx_lock[0] );
-        _it_restore( &save_sr );
-
-        // try to print a non protected error message...
+        // try to print an error message and exit...
         unsigned int procid     = _get_procid();
         unsigned int x          = (procid >> (Y_WIDTH + P_WIDTH)) & ((1<<X_WIDTH)-1);
         unsigned int y          = (procid >> P_WIDTH) & ((1<<Y_WIDTH)-1);
         unsigned int lpid       = procid & ((1<<P_WIDTH)-1);
-
         _puts("\n\n[GIET ERROR] in _printf() for processor[");
         _putd( x );
@@ -266 +249 @@
         _exit();
     }
-}  // end _printf()
+}  // end _kernel_printf()
+
+///////////////////////////////////////
+void _nolock_printf( char* format, ...)
+{
+    va_list   args;
+
+    va_start( args , format );
+    _kernel_printf( format , &args );
+    va_end( args );
+}
+////////////////////////////////
+void _printf( char* format, ...)
+{
+    va_list       args;
+    unsigned int  save_sr;
+
+    // get TTY0 lock
+    _it_disable( &save_sr );
+    _sbt_lock_acquire( &_tty_tx_lock[0] );
+
+    va_start( args , format );
+    _kernel_printf( format , &args );
+    va_end( args );
+
+    // release TTY0 lock
+    _sbt_lock_release( &_tty_tx_lock[0] );
+    _it_restore( &save_sr );
+}