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

Timestamp:

Dec 5, 2017, 4:20:07 PM (7 years ago)

Author:

alain

Message:

Fix several bugs in the fork() syscall.

File:

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

trunk/kernel/devices/dev_nic.c

@@ -79 +79 @@
     nic->server = new_thread;
     
-    // start server thread
-    thread_block( new_thread , THREAD_BLOCKED_DEV_QUEUE );
+    // set "chdev" field in thread descriptor
+    new_thread->chdev = nic;
+
+    // unblock server thread
     thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
 
@@ -101 +103 @@
 
     // get pointer on NIC-RX chdev descriptor
-    uint32_t   channel = thread_ptr->dev_channel; 
+    uint32_t   channel = thread_ptr->chdev->channel; 
     xptr_t     dev_xp  = chdev_dir.nic_rx[channel];
     cxy_t      dev_cxy = GET_CXY( dev_xp );
@@ -129 +131 @@
         // block on THREAD_BLOCKED_IO condition and deschedule
         thread_block( thread_ptr , THREAD_BLOCKED_IO );
-        sched_yield();
+        sched_yield("client blocked on I/O");
 
         // disable NIC-RX IRQ 
@@ -171 +173 @@
 
     // get pointer on NIC-TX chdev descriptor
-    uint32_t   channel = thread_ptr->dev_channel; 
+    uint32_t   channel = thread_ptr->chdev->channel; 
     xptr_t     dev_xp  = chdev_dir.nic_tx[channel];
     cxy_t      dev_cxy = GET_CXY( dev_xp );
@@ -199 +201 @@
         // block on THREAD_BLOCKED I/O condition and deschedule
         thread_block( thread_ptr , THREAD_BLOCKED_IO );
-        sched_yield();
+        sched_yield("client blocked on I/O");
 
         // disable NIC-TX IRQ