Changeset 674 for trunk/kernel/devices/dev_nic.c

Timestamp:

Nov 20, 2020, 12:04:01 AM (4 years ago)

Author:

alain

Message:

1) Introduce up to 4 command lines arguments in the KSH "load" command.
These arguments are transfered to the user process through the
argc/argv mechanism, using the user space "args" vseg.

2) Introduce the named and anonymous "pipes", for inter-process communication
through the pipe() and mkfifo() syscalls.

3) Introduce the "chat" application to validate the two above mechanisms.

4) Improve printk() and assert() fonctions in printk.c.

File:

• trunk/kernel/devices/dev_nic.c (modified) (14 diffs)

trunk/kernel/devices/dev_nic.c

@@ -54 +54 @@
 
     // set chdev name
-    if( is_rx ) snprintf( chdev->name , 16 , "nic%d_rx" , channel );
-    else        snprintf( chdev->name , 16 , "nic%d_tx" , channel );
+    if( is_rx ) snprintk( chdev->name , 16 , "nic%d_rx" , channel );
+    else        snprintk( chdev->name , 16 , "nic%d_tx" , channel );
 
     // initialize the root of the listening sockets list
@@ -360 +360 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-// This static function can be called by the NIC_TX or NIC_RX server threads to unblock
+// This static function is called by the NIC_TX or NIC_RX server threads to unblock
 // the TX client thread after completion (success or error) of a TX command registered
 // in a socket identified by the <socket_xp> argument. The <status> argument defines
@@ -401 +401 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-// This static function can be called by the NIC_TX or NIC_RX server threads to unblock
+// This static function is called by the NIC_TX or NIC_RX server threads to unblock
 // the RX client thread after completion (success or error) of an RX command registered
 // in a socket identified by the <socket_xp> argument. The <status> argument defines
@@ -440 +440 @@
 
 }  // end dev_nic_unblock_rx_client()
-
-
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -680 +678 @@
     // get status & space from rx_buf
     status = remote_buf_status( socket_rbuf_xp );
-    space  = NIC_RX_BUF_SIZE - status;
+    space  = CONFIG_SOCK_RX_BUF_SIZE - status;
 
     // get client thread 
@@ -1268 +1266 @@
 
                         // compute empty space in rx_buf
-                        uint32_t space = NIC_RX_BUF_SIZE - status;
+                        uint32_t space = CONFIG_SOCK_RX_BUF_SIZE - status;
 
                         // compute number of bytes to move : min (space , seg_data_len)
@@ -1406 +1404 @@
                         // update socket.state 
                         hal_remote_s32( XPTR( socket_cxy , &socket_ptr->state ),
-                                        TCP_STATE_CLOSED );  // TODO change to TIME_WAIT
+                                        TCP_STATE_CLOSED ); 
 
                         // make an ACK request to R2T queue
@@ -1415 +1413 @@
                         // report success to TX client thread
                         dev_nic_unblock_tx_client( socket_xp , CMD_STS_SUCCESS );
-
-                        // TODO start the MSL timer / turn off others timers
-
                     }
                 }
@@ -1424 +1419 @@
                     // update socket.state
                     hal_remote_s32( XPTR( socket_cxy , &socket_ptr->state ),
-                                    TCP_STATE_CLOSED );  // todo change to TIME_WAIT
-
-                    // TODO start the MSL timer / turn off others timers
-
-                }
-                else if( socket_state == TCP_STATE_TIME_WAIT )
-                {
-                    // TODO wait msl_time_out before unblocking TX thread
-
-                    // update socket.state when ACK received
-                    hal_remote_s32( XPTR( socket_cxy , &socket_ptr->state ),
-                                    TCP_STATE_CLOSED );
-
-                    // unblock TX client thead for success
+                                    TCP_STATE_CLOSED );  
+
+                    // report success to TX client thread
                     dev_nic_unblock_tx_client( socket_xp , CMD_STS_SUCCESS );
+
                 }
                 else if( socket_state == TCP_STATE_CLOSE_WAIT )
@@ -1491 +1476 @@
                 
 // check socket type and state
-assert( (socket_type  == SOCK_STREAM ) , "illegal socket type" );
-assert( (socket_state == TCP_STATE_LISTEN ) , "illegal socket state" );
+assert( __FUNCTION__, (socket_type  == SOCK_STREAM ) , "illegal socket type" );
+assert( __FUNCTION__, (socket_state == TCP_STATE_LISTEN ) , "illegal socket state" );
 
         // get relevant socket infos for matching
@@ -1638 +1623 @@
 
 // check chdev direction and type
-assert( (chdev->func == DEV_FUNC_NIC) && (chdev->is_rx == true) ,
+assert( __FUNCTION__, (chdev->func == DEV_FUNC_NIC) && (chdev->is_rx == true) ,
 "illegal chdev type or direction" );
 
@@ -2374 +2359 @@
                     // initialize socket tx_nxt, and rx_wnd
                     hal_remote_s32(XPTR(socket_cxy , &socket_ptr->tx_nxt), TCP_ISS_SERVER );
-                    hal_remote_s32(XPTR(socket_cxy , &socket_ptr->rx_wnd), NIC_RX_BUF_SIZE);
+                    hal_remote_s32(XPTR(socket_cxy , &socket_ptr->rx_wnd), CONFIG_SOCK_RX_BUF_SIZE);
                 
                     // build TCP ACK-SYN segment
@@ -2624 +2609 @@
 void dev_nic_tx_server( chdev_t * chdev )
 {
-    uint8_t       k_buf[NIC_KERNEL_BUF_SIZE];  // buffer for one packet
+    uint8_t       k_buf[CONFIG_SOCK_PKT_BUF_SIZE];  // buffer for one packet
 
     xptr_t        queue_root_xp;       // extended pointer on sockets list root
@@ -2650 +2635 @@
 
 // check chdev direction and type
-assert( (chdev->func == DEV_FUNC_NIC) && (chdev->is_rx == false) ,
+assert( __FUNCTION__, (chdev->func == DEV_FUNC_NIC) && (chdev->is_rx == false) ,
 "illegal chdev type or direction" );