Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* read TCP sockets in cluster-sized chunks instead of IP_MAXPACKET.

Browse Source 
(it might be a better to chain a few clusters into the iov
   instead of just one since we are making the syscall anyway)
* don't overwrite the useful error value
This commit is contained in:
pooka 2009-01-27 13:40:16 +00:00
parent fd24e60b98
commit 8b70996e1b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/rump/net/lib/libsockin/sockin.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sockin.c,v 1.11 2009/01/27 11:37:42 pooka Exp $ */ /* $NetBSD: sockin.c,v 1.12 2009/01/27 13:40:16 pooka Exp $ */
/* /*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved. * Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@ -26,7 +26,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.11 2009/01/27 11:37:42 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.12 2009/01/27 13:40:16 pooka Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/condvar.h> #include <sys/condvar.h>
@ -171,9 +171,18 @@ sockin_process(struct socket *so)
size_t plen; size_t plen;
int error; int error;
plen = IP_MAXPACKET;
m = m_gethdr(M_WAIT, MT_DATA); m = m_gethdr(M_WAIT, MT_DATA);
MEXTMALLOC(m, plen, M_WAIT); if (so->so_proto->pr_type == SOCK_DGRAM) {
plen = IP_MAXPACKET;
MEXTMALLOC(m, plen, M_DONTWAIT);
} else {
plen = MCLBYTES;
MCLGET(m, M_DONTWAIT);
}
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
return;
}
memset(&rmsg, 0, sizeof(rmsg)); memset(&rmsg, 0, sizeof(rmsg));
io.iov_base = mtod(m, void *); io.iov_base = mtod(m, void *);
@ -342,7 +351,7 @@ sockin_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
switch (req) { switch (req) {
case PRU_ATTACH: case PRU_ATTACH:
{ {
int news; int news, dummy;
sosetlock(so); sosetlock(so);
if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
@ -357,7 +366,7 @@ sockin_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
break; break;
if ((error = registersock(so, news)) != 0) if ((error = registersock(so, news)) != 0)
rumpuser_close(news, &error); rumpuser_close(news, &dummy);
break; break;
} }