Changeset 267 for soft/giet_vm/giet_libs

Timestamp:

Jan 13, 2014, 3:20:29 PM (11 years ago)

Author:

cfuguet

Message:

• Adding new task context information: THREAD INDEX.

This value can be accessed by USER applications to get the
thread index of the current task. This thread index
corresponds to the index in a vspace.

The value of this index can be forced in the vspace part
of the XML description file using the trdid field in the
task description. When this value is missing, for each
task, a value from 0 to N-1 will be assigned, where N is
the number of task in the vspace.

The user application access this value through the
giet_thread_id() function defined in the stdio library
which uses the SYSCALL_THREAD_ID to access the task
context information.

• Supporting mono TTY platforms

When the GIET_MONO_TTY constant defined in the giet_config
file, contains a value different than 0, all tasks will
share the TTY[0]. If this is the case, in the stdio
library, the giet_tty_printf() function will take the TTY
hardware lock before writing

Location:

soft/giet_vm/giet_libs

Files:

• stdio.c (modified) (8 diffs)
• stdio.h (modified) (2 diffs)

soft/giet_vm/giet_libs/stdio.c

@@ -12 +12 @@
 #include <stdarg.h>
 #include <stdio.h>
+#include <giet_config.h>
 
 
@@ -298 +299 @@
     unsigned int ret;
 
+    if (GIET_MONO_TTY)
+    {
+        ret = sys_call(SYSCALL_TTY_LOCK, 0, 0, 0, 0); // Get TTY lock
+    }
+
 printf_text:
 
@@ -311 +317 @@
                            0xFFFFFFFF,
                            0);
-            if (ret != i)  return 1;     /* return error */ 
+
+            if (ret != i) goto return_error;
+
             format += i;
         }
@@ -319 +327 @@
             goto printf_arguments;
         }
+    }
+
+    if (GIET_MONO_TTY)
+    {
+        ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock
     }
 
@@ -349 +362 @@
                                    0xFFFFFFFF,
                                    0);
-                    if (ret != 1)  return 1;     /* return error */
+                    if (ret != 1) goto return_error;
                 }
             case ('u'):             /* decimal unsigned integer */
@@ -366 +379 @@
                                0xFFFFFFFF,
                                0);
-                if (ret != 2) return 1;       /* return error */
+                if (ret != 2) goto return_error;       /* return error */
                 for(i = 0; i < 8; i++) 
                 {
@@ -394 +407 @@
                        0xFFFFFFFF,
                        0);
-        if (ret != len)  return 1;
+        if (ret != len)  goto return_error;
+        
         goto printf_text;
     }
+
+return_error:
+    if (GIET_MONO_TTY)
+    {
+        ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock
+    }
+
+    return 1;
 }
 
@@ -663 +685 @@
 }
 
+//////////////////////////////////////////////////////////////////////////////////
+// giet_thread_id()
+//////////////////////////////////////////////////////////////////////////////////
+// This functions returns the thread index of the current task.
+//////////////////////////////////////////////////////////////////////////////////
+int giet_thread_id() 
+{
+    return sys_call( SYSCALL_THREAD_ID, 
+                     0, 0, 0, 0 );
+}
+
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////// FAT related system calls ////////////////////////////////////

soft/giet_vm/giet_libs/stdio.h

@@ -31 +31 @@
 #define SYSCALL_FB_SYNC_WRITE     0x10
 #define SYSCALL_FB_SYNC_READ      0x11
-#define SYSCALL_FREE_12           0x12
-#define SYSCALL_FREE_13           0x13
+#define SYSCALL_THREAD_ID         0x12
+#define SYSCALL_TTY_LOCK          0x13
 #define SYSCALL_FREE_14           0x14
 #define SYSCALL_FREE_15           0x15
@@ -209 +209 @@
 extern int giet_global_task_id();
 
+extern int giet_thread_id();
+
 extern void giet_assert( unsigned int, 
                          char* string );