JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_socket (fhandler_socket::readv): Call recv_internal directly,

Browse Source 
rather than recvmsg.
	(fhandler_socket::writev): Call send_internal directly, rather than
	sendmsg.
	* net.cc (cygwin_recv): Call fhandler_socket::recvfrom directly, rather
	than cygwin_recvfrom.
	(cygwin_send): Call fhandler_socket::sendto directly, rather than
	cygwin_sendto.
This commit is contained in:
Corinna Vinschen
2011-02-21 17:01:05 +00:00
parent 05901e6aee
commit 291698e54a
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
winsup/cygwin/fhandler_socket.cc
View File

@@ -1368,18 +1368,16 @@ int
fhandler_socket::readv (const struct iovec *const iov, const int iovcnt,
ssize_t tot)
{
struct msghdr msg =
WSABUF wsabuf[iovcnt];
WSABUF *wsaptr = wsabuf + iovcnt;
const struct iovec *iovptr = iov + iovcnt;
while (--wsaptr >= wsabuf)
{
msg_name: NULL,
msg_namelen: 0,
msg_iov: (struct iovec *) iov, // const_cast
msg_iovlen: iovcnt,
msg_control: NULL,
msg_controllen: 0,
msg_flags: 0
};
return recvmsg (&msg, 0);
wsaptr->len = (--iovptr)->iov_len;
wsaptr->buf = (char *) iovptr->iov_base;
}
WSAMSG wsamsg = { NULL, 0, wsabuf, iovcnt, { 0, NULL}, 0 };
return recv_internal (&wsamsg);
}
extern "C" {
@@ -1580,18 +1578,16 @@ int
fhandler_socket::writev (const struct iovec *const iov, const int iovcnt,
ssize_t tot)
{
struct msghdr msg =
WSABUF wsabuf[iovcnt];
WSABUF *wsaptr = wsabuf;
const struct iovec *iovptr = iov;
for (int i = 0; i < iovcnt; ++i)
{
msg_name: NULL,
msg_namelen: 0,
msg_iov: (struct iovec *) iov, // const_cast
msg_iovlen: iovcnt,
msg_control: NULL,
msg_controllen: 0,
msg_flags: 0
};
return sendmsg (&msg, 0);
wsaptr->len = iovptr->iov_len;
(wsaptr++)->buf = (char *) (iovptr++)->iov_base;
}
WSAMSG wsamsg = { NULL, 0, wsabuf, iovcnt, { 0, NULL}, 0 };
return send_internal (&wsamsg, 0);
}
inline ssize_t

28
winsup/cygwin/net.cc
View File

@@ -643,7 +643,6 @@ cygwin_sendto (int fd, const void *buf, size_t len, int flags,
syscall_printf ("%d = sendto (%d, %p, %d, %x, %p, %d)",
res, fd, buf, len, flags, to, tolen);
return res;
}
@@ -664,7 +663,6 @@ cygwin_recvfrom (int fd, void *buf, size_t len, int flags,
syscall_printf ("%d = recvfrom (%d, %p, %d, %x, %p, %p)",
res, fd, buf, len, flags, from, fromlen);
return res;
}
@@ -1448,14 +1446,36 @@ cygwin_getpeername (int fd, struct sockaddr *name, socklen_t *len)
extern "C" int
cygwin_recv (int fd, void *buf, size_t len, int flags)
{
return cygwin_recvfrom (fd, buf, len, flags, NULL, NULL);
int res;
fhandler_socket *fh = get (fd);
myfault efault;
if (efault.faulted (EFAULT) || !fh)
res = -1;
else if ((res = len) != 0)
res = fh->recvfrom (buf, len, flags, NULL, NULL);
syscall_printf ("%d = recv (%d, %p, %d, %x)", res, fd, buf, len, flags);
return res;
}
/* exported as send: standards? */
extern "C" int
cygwin_send (int fd, const void *buf, size_t len, int flags)
{
return cygwin_sendto (fd, buf, len, flags, NULL, 0);
int res;
fhandler_socket *fh = get (fd);
myfault efault;
if (efault.faulted (EFAULT) || !fh)
res = -1;
else
res = fh->sendto (buf, len, flags, NULL, 0);
syscall_printf ("%d = send (%d, %p, %d, %x)", res, fd, buf, len, flags);
return res;
}
/* getdomainname: standards? */