lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* pthread_create.c (__pthread_create_2_1): Rename syscall error

Browse Source 
variable to scerr.
This commit is contained in:
Ulrich Drepper
2005-03-24 06:38:49 +00:00
parent 60f84a40bb
commit 1e6da2b0f2
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nptl/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-23 Ulrich Drepper <drepper@redhat.com>
* pthread_create.c (__pthread_create_2_1): Rename syscall error
variable to scerr.
2005-03-10 Jakub Jelinek <jakub@redhat.com> 2005-03-10 Jakub Jelinek <jakub@redhat.com>
* tst-getpid1.c (do_test): Align stack passed to clone{2,}. * tst-getpid1.c (do_test): Align stack passed to clone{2,}.

20
nptl/pthread_create.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -347,17 +347,15 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
void *arg; void *arg;
{ {
STACK_VARIABLES; STACK_VARIABLES;
const struct pthread_attr *iattr;
struct pthread *pd;
int err;
iattr = (struct pthread_attr *) attr; const struct pthread_attr *iattr = (struct pthread_attr *) attr;
if (iattr == NULL) if (iattr == NULL)
/* Is this the best idea? On NUMA machines this could mean /* Is this the best idea? On NUMA machines this could mean
accessing far-away memory. */ accessing far-away memory. */
iattr = &default_attr; iattr = &default_attr;
err = ALLOCATE_STACK (iattr, &pd); struct pthread *pd;
int err = ALLOCATE_STACK (iattr, &pd);
if (__builtin_expect (err != 0, 0)) if (__builtin_expect (err != 0, 0))
/* Something went wrong. Maybe a parameter of the attributes is /* Something went wrong. Maybe a parameter of the attributes is
invalid or we could not allocate memory. */ invalid or we could not allocate memory. */
@ -406,14 +404,14 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
&& __builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0) && __builtin_expect ((iattr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0, 0)
&& (iattr->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0) && (iattr->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)) != 0)
{ {
INTERNAL_SYSCALL_DECL (err); INTERNAL_SYSCALL_DECL (scerr);
/* Use the scheduling parameters the user provided. */ /* Use the scheduling parameters the user provided. */
if (iattr->flags & ATTR_FLAG_POLICY_SET) if (iattr->flags & ATTR_FLAG_POLICY_SET)
pd->schedpolicy = iattr->schedpolicy; pd->schedpolicy = iattr->schedpolicy;
else if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0) else if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0)
{ {
pd->schedpolicy = INTERNAL_SYSCALL (sched_getscheduler, err, 1, 0); pd->schedpolicy = INTERNAL_SYSCALL (sched_getscheduler, scerr, 1, 0);
pd->flags |= ATTR_FLAG_POLICY_SET; pd->flags |= ATTR_FLAG_POLICY_SET;
} }
@ -422,14 +420,14 @@ __pthread_create_2_1 (newthread, attr, start_routine, arg)
sizeof (struct sched_param)); sizeof (struct sched_param));
else if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0) else if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0)
{ {
INTERNAL_SYSCALL (sched_getparam, err, 2, 0, &pd->schedparam); INTERNAL_SYSCALL (sched_getparam, scerr, 2, 0, &pd->schedparam);
pd->flags |= ATTR_FLAG_SCHED_SET; pd->flags |= ATTR_FLAG_SCHED_SET;
} }
/* Check for valid priorities. */ /* Check for valid priorities. */
int minprio = INTERNAL_SYSCALL (sched_get_priority_min, err, 1, int minprio = INTERNAL_SYSCALL (sched_get_priority_min, scerr, 1,
iattr->schedpolicy); iattr->schedpolicy);
int maxprio = INTERNAL_SYSCALL (sched_get_priority_max, err, 1, int maxprio = INTERNAL_SYSCALL (sched_get_priority_max, scerr, 1,
iattr->schedpolicy); iattr->schedpolicy);
if (pd->schedparam.sched_priority < minprio if (pd->schedparam.sched_priority < minprio
|| pd->schedparam.sched_priority > maxprio) || pd->schedparam.sched_priority > maxprio)