From 7db20e36c819dc7b5973f724da43b778321ea62e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 5 Jun 2002 08:56:41 +0000 Subject: * io/Makefile (routines): Add sendfile and sendfile64. (headers): Add sys/sendfile.h to the list. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Don't add it here. * sysdeps/unix/sysv/linux/sys/sendfile.h: Moved to ... * io/sys/sendfile.h: ... here. * sysdeps/generic/sendfile.c: New file. * sysdeps/generic/sendfile64.c: New file. * sysdeps/unix/sysv/linux/Versions (GLIBC_2.1, GLIBC_2.3): Move sendfile, sendfile64 to ... * io/Versions (GLIBC_2.1, GLIBC_2.3): ... here. * sysdeps/mach/hurd/sendfile.c: New file. * sysdeps/mach/hurd/sendfile64.c: New file. * sysdeps/mach/nanosleep.c: New file. --- sysdeps/mach/hurd/sendfile.c | 60 ++++++++++++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/sendfile64.c | 43 ++++++++++++++++++++++++++++++ sysdeps/mach/nanosleep.c | 53 +++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 sysdeps/mach/hurd/sendfile.c create mode 100644 sysdeps/mach/hurd/sendfile64.c create mode 100644 sysdeps/mach/nanosleep.c (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/sendfile.c b/sysdeps/mach/hurd/sendfile.c new file mode 100644 index 0000000000..b1849d2bf9 --- /dev/null +++ b/sysdeps/mach/hurd/sendfile.c @@ -0,0 +1,60 @@ +/* sendfile -- copy data directly from one file descriptor to another + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include +#include + +/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to + descriptor OUT_FD. */ +ssize_t +sendfile (int out_fd, int in_fd, off_t *offset, size_t count) +{ + /* We just do a vanilla io_read followed by a vanilla io_write here. + In theory the IN_FD filesystem can return us out-of-line data that + we then send out-of-line to the OUT_FD filesystem and no copying + takes place until those pages need to be flushed or packaged by + that filesystem (e.g. packetized by a network socket). However, + we momentarily consume COUNT bytes of our local address space, + which might blow if it's huge or address space is real tight. */ + + char *data = 0; + size_t datalen = 0; + error_t err = HURD_DPORT_USE (in_fd, + __io_read (port, &data, &datalen, + offset ? *offset : (off_t) -1, + count)); + if (err == 0) + { + size_t nwrote; + if (datalen == 0) + return 0; + err = HURD_DPORT_USE (out_fd, __io_write (port, data, datalen, + (off_t) -1, &nwrote)); + munmap (data, datalen); + if (err == 0) + { + if (offset) + *offset += datalen; + return nwrote; + } + } + return __hurd_fail (err); +} diff --git a/sysdeps/mach/hurd/sendfile64.c b/sysdeps/mach/hurd/sendfile64.c new file mode 100644 index 0000000000..40ce271efb --- /dev/null +++ b/sysdeps/mach/hurd/sendfile64.c @@ -0,0 +1,43 @@ +/* sendfile -- copy data directly from one file descriptor to another + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to + descriptor OUT_FD. */ +ssize_t +sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count) +{ + if (offset == NULL) + return sendfile (out_fd, in_fd, NULL, count); + else + { + off_t ofs = *offset; + if (ofs != *offset) + { + __set_errno (EOVERFLOW); + return -1; + } + ssize_t ret = sendfile (out_fd, in_fd, &ofs, count); + *offset = ofs; + return ret; + } +} diff --git a/sysdeps/mach/nanosleep.c b/sysdeps/mach/nanosleep.c new file mode 100644 index 0000000000..8484a99001 --- /dev/null +++ b/sysdeps/mach/nanosleep.c @@ -0,0 +1,53 @@ +/* nanosleep -- sleep for a period specified with a struct timespec + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include +#include + +int +__nanosleep (const struct timespec *requested_time, + struct timespec *remaining) +{ + mach_port_t recv; + struct timeval before, after; + const mach_msg_timeout_t ms + = requested_time->tv_sec * 1000 + + (requested_time->tv_nsec + 999999) / 1000000; + + recv = __mach_reply_port (); + + if (remaining && __gettimeofday (&before, NULL) < 0) + return -1; + (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, + 0, 0, recv, ms, MACH_PORT_NULL); + __mach_port_destroy (mach_task_self (), recv); + if (remaining && __gettimeofday (&after, NULL) < 0) + return -1; + + if (remaining) + { + timersub (&after, &before, &after); + TIMEVAL_TO_TIMESPEC (&after, remaining); + } + + return 0; +} +weak_alias (__nanosleep, nanosleep) -- cgit 1.4.1