Skip to content

Commit

Permalink
nptl: Use __pthread_attr_setaffinity_np in pthread_getattr_np
Browse files Browse the repository at this point in the history
This avoids duplicating the code for the affinity mask allocation
handling.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
  • Loading branch information
fweimer-rh committed Jun 2, 2020
1 parent 8111c45 commit 86ed077
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions nptl/pthread_getattr_np.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ int
__pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
{
struct pthread *thread = (struct pthread *) thread_id;

/* Prepare the new thread attribute. */
int ret = __pthread_attr_init (attr);
if (ret != 0)
return ret;

struct pthread_attr *iattr = (struct pthread_attr *) attr;
int ret = 0;

lll_lock (thread->lock, LLL_PRIVATE);

Expand Down Expand Up @@ -187,25 +192,18 @@ __pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
while (ret == EINVAL && size < 1024 * 1024);

if (ret == 0)
{
iattr->cpuset = cpuset;
iattr->cpusetsize = size;
}
else
{
free (cpuset);
if (ret == ENOSYS)
{
/* There is no such functionality. */
ret = 0;
iattr->cpuset = NULL;
iattr->cpusetsize = 0;
}
}
ret = __pthread_attr_setaffinity_np (attr, size, cpuset);
else if (ret == ENOSYS)
/* There is no such functionality. */
ret = 0;
free (cpuset);
}

lll_unlock (thread->lock, LLL_PRIVATE);

if (ret != 0)
__pthread_attr_destroy (attr);

return ret;
}
versioned_symbol (libc, __pthread_getattr_np, pthread_getattr_np, GLIBC_2_32);
Expand Down

0 comments on commit 86ed077

Please sign in to comment.