upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libthr: thr_attr.c: More style and clarity fixes

Browse source 
The change of argument for sizeof() (from a type to an object) is to be
consistent with the change done for the malloc() code just above in the
preceding commit touching this file.

Consider bit flags as integers and test whether they are set with an
explicit comparison with 0.

Use an explicit flag value (PTHREAD_SCOPE_SYSTEM) in place of a variable
that has this value at point of substitution.

All other changes are straightforward.

Suggested by:           kib
Reviewed by:            kib
Approved by:            emaste (mentor)
MFC after:              2 weeks
Differential Revision:  https://reviews.freebsd.org/D43327

(cherry picked from commit 4d312aa051414ad77d3515f258230d01ad11d6dc)

Approved by:            markj (mentor)
This commit is contained in:
Olivier Certner 2024-01-04 16:10:40 +01:00
parent 1c090bf880
commit a431d0f4a2
No known key found for this signature in database
GPG key ID: 8CA13040971E2627
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/libthr/thread/thr_attr.c
View file

@ -117,8 +117,7 @@ _thr_attr_destroy(pthread_attr_t *attr)
if (attr == NULL || *attr == NULL)
return (EINVAL);
if ((*attr)->cpuset != NULL)
free((*attr)->cpuset);
free((*attr)->cpuset);
free(*attr);
*attr = NULL;
return (0);
@ -151,7 +150,7 @@ _thr_attr_get_np(pthread_t pthread, pthread_attr_t *dstattr)
return (error);
attr = pthread->attr;
if (pthread->flags & THR_FLAGS_DETACHED)
if ((pthread->flags & THR_FLAGS_DETACHED) != 0)
attr.flags |= PTHREAD_DETACHED;
error = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, TID(pthread),
@ -180,7 +179,7 @@ _thr_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
if (attr == NULL || *attr == NULL || detachstate == NULL)
return (EINVAL);
if ((*attr)->flags & PTHREAD_DETACHED)
if (((*attr)->flags & PTHREAD_DETACHED) != 0)
*detachstate = PTHREAD_CREATE_DETACHED;
else
*detachstate = PTHREAD_CREATE_JOINABLE;
@ -258,7 +257,7 @@ _thr_attr_getscope(const pthread_attr_t * __restrict attr,
if (attr == NULL || *attr == NULL || contentionscope == NULL)
return (EINVAL);
*contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ?
*contentionscope = ((*attr)->flags & PTHREAD_SCOPE_SYSTEM) != 0 ?
PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS;
return (0);
}
@ -321,7 +320,7 @@ _thr_attr_init(pthread_attr_t *attr)
if ((pattr = malloc(sizeof(*pattr))) == NULL)
return (ENOMEM);
memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr));
memcpy(pattr, &_pthread_attr_default, sizeof(*pattr));
*attr = pattr;
return (0);
}
@ -449,7 +448,7 @@ _thr_attr_setscope(pthread_attr_t *attr, int contentionscope)
return (EINVAL);
if (contentionscope == PTHREAD_SCOPE_SYSTEM)
(*attr)->flags |= contentionscope;
(*attr)->flags |= PTHREAD_SCOPE_SYSTEM;
else
(*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM;
return (0);
@ -546,6 +545,7 @@ _pthread_attr_setaffinity_np(pthread_attr_t *pattr, size_t cpusetsize,
if (cpusetsize > kern_size) {
/* Kernel checks invalid bits, we check it here too. */
size_t i;
for (i = kern_size; i < cpusetsize; ++i)
if (((const char *)cpusetp)[i] != 0)
return (EINVAL);