Changeset 668 for trunk/kernel

Timestamp:

Oct 10, 2020, 6:38:47 PM (4 years ago)

Author:

alain

Message:

typos...

Location:

trunk/kernel

Files:

• devices/dev_nic.c (modified) (2 diffs)
• devices/dev_nic.h (modified) (1 diff)
• kern/ksocket.c (modified) (10 diffs)
• kern/ksocket.h (modified) (2 diffs)

trunk/kernel/devices/dev_nic.c

@@ -384 +384 @@
         fdid_t   fdid       = hal_remote_l32( XPTR( socket_cxy , &socket_ptr->fdid ));
 
-        printk("\n[ERROR] reported by %s : socket[%x,%d] / %s / cmd %s / error %s \n",
+        printk("\n[WARNING] reported by %s : socket[%x,%d] / %s / cmd %s / status %s \n",
         __FUNCTION__, pid, fdid, socket_state_str(sock_state),
         socket_cmd_type_str(cmd_type), socket_cmd_sts_str(status) );
@@ -425 +425 @@
         fdid_t   fdid       = hal_remote_l32( XPTR( socket_cxy , &socket_ptr->fdid ));
 
-        printk("\n[ERROR] reported by %s : socket[%x,%d] / %s / cmd %s / error %s\n",
+        printk("\n[WARNING] reported by %s : socket[%x,%d] / %s / cmd %s / status %s\n",
         __FUNCTION__, pid, fdid, socket_state_str(sock_state),
         socket_cmd_type_str(cmd_type), socket_cmd_sts_str(status) );

trunk/kernel/devices/dev_nic.h

@@ -158 +158 @@
 #define NIC_KERNEL_BUF_SIZE    0x800        // 2 Kbytes for one ETH/IP/TCP packet
 
+#define CMD_
+
 /*****************************************************************************************
  * This structure defines the specific chdev extension for NIC device:

trunk/kernel/kern/ksocket.c

@@ -1157 +1157 @@
     thread_t  * this      = CURRENT_THREAD;
     xptr_t      client_xp = XPTR( local_cxy , this );
+    pid_t       pid       = this->process->pid;
+    trdid_t     trdid     = this->trdid;
 
     // get pointers on file descriptor
@@ -1176 +1178 @@
 #if DEBUG_SOCKET_CONNECT
 uint32_t cycle = (uint32_t)hal_get_cycles();
-pid_t    pid   = this->process->pid;
-trdid_t  trdid = this->trdid;
 if( DEBUG_SOCKET_CONNECT < cycle )
 printk("\n[%s] thread[%x,%x] enter for socket[%x,%d] / addr %x / port %d / cycle %d\n",
@@ -1328 +1328 @@
     thread_t   * this      = CURRENT_THREAD;
     xptr_t       client_xp = XPTR( local_cxy , this );
-    process_t  * process   = this->process;
+    pid_t        pid       = this->process->pid;
+    trdid_t      trdid     = this->trdid;
 
     // get pointer on socket descriptor
@@ -1340 +1341 @@
 #if DEBUG_SOCKET_CLOSE
 uint32_t cycle = (uint32_t)hal_get_cycles();
-pid_t    pid   = this->process->pid;
 if (DEBUG_SOCKET_CLOSE < cycle )
 printk("\n[%s] thread[%x,%x] enters for socket[%x,%d] / cycle %d\n",
-__FUNCTION__, pid, this->trdid, pid, fdid, cycle );
+__FUNCTION__, pid, trdid, pid, fdid, cycle );
 #endif
 
@@ -1360 +1360 @@
                     
         printk("\n[ERROR] in %s : previous TX cmd on socket[%x,%d] / thread[%x,%x]\n",
-        __FUNCTION__, process->pid, fdid, process->pid, this->trdid );
+        __FUNCTION__, pid, fdid, pid, trdid );
         return -1;
     }
@@ -1381 +1381 @@
 if( cycle > DEBUG_DEV_NIC_TX )
 printk("\n[%s] thread[%x,%x] socket[%x,%d] %s / destroy socket / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, pid, fdid,
-socket_state_str( socket_state ), cycle );
+__FUNCTION__, pid, trdid, pid, fdid, socket_state_str( socket_state ), cycle );
 #endif
         // directly destroy socket
@@ -1398 +1397 @@
 if( cycle > DEBUG_DEV_NIC_TX )
 printk("\n[%s] thread[%x,%x] socket[%x,%d] %s / destroy socket / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, pid, fdid,
-socket_state_str( socket_state ), cycle );
+__FUNCTION__, pid, trdid, pid, fdid, socket_state_str( socket_state ), cycle );
 #endif
         // directly destroy socket
@@ -1432 +1430 @@
 if( DEBUG_SOCKET_CLOSE < cycle )
 printk("\n[%s] thread[%x,%x] socket[%x,%d] blocks on <IO> waiting close / cycle %d \n",
-__FUNCTION__, pid, this->trdid, pid, fdid, cycle );
+__FUNCTION__, pid, trdid, pid, fdid, cycle );
 #endif
         // block itself and deschedule
@@ -1442 +1440 @@
 if( DEBUG_SOCKET_CLOSE < cycle )
 printk("\n[%s] thread[%x,%x] socket[%x,%d] / resumes / cycle %d \n",
-__FUNCTION__, pid, this->trdid, pid, fdid, cycle );
+__FUNCTION__, pid, trdid, pid, fdid, cycle );
 #endif
         // take socket lock
@@ -1474 +1472 @@
 if( DEBUG_SOCKET_CLOSE < cycle )
 printk("\n[%s] thread[%x,%x] socket[%x,%d] / destroy socket / cycle %d\n",
-__FUNCTION__, pid, this->trdid, pid, fdid, socket_state_str(socket_state) , cycle );
+__FUNCTION__, pid, trdid, pid, fdid, socket_state_str(socket_state) , cycle );
 #endif
             // destroy socket

trunk/kernel/kern/ksocket.h

@@ -421 +421 @@
  * It is called by a (local) server process to specify the max size of the CRQ queue
  * for a socket identified by the <fdid> argument, that expect connection requests
- * from one or several (remote) client processes.  The selected socket CRQ is supposed
+ * from one or several (remote) client processes. The selected socket CRQ is supposed
  * to register all connections requests, whatever the client IP address and port values. 
+ * 
  * This function applies only to a TCP socket, that must be in the BOUND state.
- * The <fdid> socket is set to the LISTEN state.
+ * The socket is set to the LISTEN state.
  * It does not require any service from the NIC_TX and NIC_RX server threads.
  * It can be called by a thread running in any cluster.
@@ -451 +452 @@
  * with bind(), and listening for connections after a listen(). It  blocks on the <IO>
  * condition if the CRQ is empty. Otherwise, it get a pending connection request from 
- * the listening socket CRQ queue, and creates & initializes a new socket with
- * the same properties as the listening socket, allocating a new file descriptor
- * for this new socket. It returns the new socket fdid as well as the remote IP address
+ * the listening socket CRQ queue, and creates a new socket with the same properties 
+ * as the listening socket, allocating a new file descriptor for this new socket. 
+ * It computes the nic_channel index [k] from <remote_addr> and <remote_port> values,
+ * and initializes "remote_addr","remote_port", "nic_channel" in local socket.
+ * It returns the new socket fdid as well as the remote IP address
  * and port, but only when the new socket is set to the ESTAB state. The new socket 
  * cannot accept connections, but the listening socket keeps open for new connections.