From nobody Thu Oct 20 09:24:16 2022 X-Original-To: dev-commits-ports-main@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 4MtMcJ4GPrz4gK7W; Thu, 20 Oct 2022 09:24:16 +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 4MtMcJ3DZ1z3Hr6; Thu, 20 Oct 2022 09:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666257856; 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=Wv4vbTs3eXaaofDKecjxGcELyKKWD4L+oHrKn5+WUdU=; b=Isf2hju/dsxsG1ItQ/pye7yxfNGKf+KJ0C22zboFDP8LxOhpA5rDZtVnGMKuxiR4Z6r6iH y0pyo50Jii+GvBpYIYwrDKZWAOhJQGEk8/ntfc6FxxcSsEsgk8AKmzGZLX0yf8GTFOUKzo Rz4wC0DhRV/VqCs/Trq9PddRkM10vqMOmYBPKHYXhxseIjjJQvLAimUvh5UrbBwZL1Yjp4 5OiMjldk0mRRqEkWXYK0vjN1d17IJPxahPs+u15pNnPk7BPypyaNSw7FYoz37w8+tX1N9a uf8EFlPf8KY3K1jykHABt4Sx8MY81WKWHw7okkD4jHtHOmeymP8MDhltQKOESA== 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 4MtMcJ2BVhzqGt; Thu, 20 Oct 2022 09:24:16 +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 29K9OGbV066838; Thu, 20 Oct 2022 09:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29K9OGwq066837; Thu, 20 Oct 2022 09:24:16 GMT (envelope-from git) Date: Thu, 20 Oct 2022 09:24:16 GMT Message-Id: <202210200924.29K9OGwq066837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 7c2beee51d07 - main - benchmarks/netperfmeter: Fix build with -DNDEBUG defined List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c2beee51d072ab185dd5186b2fd9d6eda4b7dfc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666257856; 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=Wv4vbTs3eXaaofDKecjxGcELyKKWD4L+oHrKn5+WUdU=; b=R2MV2LZlJgBq8udDm0w+tOfAntEsNMtlRxLQViuD4msIxceAOBVfiGnESo3aQ4f9kAfYXC mUKjNPdwa3aiNH8uqnCMFQLRKkIlz+MJIv1iYDeUTEx4Gtbap12OasIGSALD5z/zn9lrYj gxZkxwDktG2bhO/wYtqYBHVTMxv/e8cY4XHf/8lpRFV4BF6xTKqsCgPPpvu/5wjyJnh9ZY GMfgn6UsIIYadwzPbLnoXTob8lpDjFp45tiOag9cf0SisL8AQf1J7tPmhytfHpbthFDtcN 74y4ARBDAHX/QhfzKKdx6FsZfRjjsTajQ9LaFtvAPCC7aw7dxOmXUOk/Rm6T2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666257856; a=rsa-sha256; cv=none; b=I9SQAQGi6tUoXFld+Nb/50PAY4rNuszL4B/40BegjZGhkIptgz6lrOMELwfjQKfgRtGp93 yC77JV3vDDl8Qcs14kzlWm4WuL3E4vbCrtR96pKY8WmSOfD/dcs+uVlD/CUYv2t2BEikfs EEkOVohoPVi/VRAd0o68i2sksA0R9peykK7KCdXgqsLjrILt4p4A1VDeqjMOfiAPFnbrnT GdGxlLKxFgz8HHw9Z8i3o4uO0juBS9X26zb35n5zmxtFNNwNURA2SnjRDv5IE0XTdcIJH7 NnJwU82AcnYLtzgxBrEteni1MZOQCrnpR2kt9/E09J2KqjoiLWK0TwZ1hfSPZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c2beee51d072ab185dd5186b2fd9d6eda4b7dfc commit 7c2beee51d072ab185dd5186b2fd9d6eda4b7dfc Author: Daniel Engberg AuthorDate: 2022-10-20 09:21:33 +0000 Commit: Daniel Engberg CommitDate: 2022-10-20 09:24:09 +0000 benchmarks/netperfmeter: Fix build with -DNDEBUG defined Disable usage of OMNeT++ random generator when -DNDEBUG is defined PR: 266721 Reported by: antoine (via exp-run) Approved by: portmgr (build fix) --- benchmarks/netperfmeter/files/patch-src_tools.cc | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/benchmarks/netperfmeter/files/patch-src_tools.cc b/benchmarks/netperfmeter/files/patch-src_tools.cc new file mode 100644 index 000000000000..8007c7c87668 --- /dev/null +++ b/benchmarks/netperfmeter/files/patch-src_tools.cc @@ -0,0 +1,25 @@ +--- src/tools.cc.orig 2022-10-20 09:17:55 UTC ++++ src/tools.cc +@@ -1135,11 +1135,13 @@ uint64_t random64() + /* ###### Get 32-bit random value ######################################## */ + uint32_t random32() + { ++/* + #ifdef NDEBUG + #warning Using OMNeT++ random generator instead of time-seeded one! + const double value = uniform(0.0, (double)0xffffffff); + return((uint32_t)rint(value)); + #else ++*/ + uint32_t number; + + switch(RandomSource) { +@@ -1165,7 +1167,7 @@ uint32_t random32() + const uint16_t a = random() & 0xffff; + const uint16_t b = random() & 0xffff; + return( (((uint32_t)a) << 16) | (uint32_t)b ); +-#endif ++ + } + +