Changeset 267 for soft/giet_vm/giet_boot/boot.c

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

File:

• soft/giet_vm/giet_boot/boot.c (modified) (6 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -1157 +1157 @@
     //   are reserved for the kernel (context switch)
 
-    unsigned int alloc_tty_channel = 1;            // TTY channel allocator
+    unsigned int alloc_tty_channel = 0;            // TTY channel allocator
     unsigned int alloc_nic_channel = 0;            // NIC channel allocator
     unsigned int alloc_cma_channel = 0;            // CMA channel allocator
     unsigned int alloc_hba_channel = 0;            // IOC channel allocator
     unsigned int alloc_tim_channel[X_SIZE*Y_SIZE]; // user TIMER allocators
+
+    if (!GIET_MONO_TTY) alloc_tty_channel++;
 
     /////////////////////////////////////////////////////////////////////////
@@ -1364 +1366 @@
                 }
                 ctx_tty = alloc_tty_channel;
-                alloc_tty_channel++;
+                if (!GIET_MONO_TTY) alloc_tty_channel++;
             }
             // ctx_nic : NIC channel global index provided by the global allocator
@@ -1468 +1470 @@
             // get local task index in scheduler
             unsigned int ltid = psched->tasks;
+
+            // get vspace thread index
+            unsigned int thread_id = task[task_id].trdid;
 
             if (ltid >= IDLE_TASK_INDEX) 
@@ -1500 +1505 @@
             psched->context[ltid][CTX_LTID_ID]  = ltid;
             psched->context[ltid][CTX_GTID_ID]  = task_id;
+            psched->context[ltid][CTX_TRDID_ID] = thread_id;
             psched->context[ltid][CTX_VSID_ID]  = vspace_id;
             psched->context[ltid][CTX_RUN_ID]   = 1;
@@ -1505 +1511 @@
 #if BOOT_DEBUG_SCHED
 _puts("\nTask ");
-_puts( task[task_id].name );
-_puts(" (");
 _putd( task_id );
-_puts(") allocated to processor ");
+_puts(" allocated to processor ");
 _putd( gpid );
 _puts("\n  - ctx[LTID]   = ");
@@ -1536 +1540 @@
 _puts("\n  - ctx[VSID]   = ");
 _putd( psched->context[ltid][CTX_VSID_ID] );
+_puts("\n  - ctx[TRDID]  = ");
+_putd( psched->context[ltid][CTX_TRDID_ID] );
 _puts("\n");
 #endif