aboutsummaryrefslogtreecommitdiff
path: root/nptl/pthread_create.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-27 08:09:35 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-27 08:09:35 +0000
commit14ffbc8350791ff0f33ccc65af26ebaa1b520132 (patch)
treed1fa245e05ff0de18632a76b51c2570bafd18890 /nptl/pthread_create.c
parent261eada2ca65277dcc68565370cb2d321f402c21 (diff)
downloadglibc-14ffbc8350791ff0f33ccc65af26ebaa1b520132.zip
glibc-14ffbc8350791ff0f33ccc65af26ebaa1b520132.tar.gz
glibc-14ffbc8350791ff0f33ccc65af26ebaa1b520132.tar.bz2
Update.
* pthread_attr_setschedparam.c: Don't test priority against limits here. Set ATTR_FLAG_SCHED_SET flag. * pthread_attr_setschedpolicy.c: Set ATTR_FLAG_POLICY_SET flag. * pthread_create.c (__pthread_create_2_1): Copy scheduling attributes from parent thread to child. If attribute is used and scheduling parameters are not inherited, copy parameters from attribute or compute them. Check priority value. * pthread_getschedparam.c: If the parameters aren't known yet get them from the kernel. * pthread_setschedparam.c: Set ATTR_FLAG_SCHED_SET and ATTR_FLAG_POLICY_SET flag for thread. * sysdeps/unix/sysv/linux/internaltypes.h: Define ATTR_FLAG_SCHED_SET and ATTR_FLAG_POLICY_SET. * sysdeps/pthread/createthread.c: Use tgkill if possible.
Diffstat (limited to 'nptl/pthread_create.c')
-rw-r--r--nptl/pthread_create.c57
1 files changed, 42 insertions, 15 deletions
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index f8ab269..014c41b 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -386,7 +386,9 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
pd->arg = arg;
/* Copy the thread attribute flags. */
- pd->flags = iattr->flags;
+ struct pthread *self = THREAD_SELF;
+ pd->flags = ((iattr->flags & ~(ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET))
+ | (self->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)));
/* Initialize the field for the ID of the thread which is waiting
for us. This is a self-reference in case the thread is created
@@ -394,25 +396,49 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
pd->joinid = iattr->flags & ATTR_FLAG_DETACHSTATE ? pd : NULL;
/* The debug events are inherited from the parent. */
- pd->eventbuf = THREAD_SELF->eventbuf;
+ pd->eventbuf = self->eventbuf;
+
+ /* Copy the parent's scheduling parameters. The flags will say what
+ is valid and what is not. */
+ pd->schedpolicy = self->schedpolicy;
+ pd->schedparam = self->schedparam;
- /* Determine scheduling parameters for the thread.
- XXX How to determine whether scheduling handling is needed? */
- if (0 && attr != NULL)
+ /* Determine scheduling parameters for the thread. */
+ if (attr != NULL
+ && __builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0)
+ && (iattr->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0)
{
- if (iattr->flags & ATTR_FLAG_NOTINHERITSCHED)
+ INTERNAL_SYSCALL_DECL (err);
+
+ /* Use the scheduling parameters the user provided. */
+ if (iattr->flags & ATTR_FLAG_POLICY_SET)
+ pd->schedpolicy = iattr->schedpolicy;
+ else if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0)
{
- /* Use the scheduling parameters the user provided. */
- pd->schedpolicy = iattr->schedpolicy;
- memcpy (&pd->schedparam, &iattr->schedparam,
- sizeof (struct sched_param));
+ pd->schedpolicy = INTERNAL_SYSCALL (sched_getscheduler, err, 1, 0);
+ pd->flags |= ATTR_FLAG_POLICY_SET;
}
- else
+
+ if (iattr->flags & ATTR_FLAG_SCHED_SET)
+ memcpy (&pd->schedparam, &iattr->schedparam,
+ sizeof (struct sched_param));
+ else if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0)
+ {
+ INTERNAL_SYSCALL (sched_getparam, err, 2, 0, &pd->schedparam);
+ pd->flags |= ATTR_FLAG_SCHED_SET;
+ }
+
+ /* Check for valid priorities. */
+ int minprio = INTERNAL_SYSCALL (sched_get_priority_min, err, 1,
+ iattr->schedpolicy);
+ int maxprio = INTERNAL_SYSCALL (sched_get_priority_max, err, 1,
+ iattr->schedpolicy);
+ if (pd->schedparam.sched_priority < minprio
+ || pd->schedparam.sched_priority > maxprio)
{
- /* Just store the scheduling attributes of the parent. */
- pd->schedpolicy = __sched_getscheduler (0);
- __sched_getparam (0, &pd->schedparam);
+ err = EINVAL;
+ goto errout;
}
}
@@ -423,6 +449,7 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
err = create_thread (pd, iattr, STACK_VARIABLES_ARGS);
if (err != 0)
{
+ errout:
/* Something went wrong. Free the resources. */
__deallocate_stack (pd);
return err;