From nobody Mon Mar 27 16:11:05 2023 X-Original-To: dev-commits-src-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 4Pld8n2fkkz41jvJ; Mon, 27 Mar 2023 16:11:05 +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 4Pld8n29LJz4HDH; Mon, 27 Mar 2023 16:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933465; 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=LSQQmjQJeRbSOtTeE8k77Iq65NWPZ4Rq7SitrHaQNM4=; b=nk7rifJCpuIyxARzc/whaUpRMQLWpwGBQLguvP1g07Sacsbb2/+N47ynx7zj4DQ0aOtmgZ mJWqpMRx4Czxj+Wmk0I76Upa3W/0grjlSX9oaopcVwx4Zd/DYe37Q8xyUgmAhwHAi9RDQb mSCe2f+YpW5U5IA2PZYlL2Kj1itGJQRR4tnGEnsA3TiLrtciou+sg8+sTgtknFRe/7SmSw mh2EGk0zaXVNgeS7Ex54CqoEuKV94QpjtG0DdveYlSfdT9gRsHxzfp0MqDMAXqhPWC/lHw BK1en4etyFxk130RRhBXaWXY0J4px+ed1zQVUeDZ1qkKgNqvjiQZqXA4qg28Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679933465; 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=LSQQmjQJeRbSOtTeE8k77Iq65NWPZ4Rq7SitrHaQNM4=; b=XEwgOemMADzNcA3x2iM4ZmssN1YSXcEozijRGhrXR1kj5aHhf+b5I+A1e+dAHKuEAw+YWT IbThL0gZfniTbGNwyolJajuivxLGcTkOov3lQ8W7xbp7EkuDiZ7qJAamGw7e8TevSWo4UL PwVb3+TBzQQDuRcQR60AsdD/2l1G48QxwDJ1+W/04iwiHYCI59/8QP+1xoSaBc7sumYzy8 UvPNPxTy3M8wC6jRvUeYkVfC4NgqOKPQ43hj7t2rRiZlTyOnNZ3YWespZc4Xbrt0SgXRkp Dii2dX2jKSyD6SXY4Is1f8/CZTxkrYHdPhGoID2CqN6CPirImv141TKEXeXHVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679933465; a=rsa-sha256; cv=none; b=IA2KFckzy9nUrc4aCY5ULI2xy8Ws98mS9WnF8u0DDBab3uQq+Xjbd405zS4tJk9jqzo7aS V/4KKHOac9XV2F709hUQVor+G8i1+kzypGAECNKTbdWBMfxs7ZHWWqGFukbMJ+Uhm33Qfi GB+CsvCLAhRSHbUSvtZtpYkHxOUPnxtwbpD4bX604gkIVDS/G86GO69D8C6bQhknzcqMrE kjiZCEnXgS6V73tUKxZdzfDcMjgcnUW7tLDWo3rg54tVM3MSC+VBhp1ROc8c5j9Xb9dOhV I6Jl79xtp9XqKXOQyY2oQdp+rUTblSQP4+YSB4u/pK0f7EqtS4ABuBE17ZRBBQ== 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 4Pld8n1DtLzTDm; Mon, 27 Mar 2023 16:11:05 +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 32RGB5dY031545; Mon, 27 Mar 2023 16:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RGB5F3031544; Mon, 27 Mar 2023 16:11:05 GMT (envelope-from git) Date: Mon, 27 Mar 2023 16:11:05 GMT Message-Id: <202303271611.32RGB5F3031544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 27c8d4851c15 - main - Include Embedded Trace Extensions (ETE) source code to the OpenCSD build. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c8d4851c15810fe4dc71dc12d343587f6ecdf2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=27c8d4851c15810fe4dc71dc12d343587f6ecdf2 commit 27c8d4851c15810fe4dc71dc12d343587f6ecdf2 Author: Ruslan Bukin AuthorDate: 2023-03-27 16:07:46 +0000 Commit: Ruslan Bukin CommitDate: 2023-03-27 16:10:26 +0000 Include Embedded Trace Extensions (ETE) source code to the OpenCSD build. Sponsored by: UKRI --- etc/mtree/BSD.include.dist | 2 ++ lib/libopencsd/Makefile | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ac9edf6a8bcb..0ab456bcc224 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -302,6 +302,8 @@ opencsd c_api .. + ete + .. etmv3 .. etmv4 diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index f28b14977cfa..8919bbe5bfa1 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -7,7 +7,8 @@ SHLIBDIR?= /lib OPENCSDSRC= ${SRCTOP}/contrib/opencsd -.PATH: ${OPENCSDSRC}/decoder/source/etmv4/ \ +.PATH: ${OPENCSDSRC}/decoder/source/ete/ \ + ${OPENCSDSRC}/decoder/source/etmv4/ \ ${OPENCSDSRC}/decoder/source/etmv3/ \ ${OPENCSDSRC}/decoder/source/pkt_printers/ \ ${OPENCSDSRC}/decoder/source/mem_acc/ \ @@ -16,6 +17,7 @@ OPENCSDSRC= ${SRCTOP}/contrib/opencsd ${OPENCSDSRC}/decoder/source/ptm/ \ ${OPENCSDSRC}/decoder/source/stm/ \ ${OPENCSDSRC}/decoder/source/ \ + ${OPENCSDSRC}/decoder/include/opencsd/ete/ \ ${OPENCSDSRC}/decoder/include/opencsd/etmv4/ \ ${OPENCSDSRC}/decoder/include/opencsd/etmv3/ \ ${OPENCSDSRC}/decoder/include/opencsd/stm/ \ @@ -27,8 +29,12 @@ OPENCSDSRC= ${SRCTOP}/contrib/opencsd LIB= opencsd SHLIB_MAJOR=0 -# ETMv3 +# Embedded Trace Extensions (ETE) SRCS= \ + trc_cmp_cfg_ete.cpp + +# ETMv3 +SRCS+= \ trc_cmp_cfg_etmv3.cpp \ trc_pkt_decode_etmv3.cpp \ trc_pkt_elem_etmv3.cpp \ @@ -119,6 +125,14 @@ APIINCS= \ APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +ETEINCS= \ + ete_decoder.h \ + trc_cmp_cfg_ete.h \ + trc_dcd_mngr_ete.h \ + trc_pkt_types_ete.h + +ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/ + ETMV4INCS= \ etmv4_decoder.h \ trc_cmp_cfg_etmv4.h \ @@ -165,7 +179,7 @@ STMINCS= \ STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ -INCSGROUPS=INCS APIINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS +INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS LIBADD= cxxrt