Changeset 670 for soft

Timestamp:

Jul 27, 2015, 9:59:52 PM (9 years ago)

Author:

alain

Message:

Introduce the "shared" argument in the _sys_tty_alloc() function.

Location:

soft/giet_vm/giet_kernel

Files:

• sys_handler.c (modified) (4 diffs)
• sys_handler.h (modified) (2 diffs)

soft/giet_vm/giet_kernel/sys_handler.c

@@ -142 +142 @@
     &_sys_tty_read,                  /* 0x03 */
     &_sys_tty_alloc,                 /* 0x04 */
-    &_sys_tty_get_lock,              /* 0x05 */
-    &_sys_tty_release_lock,          /* 0x06 */
+    &_sys_ukn,                       /* 0x05 */
+    &_sys_ukn,                       /* 0x06 */
     &_sys_heap_info,                 /* 0x07 */
     &_sys_local_task_id,             /* 0x08 */
@@ -249 +249 @@
                 static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
 
-                // release private TTY peripheral if required
+                // release private TTY terminal if required
                 if ( psched->context[ltid][CTX_TTY_ID] < NB_TTY_CHANNELS ) 
                 {
                     psched->context[ltid][CTX_TTY_ID] = 0xFFFFFFFF;
                     _atomic_increment( &_tty_channel_allocator , 0xFFFFFFFF );
+                }
+
+                // release private TIM channel if required
+                if ( psched->context[ltid][CTX_TIM_ID] < NB_TIM_CHANNELS ) 
+                {
+                    psched->context[ltid][CTX_TIM_ID] = 0xFFFFFFFF;
+                    _atomic_increment( &_tim_channel_allocator , 0xFFFFFFFF );
+                }
+
+                // release private NIC_RX channel if required
+                if ( psched->context[ltid][CTX_NIC_RX_ID] < NB_NIC_CHANNELS ) 
+                {
+                    psched->context[ltid][CTX_NIC_RX_ID] = 0xFFFFFFFF;
+                    _atomic_increment( &_nic_rx_channel_allocator , 0xFFFFFFFF );
+                }
+
+                // release private NIC_TX channel if required
+                if ( psched->context[ltid][CTX_NIC_TX_ID] < NB_NIC_CHANNELS ) 
+                {
+                    psched->context[ltid][CTX_NIC_TX_ID] = 0xFFFFFFFF;
+                    _atomic_increment( &_nic_tx_channel_allocator , 0xFFFFFFFF );
                 }
 
@@ -775 +796 @@
 //////////////////////////////////////////////////////////////////////////////
 
-////////////////////
-int _sys_tty_alloc()
+/////////////////////////////////////////
+int _sys_tty_alloc( unsigned int shared )
 {
     // get a new TTY terminal index
@@ -795 +816 @@
     if ( USE_PIC ) _ext_irq_alloc( ISR_TTY_RX , channel , &unused ); 
    
-    // update calling task index
-    _set_context_slot( CTX_TTY_ID, channel );
+    // update CTX_TTY_ID 
+    if ( shared )         // for all tasks in the same vspace
+    {
+        unsigned int      vspace_id = _get_context_slot( CTX_VSID_ID );
+        mapping_header_t  *header   = (mapping_header_t *)SEG_BOOT_MAPPING_BASE;
+        mapping_vspace_t  *vspace   = _get_vspace_base(header);
+        mapping_task_t    *task     = _get_task_base(header);
+
+        // scan tasks in vspace
+        unsigned int task_id;
+        for (task_id = vspace[vspace_id].task_offset;
+             task_id < (vspace[vspace_id].task_offset + vspace[vspace_id].tasks);
+             task_id++)
+        {
+            unsigned int y_size        = header->y_size;
+            unsigned int cid           = task[task_id].clusterid;
+            unsigned int x             = cid / y_size;
+            unsigned int y             = cid % y_size;
+            unsigned int p             = task[task_id].proclocid;
+            unsigned int ltid          = task[task_id].ltid;
+            static_scheduler_t* psched = (static_scheduler_t*)_schedulers[x][y][p];
+            psched->context[ltid][CTX_TTY_ID] = channel;
+        }
+    }
+    else                  // for calling task only
+    {
+        _set_context_slot( CTX_TTY_ID, channel );
+    }
 
     return 0;

soft/giet_vm/giet_kernel/sys_handler.h

@@ -92 +92 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-int _sys_coproc_alloc( unsigned int   coproc_type,
-                       unsigned int*  coproc_info );
-
-int _sys_coproc_release( unsigned int coproc_reg_index );
-
-int _sys_coproc_channel_init( unsigned int            channel,
-                              giet_coproc_channel_t*  desc );
-
-int _sys_coproc_run( unsigned int coproc_reg_index );
-
-int _sys_coproc_completed();
-
-///////////////////////////////////////////////////////////////////////////////
-//    TTY related syscall handlers
-///////////////////////////////////////////////////////////////////////////////
-
-int _sys_tty_alloc();
-
-int _sys_tty_write( const char*  buffer,
-                    unsigned int length,
-                    unsigned int channel );
-
-int _sys_tty_read(  char*        buffer,
-                    unsigned int length,
-                    unsigned int channel );
-
-int _sys_tty_get_lock( unsigned int   channel,
-                       unsigned int * save_sr_ptr );
-
-int _sys_tty_release_lock( unsigned int   channel,
-                           unsigned int * save_sr_ptr );
-
 int _sys_coproc_register_set( unsigned int cluster_xy,
                               unsigned int reg_index,
@@ -131 +99 @@
                               unsigned int  reg_index,
                               unsigned int* buffer );
+
+int _sys_coproc_alloc( unsigned int   coproc_type,
+                       unsigned int*  coproc_info );
+
+int _sys_coproc_release( unsigned int coproc_reg_index );
+
+int _sys_coproc_channel_init( unsigned int            channel,
+                              giet_coproc_channel_t*  desc );
+
+int _sys_coproc_run( unsigned int coproc_reg_index );
+
+int _sys_coproc_completed();
+
+///////////////////////////////////////////////////////////////////////////////
+//    TTY related syscall handlers
+///////////////////////////////////////////////////////////////////////////////
+
+int _sys_tty_alloc( unsigned int shared );
+
+int _sys_tty_write( const char*  buffer,
+                    unsigned int length,
+                    unsigned int channel );
+
+int _sys_tty_read(  char*        buffer,
+                    unsigned int length,
+                    unsigned int channel );
 
 //////////////////////////////////////////////////////////////////////////////