80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

And it turns out we can actually use network_wait(1) in the CPU thread just fine.

Browse Source
This commit is contained in:
OBattler
2022-02-20 20:39:39 +01:00
parent f19aaa14ae
commit ac2bdcf84c
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/network.c
View File

@@ -313,25 +313,24 @@ network_rx_queue(void *priv)
int ret = 1; int ret = 1;
netpkt_t *tx_queued_pkt = NULL; netpkt_t *tx_queued_pkt = NULL;
if (network_rx_pause || !thread_test_mutex(network_mutex)) { if (network_rx_pause) {
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 64.0); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
return; return;
} }
network_wait(1);
if (queued_pkt == NULL) if (queued_pkt == NULL)
network_queue_get(0, &queued_pkt); network_queue_get(0, &queued_pkt);
if ((queued_pkt != NULL) && (queued_pkt->len > 0)) { if ((queued_pkt != NULL) && (queued_pkt->len > 0)) {
network_dump_packet(queued_pkt); network_dump_packet(queued_pkt);
ret = net_cards[network_card].rx(queued_pkt->priv, queued_pkt->data, queued_pkt->len); ret = net_cards[network_card].rx(queued_pkt->priv, queued_pkt->data, queued_pkt->len);
if (ret) { if (queued_pkt->len >= 128)
if (queued_pkt->len >= 128) timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * ((double) queued_pkt->len));
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * ((double) queued_pkt->len)); else
else timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
} else
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 64.0);
} else } else
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 64.0); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * 128.0);
if (ret) if (ret)
queued_pkt = NULL; queued_pkt = NULL;
network_queue_advance(0); network_queue_advance(0);