[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a ca
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a callback |
Date: |
Thu, 7 Feb 2019 16:02:58 +0200 |
From: Marc-André Lureau <address@hidden>
Introduce a SlirpCb callback to kick the main io-thread.
Add an intermediary sodrop() function that will call SlirpCb.notify
callback when sbdrop() returns true.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
net/slirp.c | 1 +
slirp/libslirp.h | 2 ++
slirp/sbuf.c | 6 ++++--
slirp/sbuf.h | 2 +-
slirp/socket.c | 7 +++++++
slirp/socket.h | 1 +
slirp/tcp_input.c | 6 +++---
7 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index 78ba96b63f..7b4f9f5c5e 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -205,6 +205,7 @@ static const SlirpCb slirp_cb = {
.timer_mod = net_slirp_timer_mod,
.register_poll_fd = net_slirp_register_poll_fd,
.unregister_poll_fd = net_slirp_unregister_poll_fd,
+ .notify = qemu_notify_event,
};
static int net_slirp_init(NetClientState *peer, const char *model,
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 8ce69f0be3..679a25422b 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -31,6 +31,8 @@ typedef struct SlirpCb {
void (*register_poll_fd)(int fd);
/* Unregister a fd */
void (*unregister_poll_fd)(int fd);
+ /* Kick the io-thread, to signal that new events may be processed */
+ void (*notify)(void);
} SlirpCb;
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 912f235f65..17f28e97a6 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -17,7 +17,7 @@ sbfree(struct sbuf *sb)
free(sb->sb_data);
}
-void
+bool
sbdrop(struct sbuf *sb, int num)
{
int limit = sb->sb_datalen / 2;
@@ -34,8 +34,10 @@ sbdrop(struct sbuf *sb, int num)
sb->sb_rptr -= sb->sb_datalen;
if (sb->sb_cc < limit && sb->sb_cc + num >= limit) {
- qemu_notify_event();
+ return true;
}
+
+ return false;
}
void
diff --git a/slirp/sbuf.h b/slirp/sbuf.h
index 644c201341..1cb9a42834 100644
--- a/slirp/sbuf.h
+++ b/slirp/sbuf.h
@@ -21,7 +21,7 @@ struct sbuf {
};
void sbfree(struct sbuf *);
-void sbdrop(struct sbuf *, int);
+bool sbdrop(struct sbuf *, int);
void sbreserve(struct sbuf *, int);
void sbappend(struct socket *, struct mbuf *);
void sbcopy(struct sbuf *, int, int, char *);
diff --git a/slirp/socket.c b/slirp/socket.c
index 5805d30f3d..2e8dc22fb6 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -928,3 +928,10 @@ void sotranslate_accept(struct socket *so)
break;
}
}
+
+void sodrop(struct socket *s, int num)
+{
+ if (sbdrop(&s->so_snd, num)) {
+ s->slirp->cb->notify();
+ }
+}
diff --git a/slirp/socket.h b/slirp/socket.h
index fc35ca5f72..1c1c8b5871 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -156,6 +156,7 @@ int soreadbuf(struct socket *so, const char *buf, int size);
void sotranslate_out(struct socket *, struct sockaddr_storage *);
void sotranslate_in(struct socket *, struct sockaddr_storage *);
void sotranslate_accept(struct socket *);
+void sodrop(struct socket *, int num);
#endif /* SLIRP_SOCKET_H */
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index de5b74a52b..7c1fe18fec 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -506,7 +506,7 @@ findso:
SEQ_GT(ti->ti_ack, tp->t_rtseq))
tcp_xmit_timer(tp, tp->t_rtt);
acked = ti->ti_ack - tp->snd_una;
- sbdrop(&so->so_snd, acked);
+ sodrop(so, acked);
tp->snd_una = ti->ti_ack;
m_free(m);
@@ -1118,10 +1118,10 @@ trimthenstep6:
}
if (acked > so->so_snd.sb_cc) {
tp->snd_wnd -= so->so_snd.sb_cc;
- sbdrop(&so->so_snd, (int )so->so_snd.sb_cc);
+ sodrop(so, (int)so->so_snd.sb_cc);
ourfinisacked = 1;
} else {
- sbdrop(&so->so_snd, acked);
+ sodrop(so, acked);
tp->snd_wnd -= acked;
ourfinisacked = 0;
}
--
2.20.1
- [Qemu-devel] [PULLv4 00/32] More work towards libslirp, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 02/32] slirp: Avoid marking naturally packed structs as QEMU_PACKED, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 09/32] slirp: replace trace functions with DEBUG calls, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 03/32] slirp: Don't mark struct ipq or struct ipasfrag as packed, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 13/32] slirp: add unregister_poll_fd() callback, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 08/32] slirp: add callbacks for timer, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 23/32] slirp: replace QEMU_BUILD_BUG_ON with G_STATIC_ASSERT, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 14/32] slirp: replace qemu_notify_event() with a callback,
Samuel Thibault <=
- [Qemu-devel] [PULLv4 10/32] slirp: replace QEMU_PACKED with SLIRP_PACKED, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 01/32] slirp: Avoid unaligned 16bit memory access, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclusions, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 07/32] net/slirp: fix leaks on forwarding rule registration error, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 24/32] slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 05/32] net/slirp: simplify checking for cmd: prefix, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 06/32] net/slirp: free forwarding rules on cleanup, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 11/32] slirp: replace most qemu socket utilities with slirp own version, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own defines, Samuel Thibault, 2019/02/07