diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-tls.c | 113 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c | 40 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c | 77 |
3 files changed, 175 insertions, 55 deletions
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c index 48d90ab8bb..e0ffcc06d3 100644 --- a/sysdeps/generic/dl-tls.c +++ b/sysdeps/generic/dl-tls.c @@ -117,10 +117,9 @@ internal_function _dl_determine_tlsoffset (void) { struct dtv_slotinfo *slotinfo; - size_t max_align; - size_t offset; + size_t max_align = TLS_TCB_ALIGN; + size_t offset, freetop = 0, freebottom = 0; size_t cnt; - size_t freebytes; /* The first element of the dtv slot info list is allocated. */ assert (GL(dl_tls_dtv_slotinfo_list) != NULL); @@ -128,6 +127,8 @@ _dl_determine_tlsoffset (void) dl_tls_dtv_slotinfo_list list. */ assert (GL(dl_tls_dtv_slotinfo_list)->next == NULL); + slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo; + /* Determining the offset of the various parts of the static TLS block has several dependencies. In addition we have to work around bugs in some toolchains. @@ -158,88 +159,90 @@ _dl_determine_tlsoffset (void) # if TLS_TCB_AT_TP /* We simply start with zero. */ - slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo; - max_align = slotinfo[1].map != NULL ? slotinfo[1].map->l_tls_align : 1; offset = 0; - freebytes = 0; for (cnt = 1; slotinfo[cnt].map != NULL; ++cnt) { assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len); - size_t blsize = (slotinfo[cnt].map->l_tls_blocksize - + slotinfo[cnt].map->l_tls_firstbyte_offset); + size_t firstbyte = (-slotinfo[cnt].map->l_tls_firstbyte_offset + & (slotinfo[cnt].map->l_tls_align - 1)); + size_t off; + max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align); - if (blsize <= freebytes) + if (freebottom - freetop >= slotinfo[cnt].map->l_tls_blocksize) { - /* When we come here the amount of memory we was "wasted" - for the correct alignment of the previous block is larger - than what we need for this module. So use it. */ - size_t n = (freebytes - blsize) / slotinfo[cnt].map->l_tls_align; - freebytes = (n * slotinfo[cnt].map->l_tls_align - + slotinfo[cnt].map->l_tls_firstbyte_offset); + off = roundup (freetop + slotinfo[cnt].map->l_tls_blocksize + - firstbyte, slotinfo[cnt].map->l_tls_align) + + firstbyte; + if (off <= freebottom) + { + freetop = off; + + /* XXX For some architectures we perhaps should store the + negative offset. */ + slotinfo[cnt].map->l_tls_offset = off; + continue; + } } - else + + off = roundup (offset + slotinfo[cnt].map->l_tls_blocksize - firstbyte, + slotinfo[cnt].map->l_tls_align) + firstbyte; + if (off > offset + slotinfo[cnt].map->l_tls_blocksize + + (freebottom - freetop)) { - /* There is either no gap from the bottom of the static TLS - block to the first used byte or the gap is too small. - Extend the static TLS block. */ - offset += roundup (blsize, max_align); - freebytes = slotinfo[cnt].map->l_tls_firstbyte_offset; + freetop = offset; + freebottom = off - slotinfo[cnt].map->l_tls_blocksize; } - - max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align); + offset = off; /* XXX For some architectures we perhaps should store the negative offset. */ - slotinfo[cnt].map->l_tls_offset = offset - freebytes; + slotinfo[cnt].map->l_tls_offset = off; } - /* The thread descriptor (pointed to by the thread pointer) has its - own alignment requirement. Adjust the static TLS size - and TLS offsets appropriately. */ - // XXX How to deal with this. We cannot simply add zero bytes - // XXX after the first (closest to the TCB) TLS block since this - // XXX would invalidate the offsets the linker creates for the LE - // XXX model. - GL(dl_tls_static_used) = offset; - GL(dl_tls_static_size) = (offset + roundup (TLS_STATIC_SURPLUS, max_align) + GL(dl_tls_static_size) = (roundup (offset + TLS_STATIC_SURPLUS, max_align) + TLS_TCB_SIZE); # elif TLS_DTV_AT_TP /* The TLS blocks start right after the TCB. */ offset = TLS_TCB_SIZE; - max_align = __alignof (void *); - /* The first block starts right after the TCB. */ - slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo; - if (slotinfo[1].map != NULL) + for (cnt = 1; slotinfo[cnt].map != NULL; ++cnt) { - size_t prev_size; + assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len); - offset = roundup (offset, slotinfo[1].map->l_tls_align); - slotinfo[1].map->l_tls_offset = offset; - max_align = slotinfo[1].map->l_tls_align; - prev_size = slotinfo[1].map->l_tls_blocksize; + size_t firstbyte = (-slotinfo[cnt].map->l_tls_firstbyte_offset + & (slotinfo[cnt].map->l_tls_align - 1)); + size_t off; + max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align); - for (cnt = 2; slotinfo[cnt].map != NULL; ++cnt) + if (slotinfo[cnt].map->l_tls_blocksize >= freetop - freebottom) { - assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len); - - max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align); - - /* Compute the offset of the next TLS block. */ - offset = roundup (offset + prev_size, - slotinfo[cnt].map->l_tls_align); + off = roundup (freebottom, slotinfo[cnt].map->l_tls_align); + if (off - freebottom < firstbyte) + off += slotinfo[cnt].map->l_tls_align; + if (off + slotinfo[cnt].map->l_tls_blocksize - firstbyte <= freetop) + { + slotinfo[cnt].map->l_tls_offset = off - firstbyte; + freebottom = off + slotinfo[cnt].map->l_tls_blocksize + - firstbyte; + continue; + } + } - /* XXX For some architectures we perhaps should store the - negative offset. */ - slotinfo[cnt].map->l_tls_offset = offset; + off = roundup (offset, slotinfo[cnt].map->l_tls_align); + if (off - offset < firstbyte) + off += slotinfo[cnt].map->l_tls_align; - prev_size = slotinfo[cnt].map->l_tls_blocksize; + slotinfo[cnt].map->l_tls_offset = off - firstbyte; + if (off - firstbyte - offset > freetop - freebottom) + { + freebottom = offset; + freetop = off - firstbyte; } - offset += prev_size; + offset = off + slotinfo[cnt].map->l_tls_blocksize - firstbyte; } GL(dl_tls_static_used) = offset; diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c new file mode 100644 index 0000000000..15b705402b --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise.c @@ -0,0 +1,40 @@ +/* Copyright (C) 2003 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 <errno.h> +#include <fcntl.h> +#include <sysdep.h> + +/* Advice the system about the expected behaviour of the application with + respect to the file associated with FD. */ + +int +posix_fadvise (int fd, off_t offset, off_t len, int advise) +{ +#ifdef __NR_fadvise64 + INTERNAL_SYSCALL_DECL (err); + int ret = INTERNAL_SYSCALL (fadvise64, err, 6, fd, 0, + __LONG_LONG_PAIR (offset >> 31, offset), len, + advise); + if (INTERNAL_SYSCALL_ERROR_P (ret, err)) + return INTERNAL_SYSCALL_ERRNO (ret, err); + return 0; +#else + return ENOSYS; +#endif +} diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c new file mode 100644 index 0000000000..edc21f69cd --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/posix_fadvise64.c @@ -0,0 +1,77 @@ +/* Copyright (C) 2003 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 <errno.h> +#include <fcntl.h> +#include <sysdep.h> +#include <kernel-features.h> + +int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); +int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); + +/* Advice the system about the expected behaviour of the application with + respect to the file associated with FD. */ + +int +__posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) +{ +#ifdef __NR_fadvise64_64 + INTERNAL_SYSCALL_DECL (err); + int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd, advise, + __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), + __LONG_LONG_PAIR ((long)(len >> 32), (long)len)); + if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) + return 0; +# ifndef __ASSUME_FADVISE64_64_SYSCALL + if (INTERNAL_SYSCALL_ERRNO (ret, err) != ENOSYS) +# endif + return INTERNAL_SYSCALL_ERRNO (ret, err); +#endif +#ifndef __ASSUME_FADVISE64_64_SYSCALL +# ifdef __NR_fadvise64 + if (len != (off_t) len) + return EOVERFLOW; + + INTERNAL_SYSCALL_DECL (err2); + int ret2 = INTERNAL_SYSCALL (fadvise64, err2, 6, fd, 0, + __LONG_LONG_PAIR ((long)(offset >> 32), (long)offset), + (off_t) len, advise); + if (!INTERNAL_SYSCALL_ERROR_P (ret2, err2)) + return 0; + return INTERNAL_SYSCALL_ERRNO (ret2, err2); +# else + return ENOSYS; +# endif +#endif +} + +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) + +int +__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) +{ + return __posix_fadvise64_l64 (fd, offset, len, advise); +} + +versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); +compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); +#else +strong_alias (__posix_fadvise64_l64, posix_fadvise64); +#endif |