Changeset 619 for trunk/kernel/kern/chdev.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (5 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/kernel/kern/chdev.c (modified) (16 diffs)

trunk/kernel/kern/chdev.c

@@ -168 +168 @@
 
 #if (DEBUG_CHDEV_CMD_RX || DEBUG_CHDEV_CMD_TX)
-bool_t is_rx = hal_remote_l32( XPTR( chdev_cxy , &chdev_ptr->is_rx ) );
+bool_t      is_rx        = hal_remote_l32( XPTR( chdev_cxy , &chdev_ptr->is_rx ) );
+trdid_t     server_trdid = hal_remote_l32( XPTR( chdev_cxy , &server_ptr->trdid ) ); 
+process_t * process_ptr  = hal_remote_lpt( XPTR( chdev_cxy , &server_ptr->process ) );
+pid_t       server_pid   = hal_remote_l32( XPTR( chdev_cxy , &process_ptr->pid ) );
 #endif
     
@@ -175 +178 @@
 if( (is_rx) && (DEBUG_CHDEV_CMD_RX < rx_cycle) )
 printk("\n[%s] client[%x,%x] enter for RX / server[%x,%x] / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, 
-server_ptr->process->pid, server_ptr->trdid, rx_cycle );
+__FUNCTION__, this->process->pid, this->trdid, server_pid, server_trdid, rx_cycle );
 #endif
 
@@ -183 +185 @@
 if( (is_rx == 0) && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
 printk("\n[%s] client[%x,%x] enter for TX / server[%x,%x] / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, 
-server_ptr->process->pid, server_ptr->trdid, tx_cycle );
+__FUNCTION__, this->process->pid, this->trdid, server_pid, server_trdid, tx_cycle );
 #endif
 
@@ -241 +242 @@
 if( (is_rx == 0) && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
 printk("\n[%s] TX server thread[%x,%x] unblocked\n",
-__FUNCTION__, server_ptr->process->pid, server_ptr->trdid );
+__FUNCTION__, server_pid, server_trdid );
 #endif
 
@@ -247 +248 @@
 if( (is_rx) && (DEBUG_CHDEV_CMD_RX < rx_cycle) )
 printk("\n[%s] RX server thread[%x,%x] unblocked\n",
-__FUNCTION__, server_ptr->process->pid, server_ptr->trdid );
+__FUNCTION__, server_pid, server_trdid );
 #endif
 
@@ -273 +274 @@
 if( (is_rx == 0)  && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
 printk("\n[%s] client thread[%x,%x] sent IPI to TX server thread[%x,%x]\n",
-__FUNCTION__, this->process->pid, this->trdid, server_ptr->process->pid, server_ptr->trdid );
+__FUNCTION__, this->process->pid, this->trdid, server_pid, server_trdid );
 #endif
 
@@ -279 +280 @@
 if( (is_rx)  && (DEBUG_CHDEV_CMD_RX < rx_cycle) )
 printk("\n[%s] client thread[%x,%x] sent IPI to RX server thread[%x,%x]\n",
-__FUNCTION__, this->process->pid, this->trdid, server_ptr->process->pid, server_ptr->trdid );
+__FUNCTION__, this->process->pid, this->trdid, server_pid, server_trdid );
 #endif
 
@@ -317 +318 @@
 }  // end chdev_register_command()
 
-///////////////////////////////////////////////
-void chdev_sequencial_server( chdev_t * chdev )
+/////////////////////////////////////////
+void chdev_server_func( chdev_t * chdev )
 {
     xptr_t          client_xp;    // extended pointer on waiting thread
@@ -340 +341 @@
     {
 
-#if DEBUG_CHDEV_SERVER_RX
+#if( DEBUG_CHDEV_SERVER_RX || DEBUG_CHDEV_SERVER_TX )
 uint32_t rx_cycle = (uint32_t)hal_get_cycles();
 if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
-printk("\n[%s] thread[%x,%x] start RX / cycle %d\n",
-__FUNCTION__ , server->process->pid, server->trdid, rx_cycle );
+printk("\n[%s] DEV thread[%x,%x] check TXT_RX channel %d / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, rx_cycle );
 #endif
 
@@ -350 +351 @@
 uint32_t tx_cycle = (uint32_t)hal_get_cycles();
 if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
-printk("\n[%s] thread[%x,%x] start TX / cycle %d\n",
-__FUNCTION__ , server->process->pid, server->trdid, tx_cycle );
+printk("\n[%s] thread[%x,%x] check TXT_TX channel %d / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, tx_cycle );
 #endif
 
@@ -397 +398 @@
             client_ptr = GET_PTR( client_xp );
 
-#if( DDEBUG_CHDEV_SERVER_TX || DEBUG_CHDEV_SERVER_RX )
+#if( DEBUG_CHDEV_SERVER_TX || DEBUG_CHDEV_SERVER_RX )
 process_t * process      = hal_remote_lpt( XPTR( client_cxy , &client_ptr->process ) );
 pid_t       client_pid   = hal_remote_l32( XPTR( client_cxy , &process->pid ) );
-process_t   client_trdid = hal_remote_l32( XPTR( client_cxy , &client_ptr->trdid ) );
+trdid_t     client_trdid = hal_remote_l32( XPTR( client_cxy , &client_ptr->trdid ) );
 #endif
 
@@ -407 +408 @@
 if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
 printk("\n[%s] thread[%x,%x] for RX get client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, cycle );
+__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, rx_cycle );
 #endif
 
@@ -414 +415 @@
 if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
 printk("\n[%s] thread[%x,%x] for TX get client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, cycle );
+__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, tx_cycle );
 #endif
 
@@ -445 +446 @@
 if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
 printk("\n[%s] thread[%x,%x] completes RX for client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, cycle );
+__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, rx_cycle );
 #endif
 
@@ -452 +453 @@
 if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
 printk("\n[%s] thread[%x,%x] completes TX for client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, cycle );
+__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, tX_cycle );
 #endif
 
@@ -465 +466 @@
         }
     }  // end while
-}  // end chdev_sequencial_server()
+}  // end chdev_server_func()
 
 ////////////////////////////////////////