From nobody Tue Jan 9 13:30:18 2024 X-Original-To: dev-commits-src-all@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 4T8WyL5MBXz57TVY; Tue, 9 Jan 2024 13:30:18 +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 4T8WyL4YRSz51QJ; Tue, 9 Jan 2024 13:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704807018; 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=0R0qFnwZTV5G2Ule9d+O9l8XPiioarJmHliKDA1xl+0=; b=bUJHQb4eJRmwung5l2Vi/5g6EGLLlX0BqzFdi5ulRYADyFjaZy9SbvQJBIF2w3BYxP/fjH 2DF+aMAUTB9MqSfDV5Q5+Kq8mLUC7oo9cjdTEpZxGKFQraiv71vHeVYWFi/rzzHC5cnZMb XMtFLeBqjWfrLdFFT9J/J6pxgg7sUoWrMxmpJ0q70GRpvoZnJrE1sBJOl2JRffsfnaPKhj e1EZXUM4rCFPcZMPtsbkve5up1KFOwBUfJACyf6lI03sumXCBqpni0bTPMnRt2u9sh8+/b CkGSz2tdkeVlfxpOB36ywUUSvkVbaoBkS2ePmjzkkU9lpzGxsJqTlZ1hhMp1Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704807018; 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=0R0qFnwZTV5G2Ule9d+O9l8XPiioarJmHliKDA1xl+0=; b=VQGcK4DLwx9EE8ipgi3SIr+NINA8wNXiEGgNUFVkHJ13JgIP0nTkxa6jf3bndukonAN9Lx XG87FsexP6Ua1D26fnbQFbzdQKoB/TniwuqBn+wJ/tnmXkoEgp1PfQtjHpcd/TptA+lqCR igni5F+JenPPRHIvIpAkPbzVsmUus6VSO628z5Q85Js92TCXXlcFszeUowmtGaTer9eyEY kehEKO18jgC7RSAZPGdpEV2VieoTNLIS+D32fM96oaq1sCBlgea2r4uh6LOpM3B/9YBenZ 5vOmbD/lbkG8E6uDf5C0t/09IfpS18v2QsxTInDEReMa8/jbLKAyenNAgEs1bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704807018; a=rsa-sha256; cv=none; b=pbutu8ZoOLugInINkP0i8vZI+5VFvbhogo6/N+0Tes2Hv04y0Zv/SlMqLti6mw+/+WiNUV cKcPuWvtPv/ZwdpljXVv6pO3IeeDzlUFprvQuzxr6ZcaKx1BcDedW3Vb+4kZEsDrcVzB4Y /qfHK+5o80/Q4BxxSQ5v3Gkr+1NQnhp8FsLql+1RCM5dnn1lL92Y5QvNIZxmGintIRjJ8b 1ToOq7KiAk6BPQDU02mmNAJIpZVa4MhGkRasbQIxCPQRPuEJIWvvF4KpLGhIdWQba2yipn xKvt3oEzX55Jkircl1I2ihTz3hO7QAVNPYOLwuSbVtDfOLgr5uVCT/AyFf+/Qw== 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 4T8WyL3dhCzsLl; Tue, 9 Jan 2024 13:30:18 +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 409DUIZf035751; Tue, 9 Jan 2024 13:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409DUIbv035748; Tue, 9 Jan 2024 13:30:18 GMT (envelope-from git) Date: Tue, 9 Jan 2024 13:30:18 GMT Message-Id: <202401091330.409DUIbv035748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4d312aa05141 - main - libthr: thr_attr.c: More style and clarity fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4d312aa051414ad77d3515f258230d01ad11d6dc Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4d312aa051414ad77d3515f258230d01ad11d6dc commit 4d312aa051414ad77d3515f258230d01ad11d6dc Author: Olivier Certner AuthorDate: 2024-01-04 15:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-09 13:29:25 +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 --- 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);