From patchwork Mon Nov 22 19:13:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 34758 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 75ED027BBE3; Mon, 22 Nov 2021 19:15:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0B2C27BBE1 for ; Mon, 22 Nov 2021 19:15:10 +0000 (GMT) Received: from localhost ([::1]:38716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpEmU-0002rL-5J for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 14:15:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpEmM-0002r8-9I for guix-patches@gnu.org; Mon, 22 Nov 2021 14:15:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpEmL-00058v-Vb for guix-patches@gnu.org; Mon, 22 Nov 2021 14:15:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpEmL-0005nL-RH for guix-patches@gnu.org; Mon, 22 Nov 2021 14:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52043] [PATCH 1/2] gnu: Add instrumentation packages. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 19:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52043@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163760844422173 (code B ref -1); Mon, 22 Nov 2021 19:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Nov 2021 19:14:04 +0000 Received: from localhost ([127.0.0.1]:49141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpElH-0005l1-Mj for submit@debbugs.gnu.org; Mon, 22 Nov 2021 14:14:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:39610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpElC-0005ko-Vt for submit@debbugs.gnu.org; Mon, 22 Nov 2021 14:13:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpEl8-0002J7-Cu for guix-patches@gnu.org; Mon, 22 Nov 2021 14:13:48 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:57505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpEl3-0004uh-Bs for guix-patches@gnu.org; Mon, 22 Nov 2021 14:13:45 -0500 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 1AMJDN02012618 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 22 Nov 2021 14:13:33 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 1AMJDN02012618 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1637608413; bh=cnwldEVZvUVzV2wZjborPXxhW5vZc3rll/K2m2xN0d8=; h=From:To:Cc:Subject:Date:From; b=JsqY3I21sjJrhbbcrKU7vyUbuv3NjVXRVV6CewOJU1lwZFijWRcTUTMfmm+ZDoYfC 90JAxGKzAVdmPcvAuGug9g2l1Q04IAJniAATvxC0ggSPNsHUvszNvZNisYxm0vU135 4eZ/KtSVdwDw/eRQcJPIlKqLFCpEI+wwOrrunirI= Date: Mon, 22 Nov 2021 14:13:22 -0500 Message-Id: <60c77ab6e2f5f098b1ecdc9c50c602072dbc2f68.1637608343.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Mon, 22 Nov 2021 19:13:23 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Olivier Dion X-ACL-Warn: , Olivier Dion via Guix-patches X-Patchwork-Original-From: Olivier Dion via Guix-patches via From: Olivier Dion X-getmail-retrieved-from-mailbox: Patches * gnu/packages/instrumentation.scm: New file (dyninst): New variable. --- gnu/local.mk | 1 + gnu/packages/instrumentation.scm | 56 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 gnu/packages/instrumentation.scm diff --git a/gnu/local.mk b/gnu/local.mk index 2513530d0d..3f190c4f6a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -307,6 +307,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/inklingreader.scm \ %D%/packages/inkscape.scm \ %D%/packages/installers.scm \ + %D%/packages/instrumentation.scm \ %D%/packages/ipfs.scm \ %D%/packages/irc.scm \ %D%/packages/irods.scm \ diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm new file mode 100644 index 0000000000..cacd74ac0a --- /dev/null +++ b/gnu/packages/instrumentation.scm @@ -0,0 +1,56 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Olivier Dion +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages instrumentation) + #:use-module (gnu packages boost) + #:use-module (gnu packages elf) + #:use-module (gnu packages llvm) + #:use-module (gnu packages tbb) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public dyninst + (package + (name "dyninst") + ;; Newer versions are not promoted on main home page and require libiberty. + (version "10.2.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dyninst/dyninst/archive/v" + version ".tar.gz")) + (sha256 + (base32 "18bvmvm3l18lpw8fz9yrjkd6fwqvxg0j2xfhvkzx4xr5l73wcxw0")))) + + (build-system cmake-build-system) + (arguments + `(#:tests? #f + ;; STERILE_BUILD: Do not download/build third-party dependencies from + ;; source. + #:configure-flags + (list "-DSTERILE_BUILD=ON"))) + (inputs + `(("elfutils" ,elfutils) + ("boost" ,boost) + ("tbb" ,tbb) + ("libomp" ,libomp))) + (home-page "https://dyninst.org/") + (synopsis "Dynamic instrumentation") + (description "Tools for binary instrumentation, analysis, and modification.") + (license license:lgpl2.0))) From patchwork Mon Nov 22 19:16:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 34759 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 66D7927BBE3; Mon, 22 Nov 2021 19:17:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 888B127BBE1 for ; Mon, 22 Nov 2021 19:17:30 +0000 (GMT) Received: from localhost ([::1]:39382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpEoj-0003TG-Ol for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 14:17:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpEoI-0003Ss-W1 for guix-patches@gnu.org; Mon, 22 Nov 2021 14:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpEoI-0005YU-NC for guix-patches@gnu.org; Mon, 22 Nov 2021 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpEoI-0007US-HM for guix-patches@gnu.org; Mon, 22 Nov 2021 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52043] [PATCH 2/2] gnu: Move instrumentation tools to instrumentation module. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52043@debbugs.gnu.org Cc: Olivier Dion Received: via spool by 52043-submit@debbugs.gnu.org id=B52043.163760859027269 (code B ref 52043); Mon, 22 Nov 2021 19:17:02 +0000 Received: (at 52043) by debbugs.gnu.org; 22 Nov 2021 19:16:30 +0000 Received: from localhost ([127.0.0.1]:49147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpEni-00072Q-I6 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 14:16:30 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:44300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpEng-0006wY-Um for 52043@debbugs.gnu.org; Mon, 22 Nov 2021 14:16:25 -0500 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 1AMJG7Qx014523 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 22 Nov 2021 14:16:18 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 1AMJG7Qx014523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1637608578; bh=dhBrejJaH4/kjJBn5audxU6xYhX0xvAUhvGyalHGMBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=apSY2Nw7VWGnvbF6Y6qTR/7gDOfsIEwb3Pezmjlw4yiCL3UteDO/agDhVd/MSNWpT u2h6Wyi3kBbMA0Mq3zEK5WlE6hlJf6KnTuN68xR+v+fX1UCSKw3OQLMD3itn7Wn1wy vzlj29Mx6g8MYbYcArRyP6LoAYBfVGTWfffPvdqQ= Date: Mon, 22 Nov 2021 14:16:05 -0500 Message-Id: <36f687de44920f795476e5ae5af564afc30a425e.1637608343.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.34.0 In-Reply-To: <60c77ab6e2f5f098b1ecdc9c50c602072dbc2f68.1637608343.git.olivier.dion@polymtl.ca> References: <60c77ab6e2f5f098b1ecdc9c50c602072dbc2f68.1637608343.git.olivier.dion@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Mon, 22 Nov 2021 19:16:07 +0000 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Olivier Dion X-ACL-Warn: , Olivier Dion via Guix-patches X-Patchwork-Original-From: Olivier Dion via Guix-patches via From: Olivier Dion X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (lttng-ust, lttng-tools, babeltrace): Move to ... * gnu/packages/instrumentation.scm: ... here. --- gnu/packages/instrumentation.scm | 162 +++++++++++++++++++++++++++++++ gnu/packages/linux.scm | 147 ---------------------------- 2 files changed, 162 insertions(+), 147 deletions(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index cacd74ac0a..b876551673 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -17,15 +17,86 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages instrumentation) + #:use-module (gnu packages perl) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages datastructures) + #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages flex) + #:use-module (gnu packages glib) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages man) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) + #:use-module (gnu packages python) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages swig) #:use-module (gnu packages tbb) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) +(define-public babeltrace + (package + (name "babeltrace") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://www.efficios.com/files/babeltrace/babeltrace2-" + version ".tar.bz2")) + (sha256 + (base32 "1jlv925pr7hykc48mdvbmqm4ipy1r11xwzapa6fdpdfshmk12kvp")))) + + (build-system gnu-build-system) + + (arguments + `(;; FIXME - When Python's bindings are enabled, tests do not pass. + #:configure-flags '("--enable-debug-info" + "--enable-man-pages" + "--disable-python-bindings" + "--disable-python-plugins") + #:phases + (modify-phases %standard-phases + ;; These are recommended in the project's README for a development + ;; build configuration. + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "BABELTRACE_DEV_MODE" "1") + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")))))) + (inputs + `(("glib" ,glib))) + ;; NOTE - elfutils is used for the LTTng debug information filter + ;; component class. This can be moved to `native-inputs` if + ;; `--enable-debug-info` is replaced by `--disable-debug-info` in + ;; `#:configure-flags`. + (propagated-inputs + `(("elfutils" ,elfutils))) + ;; NOTE - python-3 is set here for generating the bindings. Users need to + ;; install python-3 in their profile in order to use these bindings. + (native-inputs + `(("asciidoc" ,asciidoc) + ("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ("python-3" ,python-3) + ("python-sphinx" ,python-sphinx) + ("swig", swig) + ("xmltoman" ,xmltoman))) + (home-page "https://babeltrace.org/") + (synopsis "Trace manipulation toolkit") + (description "Babeltrace 2 is a framework for viewing, converting, +transforming, and analyzing traces. It is also the reference parser +implementation of the Common Trace Format (CTF), produced by tools such as +LTTng and barectf. This package provides a library with a C API, Python 3 +bindings, and the command-line tool @command{babeltrace2}.") + (license license:expat))) + (define-public dyninst (package (name "dyninst") @@ -54,3 +125,94 @@ (define-public dyninst (synopsis "Dynamic instrumentation") (description "Tools for binary instrumentation, analysis, and modification.") (license license:lgpl2.0))) + +(define-public lttng-ust + (package + (name "lttng-ust") + (version "2.13.0") + (source (origin + (method url-fetch) + (uri (string-append "https://lttng.org/files/lttng-ust/" + "lttng-ust-" version ".tar.bz2")) + (sha256 + (base32 + "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l")))) + (build-system gnu-build-system) + (inputs + `(("liburcu" ,liburcu) + ("numactl" ,numactl))) + (native-inputs + `(("python" ,python-3) + ("pkg-config", pkg-config))) + (home-page "https://lttng.org/") + (synopsis "LTTng userspace tracer libraries") + (description "The user space tracing library, liblttng-ust, is the LTTng +user space tracer. It receives commands from a session daemon, for example to +enable and disable specific instrumentation points, and writes event records +to ring buffers shared with a consumer daemon.") + (license license:lgpl2.1+))) + +(define-public lttng-tools + (package + (name "lttng-tools") + (version "2.13.1") + (source (origin + (method url-fetch) + (uri (string-append "https://lttng.org/files/lttng-tools/" + "lttng-tools-" version ".tar.bz2")) + (sha256 + (base32 + "1df8ag2a1yyjn6hz6wxgcz0p847cq91b8inf0zyhgz1im1yxzrng")))) + (build-system gnu-build-system) + (arguments + `(;; FIXME - Currently there's a segmentation fault by swig when enabling + ;; Python's bindings. Thus, bindings are disable here. Replace + ;; `disable` by `enable` in #:configure-flags when this is fixed. + #:configure-flags '("--disable-python-bindings") + ;; FIXME - Tests are disabled for now because one test hangs + ;; indefinetely. Also, parallel testing is not possible because of how + ;; the lttng-daemon handles sessions. Thus, keep parallel testing + ;; disabled even after tests are enabled! + #:tests? #f + #:parallel-tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "HOME" "/tmp") + (setenv "LTTNG_HOME" "/tmp"))) + ;; We don't put (which "man") here because LTTng uses execlp. + (add-after 'unpack 'patch-default-man-path + (lambda _ + (substitute* "src/common/defaults.h" + (("/usr/bin/man") "man"))))))) + ;; NOTE - Users have to install python-3 in their profile to use the + ;; bindings. We don't put it in the inputs, because the rest of the tools + ;; can work without it. + (inputs + `(("liburcu" ,liburcu) + ("popt" ,popt) + ("numactl" ,numactl))) + (propagated-inputs + `(("kmod" ,kmod) + ("module-init-tools" ,module-init-tools))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("perl" ,perl) + ("libpfm4" ,libpfm4) + ("python-3" ,python-3) + ("swig" ,swig) + ("procps" ,procps) + ("which" ,which) + ("flex" ,flex) + ("bison" ,bison) + ("asciidoc" ,asciidoc) + ("libxml2" ,libxml2) + ("lttng-ust" ,lttng-ust))) + (home-page "https://lttng.org/") + (synopsis "LTTng userspace tracer libraries") + (description "The lttng-tools project provides a session +daemon @code{lttng-sessiond} that acts as a tracing registry, the @command{lttng} command +line for tracing control, a @code{lttng-ctl} library for tracing control and a +@code{lttng-relayd} for network streaming.") + (license (list license:gpl2 license:lgpl2.1)))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ece3c588e8..8456450e52 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -131,7 +131,6 @@ (define-module (gnu packages linux) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages slang) - #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) @@ -8110,152 +8109,6 @@ (define-public ell platforms, it is not limited to resource-constrained systems.") (license license:lgpl2.1+))) -(define-public lttng-ust - (package - (name "lttng-ust") - (version "2.13.0") - (source (origin - (method url-fetch) - (uri (string-append "https://lttng.org/files/lttng-ust/" - "lttng-ust-" version ".tar.bz2")) - (sha256 - (base32 - "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l")))) - (build-system gnu-build-system) - (inputs - `(("liburcu" ,liburcu) - ("numactl" ,numactl))) - (native-inputs - `(("python" ,python-3) - ("pkg-config", pkg-config))) - (home-page "https://lttng.org/") - (synopsis "LTTng userspace tracer libraries") - (description "The user space tracing library, liblttng-ust, is the LTTng -user space tracer. It receives commands from a session daemon, for example to -enable and disable specific instrumentation points, and writes event records -to ring buffers shared with a consumer daemon.") - (license license:lgpl2.1+))) - -(define-public lttng-tools - (package - (name "lttng-tools") - (version "2.13.1") - (source (origin - (method url-fetch) - (uri (string-append "https://lttng.org/files/lttng-tools/" - "lttng-tools-" version ".tar.bz2")) - (sha256 - (base32 - "1df8ag2a1yyjn6hz6wxgcz0p847cq91b8inf0zyhgz1im1yxzrng")))) - (build-system gnu-build-system) - (arguments - `(;; FIXME - Currently there's a segmentation fault by swig when enabling - ;; Python's bindings. Thus, bindings are disable here. Replace - ;; `disable` by `enable` in #:configure-flags when this is fixed. - #:configure-flags '("--disable-python-bindings") - ;; FIXME - Tests are disabled for now because one test hangs - ;; indefinetely. Also, parallel testing is not possible because of how - ;; the lttng-daemon handles sessions. Thus, keep parallel testing - ;; disabled even after tests are enabled! - #:tests? #f - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-environment-variables - (lambda _ - (setenv "HOME" "/tmp") - (setenv "LTTNG_HOME" "/tmp"))) - ;; We don't put (which "man") here because LTTng uses execlp. - (add-after 'unpack 'patch-default-man-path - (lambda _ - (substitute* "src/common/defaults.h" - (("/usr/bin/man") "man"))))))) - ;; NOTE - Users have to install python-3 in their profile to use the - ;; bindings. We don't put it in the inputs, because the rest of the tools - ;; can work without it. - (inputs - `(("liburcu" ,liburcu) - ("popt" ,popt) - ("numactl" ,numactl))) - (propagated-inputs - `(("kmod" ,kmod) - ("module-init-tools" ,module-init-tools))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("perl" ,perl) - ("libpfm4" ,libpfm4) - ("python-3" ,python-3) - ("swig" ,swig) - ("procps" ,procps) - ("which" ,which) - ("flex" ,flex) - ("bison" ,bison) - ("asciidoc" ,asciidoc) - ("libxml2" ,libxml2) - ("lttng-ust" ,lttng-ust))) - (home-page "https://lttng.org/") - (synopsis "LTTng userspace tracer libraries") - (description "The lttng-tools project provides a session -daemon @code{lttng-sessiond} that acts as a tracing registry, the @command{lttng} command -line for tracing control, a @code{lttng-ctl} library for tracing control and a -@code{lttng-relayd} for network streaming.") - (license (list license:gpl2 license:lgpl2.1)))) - -(define-public babeltrace - (package - (name "babeltrace") - (version "2.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://www.efficios.com/files/babeltrace/babeltrace2-" - version ".tar.bz2")) - (sha256 - (base32 "1jlv925pr7hykc48mdvbmqm4ipy1r11xwzapa6fdpdfshmk12kvp")))) - - (build-system gnu-build-system) - - (arguments - `(;; FIXME - When Python's bindings are enabled, tests do not pass. - #:configure-flags '("--enable-debug-info" - "--enable-man-pages" - "--disable-python-bindings" - "--disable-python-plugins") - #:phases - (modify-phases %standard-phases - ;; These are recommended in the project's README for a development - ;; build configuration. - (add-before 'configure 'set-environment-variables - (lambda _ - (setenv "BABELTRACE_DEV_MODE" "1") - (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")))))) - (inputs - `(("glib" ,glib))) - ;; NOTE - elfutils is used for the LTTng debug information filter - ;; component class. This can be moved to `native-inputs` if - ;; `--enable-debug-info` is replaced by `--disable-debug-info` in - ;; `#:configure-flags`. - (propagated-inputs - `(("elfutils" ,elfutils))) - ;; NOTE - python-3 is set here for generating the bindings. Users need to - ;; install python-3 in their profile in order to use these bindings. - (native-inputs - `(("asciidoc" ,asciidoc) - ("bison" ,bison) - ("flex" ,flex) - ("pkg-config" ,pkg-config) - ("python-3" ,python-3) - ("python-sphinx" ,python-sphinx) - ("swig", swig) - ("xmltoman" ,xmltoman))) - (home-page "https://babeltrace.org/") - (synopsis "Trace manipulation toolkit") - (description "Babeltrace 2 is a framework for viewing, converting, -transforming, and analyzing traces. It is also the reference parser -implementation of the Common Trace Format (CTF), produced by tools such as -LTTng and barectf. This package provides a library with a C API, Python 3 -bindings, and the command-line tool @command{babeltrace2}.") - (license license:expat))) - (define-public kexec-tools (package (name "kexec-tools")