Changeset 637 for trunk/kernel/devices

Timestamp:

Jul 18, 2019, 2:06:55 PM (4 years ago)

Author:

alain

Message:

Introduce the non-standard pthread_parallel_create() system call
and re-write the <fft> and <sort> applications to improve the
intrinsic paralelism in applications.

Location:

trunk/kernel/devices

Files:

• dev_dma.c (modified) (2 diffs)
• dev_ioc.c (modified) (1 diff)
• dev_nic.c (modified) (2 diffs)
• dev_txt.c (modified) (11 diffs)
• dev_txt.h (modified) (4 diffs)

trunk/kernel/devices/dev_dma.c

@@ -2 +2 @@
  * dev_dma.c - DMA (Interrupt Controler Unit) generic device API implementation.
  *
- * Authors   Alain Greiner  (2016,2017,2018)
+ * Authors   Alain Greiner  (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -61 +61 @@
     error_t    error;
 
+    lid_t lid = cluster_select_local_core( local_cxy );
+
     error = thread_kernel_create( &new_thread,
                                   THREAD_DEV,
                                   &chdev_server_func,
                                   dma,
-                                  cluster_select_local_core() );
+                                  lid );
     if( error )
     {

trunk/kernel/devices/dev_ioc.c

@@ -67 +67 @@
 
     // select a core to execute the IOC server thread
-    lid_t lid = cluster_select_local_core();
+    lid_t lid = cluster_select_local_core( local_cxy );
 
     // bind the IOC IRQ to the selected core

trunk/kernel/devices/dev_nic.c

@@ -2 +2 @@
  * dev_nic.c - NIC (Network Controler) generic device API implementation.
  * 
- * Author  Alain Greiner    (2016,2017,2018)
+ * Author  Alain Greiner    (2016,2017,2018,2019)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -58 +58 @@
 
     // select a core to execute the NIC server thread
-    lid_t lid = cluster_select_local_core();
+    lid_t lid = cluster_select_local_core( local_cxy );
 
     // bind the NIC IRQ to the selected core

trunk/kernel/devices/dev_txt.c

@@ -95 +95 @@
     {
         // select a core to execute the server thread
-        lid_t lid = cluster_select_local_core();
+        lid_t lid = cluster_select_local_core( local_cxy );
 
         // The unique IRQ from cluster 00's MTTY must be bound to a RX chdev
@@ -131 +131 @@
         thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
     }
-}
+}  // end dev_txt_init()
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -166 +166 @@
     // return I/O operation status from calling thread descriptor
     return this->txt_cmd.error;
-}
+
+}  // end dev_txt_access()
 
 /////////////////////////////////////////
@@ -173 +174 @@
                        uint32_t   count )
 {
+    error_t error;
 
 #if (DEBUG_SYS_WRITE & 1)
@@ -182 +184 @@
 uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_TX < cycle )
-printk("\n[%s] thread[%x,%x] enters / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, cycle );
-#endif
-
-    // get extended pointer on TXT[0] chdev
+printk("\n[%s] thread[%x,%x] enters for <%s> / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, buffer, cycle );
+#endif
+
+    // If we use MTTY (vci_multi_tty), we do a synchronous write on TXT[0]
+    // If we use TTY  (vci_tty_tsar), we do a standard asynchronous write
+    // TODO this is not very clean ... [AG]
+
+    // get pointers on chdev
     xptr_t dev_xp = chdev_dir.txt_tx[0];
-
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ ,
-    "undefined TXT0 chdev descriptor" );
-
-    // get TXTO chdev cluster and local pointer
-    cxy_t    dev_cxy  = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
-
-    // If we use MTTYs (vci_multi_tty), we perform only sync writes
-    // Otherwise, we use vci_tty_tsar so we can use async writes
+    cxy_t     dev_cxy = GET_CXY( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     if( dev_ptr->impl == IMPL_TXT_MTY )
@@ -211 +209 @@
         args.channel = channel;
 
-        // call driver function
+        // call directly the driver function
         aux( &args );
 
-        return 0;
-    }
-
+        error = 0;
+    }
     else
     {
-        return dev_txt_access( TXT_WRITE , channel , buffer , count );
+        // register command in chdev queue for an asynchronous access
+        error = dev_txt_access( TXT_WRITE , channel , buffer , count );
+
+        if( error )
+        {
+            printk("\n[ERROR] in %s : cannot write string %s / cycle %d\n",
+            __FUNCTION__, buffer, (uint32_t)hal_get_cycles() );
+        }
     }
 
@@ -225 +229 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_TX < cycle )
-printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
+printk("\n[%s] thread[%x,%x] exit /  cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, cycle );
 #endif
@@ -233 +237 @@
 #endif
 
-}
+    return error;
+
+}  // end dev_txt_write()
 
 /////////////////////////////////////////
@@ -239 +245 @@
                       char     * buffer )
 {
+    error_t error;
 
 #if (DEBUG_SYS_READ & 1)
@@ -252 +259 @@
 #endif
 
-    return dev_txt_access( TXT_READ , channel , buffer , 1 );
+    // register command in chdev queue for an asynchronous access
+    error = dev_txt_access( TXT_READ , channel , buffer , 1 );
+
+    if( error )
+    {
+        printk("\n[ERROR] in %s : cannot get character / cycle %d\n",
+        __FUNCTION__, (uint32_t)hal_get_cycles() );
+    }
 
 #if DEBUG_DEV_TXT_RX
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_TXT_RX < cycle )
-printk("\n[%s] thread[%x,%x] exit / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, cycle );
+printk("\n[%s] thread[%x,%x] get character <%c> / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, *buffer, cycle );
 #endif
 
@@ -265 +279 @@
 #endif
 
-}
+    return error;
+
+}  // end dev_txt_read()
 
 ////////////////////////////////////////////////

trunk/kernel/devices/dev_txt.h

@@ -124 +124 @@
  * device and the driver specific data structures when required.
  * It creates the associated server thread and allocates a WTI from local ICU.
- * It must de executed by a local thread.
+ * It must be executed by a thread running in cluster containing the chdev descriptor.
  ******************************************************************************************
  * @ chdev     : local pointer on TXT device descriptor.
@@ -134 +134 @@
  * by the "channel" argument. The corresponding request is actually registered in the
  * chdev requests queue, and the calling thread is descheduled, blocked until
- * transfer completion.
- * It must be called in the client cluster.
+ * transfer completion. It can be called by any thread running in any cluster.
  ******************************************************************************************
  * @ channel   : TXT channel index.
@@ -148 +147 @@
  * by the "channel" argument. The corresponding request is actually registered in the
  * chdev requests queue, and the calling thread is descheduled, blocked until
- * transfer completion.
- * It must be called in the client cluster.
+ * transfer completion. It can be called by any thread running in any cluster.
  ******************************************************************************************
  * @ channel   : TXT channel index.
@@ -166 +164 @@
  * interfering with another possible TXT access to another terminal.
  * As it is used for debug, the command arguments <buffer> and <count> are registerd
- * in a specific "txt_syc_args_t" structure passed to the driver "aux" function.
+ * in a specific "txt_sync_args_t" structure passed to the driver "aux" function.
  ****************************************************************************************
  * @ buffer    : local pointer on source buffer containing the string.