mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 17:40:06 +00:00
60dce8b904
This patch removes the socket.S implementation for all ports and replace it by a C implementation using socketcall. For ports that implement the syscall directly, there is no change. The patch idea is to simplify the socket function implementation that uses the socketcall to be based on C implemetation instead of a pseudo assembly implementation with arch specific parts. The patch then remove the assembly implementatation for the ports which uses socketcall (i386, microblaze, mips, powerpc, sparc, m68k, s390 and sh). I have cross-build GLIBC for afore-mentioned ports and tested on both i386 and ppc32 without regressions.
107 lines
3.0 KiB
C
107 lines
3.0 KiB
C
/* Copyright (C) 2008-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2008.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <sysdep-cancel.h>
|
|
#include <sys/syscall.h>
|
|
#include <kernel-features.h>
|
|
|
|
/* Do not use the accept4 syscall on socketcall architectures unless
|
|
it was added at the same time as the socketcall support or can be
|
|
assumed to be present. */
|
|
#if defined __ASSUME_SOCKETCALL \
|
|
&& !defined __ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL \
|
|
&& !defined __ASSUME_ACCEPT4_SYSCALL
|
|
# undef __NR_accept4
|
|
#endif
|
|
|
|
#ifdef __NR_accept4
|
|
int
|
|
accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags)
|
|
{
|
|
if (SINGLE_THREAD_P)
|
|
return INLINE_SYSCALL (accept4, 4, fd, addr.__sockaddr__, addr_len, flags);
|
|
|
|
int oldtype = LIBC_CANCEL_ASYNC ();
|
|
|
|
int result = INLINE_SYSCALL (accept4, 4, fd, addr.__sockaddr__, addr_len,
|
|
flags);
|
|
|
|
LIBC_CANCEL_RESET (oldtype);
|
|
|
|
return result;
|
|
}
|
|
#elif defined __NR_socketcall
|
|
# include <socketcall.h>
|
|
# ifdef __ASSUME_ACCEPT4_SOCKETCALL
|
|
int
|
|
accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags)
|
|
{
|
|
return SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len, flags);
|
|
}
|
|
# else
|
|
static int have_accept4;
|
|
|
|
int
|
|
accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags)
|
|
{
|
|
if (__glibc_likely (have_accept4 >= 0))
|
|
{
|
|
int ret = SOCKETCALL_CANCEL (accept4, fd, addr.__sockaddr__, addr_len,
|
|
flags);
|
|
/* The kernel returns -EINVAL for unknown socket operations.
|
|
We need to convert that error to an ENOSYS error. */
|
|
if (__builtin_expect (ret < 0, 0)
|
|
&& have_accept4 == 0
|
|
&& errno == EINVAL)
|
|
{
|
|
/* Try another call, this time with the FLAGS parameter
|
|
cleared and an invalid file descriptor. This call will not
|
|
cause any harm and it will return immediately. */
|
|
ret = SOCKETCALL_CANCEL (invalid, -1);
|
|
if (errno == EINVAL)
|
|
{
|
|
have_accept4 = -1;
|
|
__set_errno (ENOSYS);
|
|
}
|
|
else
|
|
{
|
|
have_accept4 = 1;
|
|
__set_errno (EINVAL);
|
|
}
|
|
return -1;
|
|
}
|
|
return ret;
|
|
}
|
|
__set_errno (ENOSYS);
|
|
return -1;
|
|
}
|
|
# endif /* __ASSUME_ACCEPT4_SOCKETCALL */
|
|
#else /* __NR_socketcall */
|
|
int
|
|
accept4 (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len, int flags)
|
|
{
|
|
__set_errno (ENOSYS);
|
|
return -1;
|
|
}
|
|
stub_warning (accept4)
|
|
#endif
|