diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-04-29 09:50:32 +0100 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2009-06-09 11:38:49 +0100 |
commit | 3471b757d0ca63a0e8188c4c96acd1c279a8c737 (patch) | |
tree | c2987a4b38ff19401395c1f73e17266f0239a6ee | |
parent | 2e1e06411095ed122d44bf0e3f5e18e8a6304b16 (diff) |
net: only read from tapfd when we can send
Reduce the number of packets dropped under heavy network
traffic by only reading a packet from the tapfd when a
client can actually handle it.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
-rw-r--r-- | net.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -956,6 +956,13 @@ static void tap_receive(void *opaque, const uint8_t *buf, int size) } } +static int tap_can_send(void *opaque) +{ + TAPState *s = opaque; + + return qemu_can_send_packet(s->vc); +} + #ifdef __sun__ static ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen) { @@ -1011,7 +1018,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, s->vc = qemu_new_vlan_client(vlan, model, name, tap_receive, NULL, tap_cleanup, s); s->vc->fd_readv = tap_receive_iov; - qemu_set_fd_handler(s->fd, tap_send, NULL, s); + qemu_set_fd_handler2(s->fd, tap_can_send, tap_send, NULL, s); snprintf(s->vc->info_str, sizeof(s->vc->info_str), "fd=%d", fd); return s; } |