[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 4/8] netmap: Drop netmap_can_send
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [RFC PATCH 4/8] netmap: Drop netmap_can_send |
Date: |
Wed, 29 Apr 2015 18:37:51 +0800 |
This callback is called by main loop before polling s->fd, if it returns
false, the fd will not be polled in this iteration.
This is redundant with checks inside read callback. After this patch,
the data will be copied from s->fd to s->iov when it arrives. If the
device can't receive, it will be queued to incoming_queue, and when the
device status changes, this queue will be flushed.
Also remove the qemu_can_send_packet() check in netmap_send. If it's
true, we are good; if it's false, the qemu_sendv_packet_async would
return 0 and read poll will be disabled until netmap_send_completed is
called.
Signed-off-by: Fam Zheng <address@hidden>
---
net/netmap.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/net/netmap.c b/net/netmap.c
index 0c1772b..b3efb5b 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -132,23 +132,13 @@ error:
return -1;
}
-/* Tell the event-loop if the netmap backend can send packets
- to the frontend. */
-static int netmap_can_send(void *opaque)
-{
- NetmapState *s = opaque;
-
- return qemu_can_send_packet(&s->nc);
-}
-
static void netmap_send(void *opaque);
static void netmap_writable(void *opaque);
/* Set the event-loop handlers for the netmap backend. */
static void netmap_update_fd_handler(NetmapState *s)
{
- qemu_set_fd_handler2(s->me.fd,
- s->read_poll ? netmap_can_send : NULL,
+ qemu_set_fd_handler2(s->me.fd, NULL,
s->read_poll ? netmap_send : NULL,
s->write_poll ? netmap_writable : NULL,
s);
@@ -317,7 +307,7 @@ static void netmap_send(void *opaque)
/* Keep sending while there are available packets into the netmap
RX ring and the forwarding path towards the peer is open. */
- while (!nm_ring_empty(ring) && qemu_can_send_packet(&s->nc)) {
+ while (!nm_ring_empty(ring)) {
uint32_t i;
uint32_t idx;
bool morefrag;
--
1.9.3
- [Qemu-devel] [RFC PATCH 0/8] main-loop: Get rid of fd_read_poll and qemu_set_fd_handler2, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 2/8] qemu-nbd: Switch to qemu_set_fd_handler, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 1/8] stubs: Add qemu_set_fd_handler, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 4/8] netmap: Drop netmap_can_send,
Fam Zheng <=
- [Qemu-devel] [RFC PATCH 3/8] l2tpv3: Drop l2tpv3_can_send, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 5/8] net/socket: Drop net_socket_can_send, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 7/8] Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 6/8] tap: Drop tap_can_send, Fam Zheng, 2015/04/29
- [Qemu-devel] [RFC PATCH 8/8] main-loop: Drop qemu_set_fd_handler2, Fam Zheng, 2015/04/29