diff options
| author | Khem Raj <kraj@mvista.com> | 2009-03-16 06:52:00 +0000 |
|---|---|---|
| committer | Khem Raj <kraj@mvista.com> | 2009-03-16 06:52:00 +0000 |
| commit | d05d1f200b65042c806466baf7e30e1885ab56dc (patch) | |
| tree | 962217aa7ecc217458df3e507ea0b6bb438ae791 /libc/sysdeps/linux/common | |
| parent | 63abb489adf80e503560668914d600d28d1b5f42 (diff) | |
| download | uClibc-alpine-d05d1f200b65042c806466baf7e30e1885ab56dc.tar.bz2 uClibc-alpine-d05d1f200b65042c806466baf7e30e1885ab56dc.tar.xz | |
Merged revisions 25638,25640,25642,25649-25650,25667-25668 via svnmerge from
svn+ssh://svn.uclibc.org/svn/trunk/uClibc
........
r25638 | vda | 2009-03-12 13:56:59 -0700 (Thu, 12 Mar 2009) | 10 lines
linuxthreads fixes from Will Newton (will.newton AT gmail.com):
* share Sys V semaphores in order to get appropriate SEM_UNDO semantics.
* correct guardaddr in pthread_free() for TLS case
* move spinlock unlocking before restart()
* When exit was called from a signal handler, the restart
from the manager processing the exit request instead restarted the thread
in pthread_cond_timedwait.
(see http://sources.redhat.com/ml/libc-ports/2006-05/msg00000.html)
........
r25640 | vda | 2009-03-12 16:04:19 -0700 (Thu, 12 Mar 2009) | 3 lines
add linuxthreads support for arm. By Will Newton (will.newton AT gmail.com)
........
r25642 | vapier | 2009-03-12 23:17:48 -0700 (Thu, 12 Mar 2009) | 1 line
add GNU extension for select timeouts where the sub-second field is actually longer than one second
........
r25649 | vapier | 2009-03-14 04:23:28 -0700 (Sat, 14 Mar 2009) | 1 line
force DOPIC for FDPIC ELF targets
........
r25650 | vapier | 2009-03-14 04:30:56 -0700 (Sat, 14 Mar 2009) | 1 line
default linux-2.4 module support to off for Blackfin targets
........
r25667 | vda | 2009-03-15 19:56:27 -0700 (Sun, 15 Mar 2009) | 3 lines
docs/pthreads_hacking.txt: new file
........
r25668 | kraj | 2009-03-15 23:02:47 -0700 (Sun, 15 Mar 2009) | 2 lines
Update copyright header.
........
Diffstat (limited to 'libc/sysdeps/linux/common')
| -rw-r--r-- | libc/sysdeps/linux/common/creat.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/select.c | 65 |
2 files changed, 58 insertions, 9 deletions
diff --git a/libc/sysdeps/linux/common/creat.c b/libc/sysdeps/linux/common/creat.c index 92dbf329c..77cf44e69 100644 --- a/libc/sysdeps/linux/common/creat.c +++ b/libc/sysdeps/linux/common/creat.c @@ -2,7 +2,7 @@ /* * creat() for uClibc * - * Copyright (C) 2009 <kraj@uclibc.org> + * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ diff --git a/libc/sysdeps/linux/common/select.c b/libc/sysdeps/linux/common/select.c index 34b6e8260..0c2d91984 100644 --- a/libc/sysdeps/linux/common/select.c +++ b/libc/sysdeps/linux/common/select.c @@ -9,6 +9,7 @@ #include <sys/syscall.h> #include <sys/select.h> +#include <stdint.h> #ifdef __UCLIBC_HAS_THREADS_NATIVE__ #include <sysdep-cancel.h> @@ -16,20 +17,65 @@ #define SINGLE_THREAD_P 1 #endif +#define USEC_PER_SEC 1000000L -libc_hidden_proto(select) +extern __typeof(select) __libc_select; + +#if !defined(__NR__newselect) && !defined(__NR_select) && defined __USE_XOPEN2K +# define __NR___libc_pselect6 __NR_pselect6 +_syscall6(int, __libc_pselect6, int, n, fd_set *, readfds, fd_set *, writefds, + fd_set *, exceptfds, const struct timespec *, timeout, + const sigset_t *, sigmask) + +int __libc_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct timeval *timeout) +{ + struct timespec _ts, *ts = 0; + if (timeout) { + uint32_t usec; + _ts.tv_sec = timeout->tv_sec; + + /* GNU extension: allow for timespec values where the sub-sec + * field is equal to or more than 1 second. The kernel will + * reject this on us, so take care of the time shift ourself. + * Some applications (like readline and linphone) do this. + * See 'clarification on select() type calls and invalid timeouts' + * on the POSIX general list for more information. + */ + usec = timeout->tv_usec; + if (usec >= USEC_PER_SEC) { + _ts.tv_sec += usec / USEC_PER_SEC; + usec %= USEC_PER_SEC; + } + _ts.tv_nsec = usec * 1000; + + ts = &_ts; + } + + if (SINGLE_THREAD_P) + return __libc_pselect6(n, readfds, writefds, exceptfds, ts, 0); +#ifdef __UCLIBC_HAS_THREADS_NATIVE__ + int oldtype = LIBC_CANCEL_ASYNC (); + int result = __libc_pselect6(n, readfds, writefds, exceptfds, ts, 0); + LIBC_CANCEL_RESET (oldtype); + return result; +#endif + +} + +#else #ifdef __NR__newselect -# undef __NR_select -# define __NR_select __NR__newselect +# define __NR___syscall_select __NR__newselect +#else +# define __NR___syscall_select __NR_select #endif -#define __NR___syscall_select __NR_select -static inline _syscall5(int, __syscall_select, int, n, fd_set *, readfds, +_syscall5(int, __syscall_select, int, n, fd_set *, readfds, fd_set *, writefds, fd_set *, exceptfds, struct timeval *, timeout); -int select(int n, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, - struct timeval * timeout) +int __libc_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct timeval *timeout) { if (SINGLE_THREAD_P) return __syscall_select(n, readfds, writefds, exceptfds, timeout); @@ -42,4 +88,7 @@ int select(int n, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, #endif } -libc_hidden_def(select) +#endif + +weak_alias(__libc_select,select) +libc_hidden_weak(select) |
