[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 5/8] net/socket: Drop net_socket_can_send
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [RFC PATCH 5/8] net/socket: Drop net_socket_can_send |
Date: |
Wed, 29 Apr 2015 18:37:52 +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 sent to peer 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.
If the peer is not ready, disable the read poll until send completes.
Signed-off-by: Fam Zheng <address@hidden>
---
net/socket.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index c30e03f..82fa175 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -51,18 +51,9 @@ typedef struct NetSocketState {
static void net_socket_accept(void *opaque);
static void net_socket_writable(void *opaque);
-/* Only read packets from socket when peer can receive them */
-static int net_socket_can_send(void *opaque)
-{
- NetSocketState *s = opaque;
-
- return qemu_can_send_packet(&s->nc);
-}
-
static void net_socket_update_fd_handler(NetSocketState *s)
{
- qemu_set_fd_handler2(s->fd,
- s->read_poll ? net_socket_can_send : NULL,
+ qemu_set_fd_handler2(s->fd, NULL,
s->read_poll ? s->send_fn : NULL,
s->write_poll ? net_socket_writable : NULL,
s);
@@ -142,6 +133,15 @@ static ssize_t net_socket_receive_dgram(NetClientState
*nc, const uint8_t *buf,
return ret;
}
+static void net_socket_send_completed(NetClientState *nc, ssize_t len)
+{
+ NetSocketState *s = DO_UPCAST(NetSocketState, nc, nc);
+
+ if (!s->read_poll) {
+ net_socket_read_poll(s, true);
+ }
+}
+
static void net_socket_send(void *opaque)
{
NetSocketState *s = opaque;
@@ -211,9 +211,13 @@ static void net_socket_send(void *opaque)
buf += l;
size -= l;
if (s->index >= s->packet_len) {
- qemu_send_packet(&s->nc, s->buf, s->packet_len);
s->index = 0;
s->state = 0;
+ if (qemu_send_packet_async(&s->nc, s->buf, size,
+ net_socket_send_completed) == 0) {
+ net_socket_read_poll(s, false);
+ break;
+ }
}
break;
}
@@ -234,7 +238,10 @@ static void net_socket_send_dgram(void *opaque)
net_socket_write_poll(s, false);
return;
}
- qemu_send_packet(&s->nc, s->buf, size);
+ if (qemu_send_packet_async(&s->nc, s->buf, size,
+ net_socket_send_completed) == 0) {
+ net_socket_read_poll(s, false);
+ }
}
static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct
in_addr *localaddr)
--
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, 2015/04/29
- [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 <=
- [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