SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

slirp: remove the disabled readv()/writev() code path

Browse Source 
The soread() function may be used on datagram sockets, and would
provide different behaviour if HAVE_READV was set, on empty datagrams.
This looks like a minor optimization, that never has been a strong
goal for slirp.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-14 16:36:14 +04:00 committed by Samuel Thibault
parent 74f0304e17
commit 03cee2fb5f
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slirp/slirp_config.h
View File

@ -29,9 +29,6 @@
/* Define if the machine is big endian */ /* Define if the machine is big endian */
//#undef HOST_WORDS_BIGENDIAN //#undef HOST_WORDS_BIGENDIAN
/* Define if you have readv */
#undef HAVE_READV
/* Define if iovec needs to be declared */ /* Define if iovec needs to be declared */
#undef DECLARE_IOVEC #undef DECLARE_IOVEC
#ifdef _WIN32 #ifdef _WIN32

15
slirp/socket.c
View File

@ -187,12 +187,7 @@ soread(struct socket *so)
*/ */
sopreprbuf(so, iov, &n); sopreprbuf(so, iov, &n);
#ifdef HAVE_READV
nn = readv(so->s, (struct iovec *)iov, n);
DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
#else
nn = qemu_recv(so->s, iov[0].iov_base, iov[0].iov_len,0); nn = qemu_recv(so->s, iov[0].iov_base, iov[0].iov_len,0);
#endif
if (nn <= 0) { if (nn <= 0) {
if (nn < 0 && (errno == EINTR || errno == EAGAIN)) if (nn < 0 && (errno == EINTR || errno == EAGAIN))
return 0; return 0;
@ -226,7 +221,6 @@ soread(struct socket *so)
} }
} }
#ifndef HAVE_READV
/* /*
* If there was no error, try and read the second time round * If there was no error, try and read the second time round
* We read again if n = 2 (ie, there's another part of the buffer) * We read again if n = 2 (ie, there's another part of the buffer)
@ -244,7 +238,6 @@ soread(struct socket *so)
} }
DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn)); DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
#endif
/* Update fields */ /* Update fields */
sb->sb_cc += nn; sb->sb_cc += nn;
@ -452,13 +445,7 @@ sowrite(struct socket *so)
} }
/* Check if there's urgent data to send, and if so, send it */ /* Check if there's urgent data to send, and if so, send it */
#ifdef HAVE_READV
nn = writev(so->s, (const struct iovec *)iov, n);
DEBUG_MISC((dfd, " ... wrote nn = %d bytes\n", nn));
#else
nn = slirp_send(so, iov[0].iov_base, iov[0].iov_len,0); nn = slirp_send(so, iov[0].iov_base, iov[0].iov_len,0);
#endif
/* This should never happen, but people tell me it does *shrug* */ /* This should never happen, but people tell me it does *shrug* */
if (nn < 0 && (errno == EAGAIN || errno == EINTR)) if (nn < 0 && (errno == EAGAIN || errno == EINTR))
return 0; return 0;
@ -467,7 +454,6 @@ sowrite(struct socket *so)
goto err_disconnected; goto err_disconnected;
} }
#ifndef HAVE_READV
if (n == 2 && nn == iov[0].iov_len) { if (n == 2 && nn == iov[0].iov_len) {
int ret; int ret;
ret = slirp_send(so, iov[1].iov_base, iov[1].iov_len,0); ret = slirp_send(so, iov[1].iov_base, iov[1].iov_len,0);
@ -475,7 +461,6 @@ sowrite(struct socket *so)
nn += ret; nn += ret;
} }
DEBUG_MISC((dfd, " ... wrote nn = %d bytes\n", nn)); DEBUG_MISC((dfd, " ... wrote nn = %d bytes\n", nn));
#endif
/* Update sbuf */ /* Update sbuf */
sb->sb_cc -= nn; sb->sb_cc -= nn;