From b7cb624be9f0a59198e1a5f44cdee0a215440d27 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 18 Sep 2002 07:33:20 +0000 Subject: [PATCH] Update. 2002-09-18 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/clone.S: Add support for SETTLS and SETTID/CLEARTID. * signal/allocrtsig.c: Move to... * sysdeps/generic/allocrtsig.c: ...here. New file. --- ChangeLog | 10 +++- sysdeps/generic/allocrtsig.c | 94 ++++++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/i386/clone.S | 29 +++++++---- 3 files changed, 122 insertions(+), 11 deletions(-) create mode 100644 sysdeps/generic/allocrtsig.c diff --git a/ChangeLog b/ChangeLog index ca3ebb7cbf..289c35de1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-09-18 Ulrich Drepper + + * sysdeps/unix/sysv/linux/i386/clone.S: Add support for SETTLS and + SETTID/CLEARTID. + + * signal/allocrtsig.c: Move to... + * sysdeps/generic/allocrtsig.c: ...here. New file. + 2002-09-17 Jakub Jelinek * elf/dl-lookup.c (_dl_debug_bindings): Print TLS lookups always. @@ -18,8 +26,6 @@ file-specific variable override so it compiles properly when using --with-headers. - * NEWS: Added item for powerpc64-linux port. - 2002-09-17 Steven Munroe Ported to PowerPC64 running Linux. diff --git a/sysdeps/generic/allocrtsig.c b/sysdeps/generic/allocrtsig.c new file mode 100644 index 0000000000..fdf8a6854a --- /dev/null +++ b/sysdeps/generic/allocrtsig.c @@ -0,0 +1,94 @@ +/* Handle real-time signal allocation. + Copyright (C) 1997,98,99,2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + + 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 + +/* In these variables we keep track of the used variables. If the + platform does not support any real-time signals we will define the + values to some unreasonable value which will signal failing of all + the functions below. */ +#ifndef __SIGRTMIN +static int current_rtmin = -1; +static int current_rtmax = -1; +#else +static int current_rtmin; +static int current_rtmax; + +static int initialized; + +#include "testrtsig.h" + +static void +init (void) +{ + if (!kernel_has_rtsig ()) + { + current_rtmin = -1; + current_rtmax = -1; + } + else + { + current_rtmin = __SIGRTMIN; + current_rtmax = __SIGRTMAX; + } + initialized = 1; +} +#endif + +/* Return number of available real-time signal with highest priority. */ +int +__libc_current_sigrtmin (void) +{ +#ifdef __SIGRTMIN + if (!initialized) + init (); +#endif + return current_rtmin; +} + +/* Return number of available real-time signal with lowest priority. */ +int +__libc_current_sigrtmax (void) +{ +#ifdef __SIGRTMIN + if (!initialized) + init (); +#endif + return current_rtmax; +} + +/* Allocate real-time signal with highest/lowest available + priority. Please note that we don't use a lock since we assume + this function to be called at program start. */ +int +__libc_allocate_rtsig (int high) +{ +#ifndef __SIGRTMIN + return -1; +#else + if (!initialized) + init (); + if (current_rtmin == -1 || current_rtmin > current_rtmax) + /* We don't have anymore signal available. */ + return -1; + + return high ? current_rtmin++ : current_rtmax--; +#endif +} diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S index 9865ebd948..64c0778fd7 100644 --- a/sysdeps/unix/sysv/linux/i386/clone.S +++ b/sysdeps/unix/sysv/linux/i386/clone.S @@ -27,13 +27,19 @@ #include #include -/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ +/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg, + pid_t *tid, struct user_desc *tls); */ #define PARMS LINKAGE /* no space for saved regs */ #define FUNC PARMS #define STACK FUNC+4 #define FLAGS STACK+PTR_SIZE #define ARG FLAGS+4 +#define TID ARG+PTR_SIZE +#define TLS TID+PTR_SIZE + +#define __NR_clone 120 +#define SYS_clone 120 .text ENTRY (BP_SYM (__clone)) @@ -55,30 +61,34 @@ ENTRY (BP_SYM (__clone)) #endif /* Insert the argument onto the new stack. */ - subl $8,%ecx + subl $12,%ecx movl ARG(%esp),%eax /* no negative argument counts */ - movl %eax,4(%ecx) + movl %eax,8(%ecx) /* Save the function pointer as the zeroth argument. It will be popped off in the child in the ebx frobbing below. */ movl FUNC(%esp),%eax - movl %eax,0(%ecx) + movl %eax,4(%ecx) /* Do the system call */ pushl %ebx - movl FLAGS+4(%esp),%ebx + pushl %esi + movl TLS+8(%esp),%esi + movl TID+8(%esp),%edx + movl FLAGS+8(%esp),%ebx movl $SYS_ify(clone),%eax int $0x80 + popl %esi popl %ebx test %eax,%eax jl SYSCALL_ERROR_LABEL - jz thread_start + jz L(thread_start) L(pseudo_end): ret -thread_start: +L(thread_start): subl %ebp,%ebp /* terminate the stack frame */ call *%ebx #ifdef PIC @@ -87,8 +97,9 @@ L(here): popl %ebx addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ebx #endif - pushl %eax - call HIDDEN_JUMPTARGET (_exit) + movl %eax, %ebx + movl $SYS_ify(exit), %eax + int $0x80 PSEUDO_END (BP_SYM (__clone)) -- 2.11.4.GIT