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

Timestamp:

Oct 1, 2015, 4:20:46 PM (9 years ago)

Author:

alain

Message:

Major release: Change the task model to implement the POSIX threads API.

• The shell "exec" and "kill" commands can be used to activate/de-activate the applications.
• The "pause", "resume", and "context" commands can be used to stop, restart, a single thtead or to display the thread context.

This version has been tested on the following multi-threaded applications,
that have been modified to use the POSIX threads:

• classif
• convol
• transpose
• gameoflife
• raycast

File:

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

soft/giet_vm/giet_common/tty0.c

@@ -12 +12 @@
 #include <stdarg.h>
 #include <tty_driver.h>
+#include <ctx_handler.h>
 #include <utils.h>
 #include <kernel_locks.h>
@@ -30 +31 @@
 spin_lock_t          _tty0_spin_lock  __attribute__((aligned(64)));
 
-//////////////////////////////////////////////
-unsigned int _tty0_write( char*        buffer,
-                          unsigned int nbytes )
+/////////////////////////////////////////////////////
+unsigned int _tty_channel_write( unsigned int channel,
+                                 char*        buffer,
+                                 unsigned int nbytes )
 {
     unsigned int n;
@@ -40 +42 @@
     {
         // test TTY_TX buffer full 
-        if ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) ) // buffer full
+        if ( (_tty_get_register( channel , TTY_STATUS ) & 0x2) ) // buffer full
         {
             // retry if full 
             for( k = 0 ; k < 10000 ; k++ )
             {
-                if ( (_tty_get_register( 0, TTY_STATUS ) & 0x2) == 0) break;
+                if ( (_tty_get_register( channel , TTY_STATUS ) & 0x2) == 0) break;
             }
             // return error if full after 10000 retry
@@ -52 +54 @@
 
         // write one byte
-        if (buffer[n] == '\n') _tty_set_register( 0, TTY_WRITE, (unsigned int)'\r' );
-        _tty_set_register( 0, TTY_WRITE, (unsigned int)buffer[n] );
+        if (buffer[n] == '\n') _tty_set_register( channel, TTY_WRITE, (unsigned int)'\r' );
+        _tty_set_register( channel, TTY_WRITE, (unsigned int)buffer[n] );
     }
     return 0;
@@ -65 +67 @@
     while ( string[n] > 0 ) n++;
 
-    _tty0_write( string, n );
+    _tty_channel_write( 0, string, n );
 }
 
@@ -84 +86 @@
         val = val >> 4;
     }
-    _tty0_write( buf, 10 );
+    _tty_channel_write( 0, buf, 10 );
 }
 
@@ -102 +104 @@
         val = val >> 4;
     }
-    _tty0_write( buf, 18 );
+    _tty_channel_write( 0, buf, 18 );
 }
 
@@ -126 +128 @@
         val /= 10;
     }
-    _tty0_write( &buf[first], 10 - first );
+    _tty_channel_write( 0, &buf[first], 10 - first );
 }
 
@@ -140 +142 @@
 
 //////////////////////////////////////////////////////////
-static void _kernel_printf( char * format, va_list* args ) 
+static void _kernel_printf( unsigned int channel,
+                            char *       format, 
+                            va_list*     args ) 
 {
 
@@ -151 +155 @@
         if (i) 
         {
-            if ( _tty0_write( format, i ) ) goto return_error;
+            if ( _tty_channel_write( channel, format, i ) ) goto return_error;
             format += i;
         }
@@ -188 +192 @@
                 {
                     val = -val;
-                    if ( _tty0_write( "-" , 1 ) ) goto return_error;
+                    if ( _tty_channel_write( channel, "-" , 1 ) ) goto return_error;
                 }
                 for(i = 0; i < 10; i++) 
@@ -214 +218 @@
             {
                 unsigned int val = va_arg( *args , unsigned int );
-                if ( _tty0_write( "0x" , 2 ) ) goto return_error;
+                if ( _tty_channel_write( channel, "0x" , 2 ) ) goto return_error;
                 for(i = 0; i < 8; i++) 
                 {
@@ -227 +231 @@
             {
                 unsigned int val = va_arg( *args , unsigned int );
-                if ( _tty0_write( "0x" , 2 ) ) goto return_error;
+                if ( _tty_channel_write( channel, "0x" , 2 ) ) goto return_error;
                 for(i = 0; i < 8; i++) 
                 {
@@ -240 +244 @@
             {
                 unsigned long long val = va_arg( *args , unsigned long long );
-                if ( _tty0_write( "0x" , 2 ) ) goto return_error;
+                if ( _tty_channel_write( channel, "0x" , 2 ) ) goto return_error;
                 for(i = 0; i < 16; i++) 
                 {
@@ -264 +268 @@
         }
 
-        if ( _tty0_write( pbuf, len ) ) goto return_error;
+        if ( _tty_channel_write( channel, pbuf, len ) ) goto return_error;
         
         goto printf_text;
@@ -284 +288 @@
         _putd( lpid );
         _puts("]\n");
-
         _exit();
     }
@@ -294 +297 @@
     va_list   args;
 
+    // call kernel_printf
     va_start( args , format );
-    _kernel_printf( format , &args );
+    _kernel_printf( 0, format , &args );
     va_end( args );
 }
+
 ////////////////////////////////
 void _printf( char* format, ...)
@@ -309 +314 @@
     else                   _sqt_lock_acquire( &_tty0_sqt_lock );
 
+    // call kernel_printf
     va_start( args , format );
-    _kernel_printf( format , &args );
+    _kernel_printf( 0, format , &args );
     va_end( args );
 
@@ -318 +324 @@
     _it_restore( &save_sr );
 }
+
+/////////////////////////////////////
+void _user_printf( char* format, ...)
+{
+    va_list   args;
+
+    // get calling thread TYY channel
+    unsigned int channel = _get_context_slot( CTX_TTY_ID );
+    if( channel >= NB_TTY_CHANNELS ) 
+    {
+        _puts("\n[GIET ERROR] in _user_printf() : no TTY allocated for thread ");
+        _putx( _get_thread_trdid() );
+        _puts("\n");
+        _exit();
+    }
+
+    // call kernel_printf
+    va_start( args , format );
+    _kernel_printf( channel, format , &args );
+    va_end( args );
+}
+