From nobody Fri Jan 26 21:02:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TM9Bj0l2fz58qgx; Fri, 26 Jan 2024 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TM9Bj0H6Mz4Lv1; Fri, 26 Jan 2024 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=HDLXugR8koe/eaY53qbt1POVf0dwF4E7ijcrGmek6wJP7XM0yOqfXkEEhSa4aTXzQYQNvv 4dP8sSE97hC5w+HCBE6izYVVtEje1belI6Lja4Ex/MXsbxks04FQSxJYH+wYm1WBweMjeE TWh/2O/svyb+3sGSCTLIovZ1GZEY3p9pj14ZX2Wi5L3gX+DIh1V5hNdbE77hLIzYvL5McC MHCrr/4TNtzWU7YwqKQDNUspm1O9ayPKMtVGt6mLruOqsrKUj3DGjsY/ZiOfuNdzyrgbYw 9dW0rIcabSys+mzvRXVZ4Bt+T52QcNMM4zVdSI06BQa22xnpNDS0lrfd6NXNAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706302973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2WUUB72SXqsYYJlyF/eo6zYFkD3XgrJHAP2SnWXEmI=; b=ouXazKHTmPTxZDfIjL3p2bmOHOzglwIEx1AM/IditTnXuaRPMXaubrhwjVcv2OjhFg0Ffr a7wbfgCJ1tzXvEW2/q1QP3ZPLXEIpDClvKOzjZMHZS3xDyKE+ovOeR+O4a+SEE4skfIKIu WvvqDUpMetk5fJAj5lCWpj/hJenHSAkG1qeibGAhdtWvKJjefYImEEf0yfeCOVHuyS/pCW ZB72ec2FjLaZI6A0+0h2LCw6AtC2VbLDQ6lo4sawyoYUAJJKjfJXLyL3f3ZEBeO4X4fsCC 7XvyCkcMXfCsBSO4QocvzB4EuuU8PzHjkrJn4ydrey0PUezQW/I+zXHREHuBLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706302973; a=rsa-sha256; cv=none; b=wv207Tm0dFNucQ/EaSv0S2lIzdr0RKorgL9+xqQX2M2rjf+boP6nZ8KIW0kfY19vcQtXx0 F9ETyaJWCqJCB7CLXaYs+sSMbv5vQJ+ZvooMmwtOTl55n68QyJRtmMUKx6D3lRny7ZaT8e IYgAcah+LVa908QPcNb0ArDBYhAwXlhes/YmfbJd01kWxrzfLY0OhLhJuC6i94/OXr8Bh9 5H9WdtB+hFA3rsXvdf68l656tsFfjM1dX9aGxsRz1KcBQlZdYCqzTFGLO/gTUamcQeJ16A qo9U1gUKUKMeUUuk6KgVBRUx7Q5gDUQcSyE6uYPG4Gs8++W3nENED5EFC6tm+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TM9Bh6SDDzwVZ; Fri, 26 Jan 2024 21:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40QL2q9R083750; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QL2qmb083747; Fri, 26 Jan 2024 21:02:52 GMT (envelope-from git) Date: Fri, 26 Jan 2024 21:02:52 GMT Message-Id: <202401262102.40QL2qmb083747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: a431d0f4a2ac - stable/14 - libthr: thr_attr.c: More style and clarity fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a431d0f4a2acb70a79a84d5dd73d9593fd7481db Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a431d0f4a2acb70a79a84d5dd73d9593fd7481db commit a431d0f4a2acb70a79a84d5dd73d9593fd7481db Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-26 20:58:22 +0000 libthr: thr_attr.c: More style and clarity fixes 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) --- lib/libthr/thread/thr_attr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 0ccc31b22c13..bbb143da1a7d 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -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);