From nobody Wed Jun 28 03:46:31 2023 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 4QrSDm1WJ9z4hjG0; Wed, 28 Jun 2023 03:46:32 +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 4QrSDm0W0Qz3R3R; Wed, 28 Jun 2023 03:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687923992; 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=sQlNMr+fOZnPL4oLCWCbGWmYri8g8CxBJ3JqufjGxp4=; b=qUbgIAOyC4P45TzFZOfXwMcAIzsm3spJFaUnknJBK6LQvTE8kAent7knArNxXHgeFrQyQT uo4CoD5Jmatz6njaJMpOXd6PHDSRF7YkFT6ctJSiLNzGc8mr6JBHyfJ/A3BkJOlw+bq6Bo 5JLa7jvi0zSSobmy8NMUdcCJIpNLql9Tu5HKPhHsSjdJSDoJ4Yw9JUjBQF3GgkBDE1V1OX eMTk33yDyJUMG+8ewRmTfWjTyoQx1VcVBpiAObOsBL0ffy6/yyFHrV9Wx7SDLDGF+pyjH1 xhpIUJRNrMt6pR7bBVl0wv7Ap4rkRM8SqVj4TmxR+Wobgp+Csa9tc8otOPSJ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687923992; 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=sQlNMr+fOZnPL4oLCWCbGWmYri8g8CxBJ3JqufjGxp4=; b=ayf8KJBQUTWH20Pn1HOB2okBz7ynOIas384aecc4L2u9mwdFXCZmGZSCjgqYWB4qky+3Y5 qQHpr0yBVVk2bhB9KlHRHlisq8i6rKXVKHV9zrjSOEQWAGeaxh9fkWNw3th9hMAloMePYj F/I/w09J0+OnMdzIUv93CKgRmw2odh7PUpO0DWnt0hjoboEDlePDnqvqw0q07KTHnjIy2e PFpwlMyHc1TaEEIt7M6Tob4afGTa3+tiq7YcbxIBLELruP5xxFZDA7fYME4LFGz52FnqI8 9jLXrA1pezRIMCK0kckESABHPyZQUkNKH+Awi/9r/mFgwm0ECFpDxHJrxQoSYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687923992; a=rsa-sha256; cv=none; b=Om+rZOwfAVjSI0lLK9gh5RwPH8see/RspyqD2/JmpNQbXYOKB7VZPvDgQ6csAskEjOhefN zC9qYAI1qFSJhcR5REfeDJWiX35RABj++KKGlxDM/qGEFN69FS+CkbIwIG//fiUwjj+T5H S5vRuxoP+8RVfm3Kqh5fWSLOUqf3xS4X8GAnlk6/YWWqS6sRWOKpdojBPXQYDFRnj5ONmH CkFJeyosdMrLAlbDVlOWuZsOl0629MKTG180O7tUzAOualJwAZ2TeDiaeVab8b6oThBd5J /0zWQoFqNZ779fRwo/8LcD67Ufv9Hgq7IW54KXlcVwNOvZ/e6Stf683SpwLopQ== 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 4QrSDl6CNnzJsW; Wed, 28 Jun 2023 03:46:31 +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 35S3kVMk063510; Wed, 28 Jun 2023 03:46:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35S3kVp4063509; Wed, 28 Jun 2023 03:46:31 GMT (envelope-from git) Date: Wed, 28 Jun 2023 03:46:31 GMT Message-Id: <202306280346.35S3kVp4063509@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: df1bdb03e88f - main - devel/concurrentqueue: Add tests; Improve pkg-descr 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df1bdb03e88f464271a2642bf81793f5698aff3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=df1bdb03e88f464271a2642bf81793f5698aff3e commit df1bdb03e88f464271a2642bf81793f5698aff3e Author: Yuri Victorovich AuthorDate: 2023-06-28 01:40:04 +0000 Commit: Yuri Victorovich CommitDate: 2023-06-28 03:46:24 +0000 devel/concurrentqueue: Add tests; Improve pkg-descr --- devel/concurrentqueue/Makefile | 15 ++++++++++++++- .../files/patch-tests_common_systemtime.cpp | 20 ++++++++++++++++++++ devel/concurrentqueue/pkg-descr | 3 ++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/devel/concurrentqueue/Makefile b/devel/concurrentqueue/Makefile index 45b057d40f7d..b822c5d1d59e 100644 --- a/devel/concurrentqueue/Makefile +++ b/devel/concurrentqueue/Makefile @@ -10,11 +10,24 @@ WWW= https://github.com/cameron314/concurrentqueue LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang dos2unix USE_GITHUB= yes GH_ACCOUNT= cameron314 +DOS2UNIX_FILES= tests/common/systemtime.cpp + NO_ARCH= yes +BINARY_ALIAS= g++=${CXX} # only for tests + +xdo-test: + @cd ${WRKSRC}/tests/unittests && \ + ${SETENV} ${TEST_ENV} ${GMAKE} && \ + ${WRKSRC}/build/bin/unittests + +do-test: + @${SETENV} ${TEST_ENV} ${GMAKE} -C ${WRKSRC}/tests/unittests + @${WRKSRC}/build/bin/unittests + .include diff --git a/devel/concurrentqueue/files/patch-tests_common_systemtime.cpp b/devel/concurrentqueue/files/patch-tests_common_systemtime.cpp new file mode 100644 index 000000000000..b5860853ce10 --- /dev/null +++ b/devel/concurrentqueue/files/patch-tests_common_systemtime.cpp @@ -0,0 +1,20 @@ +--- tests/common/systemtime.cpp.orig 2023-06-28 01:31:14 UTC ++++ tests/common/systemtime.cpp +@@ -118,7 +118,7 @@ SystemTime getSystemTime() + { + timespec t; + CompilerMemBar(); +- if (clock_gettime(CLOCK_MONOTONIC_RAW, &t) != 0) { ++ if (clock_gettime(CLOCK_MONOTONIC, &t) != 0) { + t.tv_sec = (time_t)-1; + t.tv_nsec = -1; + } +@@ -131,7 +131,7 @@ double getTimeDelta(SystemTime start) + { + timespec t; + CompilerMemBar(); +- if ((start.tv_sec == (time_t)-1 && start.tv_nsec == -1) || clock_gettime(CLOCK_MONOTONIC_RAW, &t) != 0) { ++ if ((start.tv_sec == (time_t)-1 && start.tv_nsec == -1) || clock_gettime(CLOCK_MONOTONIC, &t) != 0) { + return -1; + } + CompilerMemBar(); diff --git a/devel/concurrentqueue/pkg-descr b/devel/concurrentqueue/pkg-descr index 5efc763305aa..dbe8f86025ea 100644 --- a/devel/concurrentqueue/pkg-descr +++ b/devel/concurrentqueue/pkg-descr @@ -1 +1,2 @@ -concurrentqueue is an industrial-strength lock-free queue for C++. +concurrentqueue is an industrial-strength lock-free fast multi-producer, +multi-consumer concurrent queue for C++11 queue for C++.