From nobody Mon Jan 3 10:36:19 2022 X-Original-To: dev-commits-ports-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 E21ED192EADE; Mon, 3 Jan 2022 10:36:19 +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 4JSBxH3ZzKz4qVx; Mon, 3 Jan 2022 10:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5825D23E8F; Mon, 3 Jan 2022 10:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203AaJkF098551; Mon, 3 Jan 2022 10:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203AaJjV098550; Mon, 3 Jan 2022 10:36:19 GMT (envelope-from git) Date: Mon, 3 Jan 2022 10:36:19 GMT Message-Id: <202201031036.203AaJjV098550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 7dc5416497a6 - main - benchmarks/stress-ng: fix build on -CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dc5416497a6d04bb85c5ded6b4983fb46b199b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641206179; 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=zD/CRSQoX7TQkCUhYmDGVjFz2Npj5RwIHUSldhBFU7M=; b=B0aG/lAL7kmWXSbsV2WlZeTixWBBgx29MSQcDyLULuFavzFyy04BkEaudmVePNDnfo/Dll ldS/WpY5iylpl/Ecbs4NUFMlOHlpSuP4fO/OfUtNAa51RoIqrZLHrxoIqVgMj/4e8q4ItG JI+WOZM3LfaAzb2nRmvCLaST6MJ+Z0inXgI292eYxrYrc+3aBcvkxuKboheTG2V/+IobQr 8u2nf1OwzUaWMKQ8bjdY7oUrlS3eZ+T94SWbUNR+u5hhMYsYNix59C2SP0ZD/ueWjjFaxf 5Vf+Vj7e+1B+f4PoK7R0DNZbDt6RlTo5Q0RFGVKbYSdGpCBykLOUt5NLy35GKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641206179; a=rsa-sha256; cv=none; b=js27bTGlzaTIFxlnS9Tct74UI3OczvIWsVDkHN1eT1Tim2rL3dteO5QjNPb8mgpTu14jKS P7ecdkwO1/3tqmCJU/U7V612pYpicY0OmkPueoNUNcY8d+btZjnm2PwmwnFOF0GZZZM1vu gpDrTuj4GGzyqFoorDuOJFb+RlLBnFiA2a7cBzPIIqzBIO/hbaqvaDzqqFpls8k8vUgSd7 QmDmWnS2llY8YT6PZjSYaacEd0K1jkfFpXB48LumktoNRkmh1Ymh2r4zQ5D074o12fVamf abhiUN5t4exSJ21ivrMnuJpCg2LqUZv7zPYY61d+g+Qd2cT0NM1uLrYfpLcL9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dc5416497a6d04bb85c5ded6b4983fb46b199b4 commit 7dc5416497a6d04bb85c5ded6b4983fb46b199b4 Author: Stefan Eßer AuthorDate: 2022-01-03 10:33:58 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 10:33:58 +0000 benchmarks/stress-ng: fix build on -CURRENT The CPU_SET macros in -CURRENT have been made compatible with GLIBC. A simple test for the new signature of CPU_AND, CPU_OR, ... is the existence of a CPU_ALLOC macro. Approved by: portmgr (implicit) MFH: 2022Q1 --- benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c index 0beb2950f2b2..d54609e2fc7f 100644 --- a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c +++ b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c @@ -1,11 +1,14 @@ ---- stress-tlb-shootdown.c.orig 2021-12-28 15:45:13 UTC +--- stress-tlb-shootdown.c.orig 2021-12-19 20:49:35 UTC +++ stress-tlb-shootdown.c -@@ -64,7 +64,7 @@ static int stress_tlb_shootdown(const stress_args_t *a +@@ -64,7 +64,11 @@ static int stress_tlb_shootdown(const stress_args_t *a const int32_t max_cpus = stress_get_processors_configured(); CPU_ZERO(&proc_mask); -- CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask); ++#ifdef CPU_ALLOC + CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask); ++#else + CPU_OR(&proc_mask, &proc_mask_initial); ++#endif tlb_procs = max_cpus; if (tlb_procs > MAX_TLB_PROCS)