From patchwork Wed Dec 28 08:29:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13082750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48372C4332F for ; Wed, 28 Dec 2022 08:29:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232464AbiL1I3v (ORCPT ); Wed, 28 Dec 2022 03:29:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232494AbiL1I3c (ORCPT ); Wed, 28 Dec 2022 03:29:32 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95341F031 for ; Wed, 28 Dec 2022 00:29:30 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 452D921A38; Wed, 28 Dec 2022 08:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1672216169; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=n6gI8W8lixWDY7qY6Hjzh1QpXAHCiSSwL0GRElUoZ40=; b=wCRRWqLvPiQmlkLpRc7jIbWhXnw/bl2QTTpLNXqQZnOhXqQBL27a+a7EU6+FSFcGdWRqCX DB3EeyQfGJIOYTzNvQwnZGraaM+1kXH+RUS02kBqSl6nUMbqDSUaIkZHjg4YDOO44Z2OTw ApF/9+XqwwYN7QZD4G3MoB+8prg95pg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1672216169; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=n6gI8W8lixWDY7qY6Hjzh1QpXAHCiSSwL0GRElUoZ40=; b=bZRfNc1jmGhZ7B3nbaqZW4lbWBcueRvVgJ4PImZjB8Wk4Z24HgUa6oXRnbnhDevpsb+rb6 I85GpPRDgGizAxCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 34653134F5; Wed, 28 Dec 2022 08:29:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cTCKDGn+q2PcQAAAMHmgww (envelope-from ); Wed, 28 Dec 2022 08:29:29 +0000 From: Daniel Wagner To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , Daniel Wagner Subject: [PATCH v5] libtracefs: Add initial support for meson Date: Wed, 28 Dec 2022 09:29:27 +0100 Message-Id: <20221228082927.3499-1-dwagner@suse.de> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Introduce Meson as build framework for building libtracefs. This lives besides the Makefiles until all the expected initial fallouts have been dealed with. The build steps are: # configure using .build as build directory and install destination # /tmp/test meson --prefix=/tmp/libtracefs .build # trigger the build ninja -C .build # install the library ninja -C .build install In case you want to build/install the documentation the setup is meson -Ddocs-build=true .build Signed-off-by: Daniel Wagner --- I had to fallback to use a workaround to install the man pages to the correct directory. Meson insistet to install them into subdirs and failed to install them when I forced Meson not to do this. I am sure I am doing something wrong but couldn't figure out what. I think it's okay to use the workaround until we figured how to do this 'correct'. Tested this by packaging it up for OpenSUSE and the it looks reasonable: https://build.opensuse.org/project/show/home:wagi:branches:devel:tools v5: - build unit test only if CUnit is found - default build target is debug - do not install man pages into subdirs - install sqlhist (because we install the man page too, so why not the tool?) v4: - add subdir include path to cflags in pkgconfg file - refactoring build instruction for section 1 and section 3 documentation into one loop (reduce code duplication) v3: - build documetation - build samples - set default location to /usr/local v2: - updated commit message - dropped the include path patch, the pkg-config from libtraceevent is including them v1: - initial version Documentation/install-man.sh.in | 15 +++ Documentation/meson.build | 177 ++++++++++++++++++++++++++++++++ include/meson.build | 9 ++ meson.build | 50 +++++++++ meson_options.txt | 18 ++++ samples/extract-example.sh | 3 + samples/meson.build | 46 +++++++++ src/meson.build | 65 ++++++++++++ utest/meson.build | 17 +++ 9 files changed, 400 insertions(+) create mode 100755 Documentation/install-man.sh.in create mode 100644 Documentation/meson.build create mode 100644 include/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 samples/extract-example.sh create mode 100644 samples/meson.build create mode 100644 src/meson.build create mode 100644 utest/meson.build diff --git a/Documentation/install-man.sh.in b/Documentation/install-man.sh.in new file mode 100755 index 000000000000..8ab2cb982e1d --- /dev/null +++ b/Documentation/install-man.sh.in @@ -0,0 +1,15 @@ +#!/bin/bash + +for man in $(find @SRCDIR@ -name '*\.1' -type f); do + [ ! -d ${DESTDIR}/@MANDIR@/man1/ ] && install -d ${DESTDIR}/@MANDIR@/man1/ + + echo Installing $man to ${DESTDIR}/@MANDIR@/man1/ + install -m 0644 $man ${DESTDIR}/@MANDIR@/man1/ +done + +for man in $(find @SRCDIR@ -name '*\.3' -type f); do + [ ! -d ${DESTDIR}/@MANDIR@/man3/ ] && install -d ${DESTDIR}/@MANDIR@/man3/ + + echo Installing $man to ${DESTDIR}/@MANDIR@/man3/ + install -m 0644 $man ${DESTDIR}/@MANDIR@/man3/ +done diff --git a/Documentation/meson.build b/Documentation/meson.build new file mode 100644 index 000000000000..07ac222201b8 --- /dev/null +++ b/Documentation/meson.build @@ -0,0 +1,177 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +# input text file: man page section +sources = { + 'libtracefs-sqlhist.txt.1': '1', + 'libtracefs-cpu-open.txt': '3', + 'libtracefs-cpu.txt': '3', + 'libtracefs-dynevents.txt': '3', + 'libtracefs-eprobes.txt': '3', + 'libtracefs-error.txt': '3', + 'libtracefs-events-file.txt': '3', + 'libtracefs-events-tep.txt': '3', + 'libtracefs-events.txt': '3', + 'libtracefs-files.txt': '3', + 'libtracefs-filter.txt': '3', + 'libtracefs-function-filter.txt': '3', + 'libtracefs-hist-cont.txt': '3', + 'libtracefs-hist-mod.txt': '3', + 'libtracefs-hist.txt': '3', + 'libtracefs-instances-affinity.txt': '3', + 'libtracefs-instances-file-manip.txt': '3', + 'libtracefs-instances-files.txt': '3', + 'libtracefs-instances-manage.txt': '3', + 'libtracefs-instances-utils.txt': '3', + 'libtracefs-iterator.txt': '3', + 'libtracefs-kprobes.txt': '3', + 'libtracefs-log.txt': '3', + 'libtracefs-marker_raw.txt': '3', + 'libtracefs-marker.txt': '3', + 'libtracefs-option-get.txt': '3', + 'libtracefs-option-misc.txt': '3', + 'libtracefs-options.txt': '3', + 'libtracefs-sql.txt': '3', + 'libtracefs-stream.txt': '3', + 'libtracefs-synth2.txt': '3', + 'libtracefs-synth-info.txt': '3', + 'libtracefs-synth.txt': '3', + 'libtracefs-traceon.txt': '3', + 'libtracefs-tracer.txt': '3', + 'libtracefs.txt': '3', + 'libtracefs-uprobes.txt': '3', + 'libtracefs-utils.txt': '3', +} + +# +# For asciidoc ... +# -7.1.2, no extra settings are needed. +# 8.0-, set ASCIIDOC8. +# + +# +# For docbook-xsl ... +# -1.68.1, set ASCIIDOC_NO_ROFF? (based on changelog from 1.73.0) +# 1.69.0, no extra settings are needed? +# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP? +# 1.71.1, no extra settings are needed? +# 1.72.0, set DOCBOOK_XSL_172. +# 1.73.0-, set ASCIIDOC_NO_ROFF +# + +# +# If you had been using DOCBOOK_XSL_172 in an attempt to get rid +# of 'the ".ft C" problem' in your generated manpages, and you +# instead ended up with weird characters around callouts, try +# using ASCIIDOC_NO_ROFF instead (it works fine with ASCIIDOC8). +# + +if get_option('asciidoctor') + asciidoc = find_program('asciidoctor') + asciidoc_extra = ['-a', 'compat-mode'] + asciidoc_extra += ['-I.'] + asciidoc_extra += ['-r', 'asciidoctor-extensions'] + asciidoc_extra += ['-a', 'mansource=libtraceevent'] + asciidoc_extra += ['-a', 'manmanual="libtraceevent Manual"'] + asciidoc_html = 'xhtml5' +else + asciidoc = find_program('asciidoc') + asciidoc_extra = ['--unsafe'] + asciidoc_extra += ['-f', meson.current_source_dir() + '/asciidoc.conf'] + asciidoc_html = 'xhtml11' + + r = run_command(asciidoc, '--version', check: true) + v = r.stdout().strip() + if v.version_compare('>=8.0') + asciidoc_extra += ['-a', 'asciidoc7compatible'] + endif +endif + +manpage_xsl = meson.current_source_dir() + '/manpage-normal.xsl' + +if get_option('docbook-xls-172') + asciidoc_extra += ['-a', 'libtraceevent-asciidoc-no-roff'] + manpage_xsl = meson.current_source_dir() + '/manpage-1.72.xsl' +elif get_option('asciidoc-no-roff') + # docbook-xsl after 1.72 needs the regular XSL, but will not + # pass-thru raw roff codes from asciidoc.conf, so turn them off. + asciidoc_extra += ['-a', 'libtraceevent-asciidoc-no-roff'] +endif + +xmlto = find_program('xmlto') +xmlto_extra = [] + +if get_option('man-bold-literal') + xmlto_extra += ['-m ', meson.current_source_dir() + '/manpage-bold-literal.xsl'] +endif + +if get_option('docbook-suppress-sp') + xmlto_extra += ['-m ', meson.current_source_dir() + '/manpage-suppress-sp.xsl'] +endif + +gen = generator(asciidoc, + output: '@BASENAME@.xml', + arguments: [ + '-b', 'docbook', + '-d', 'manpage', + '-a', 'libtraceevent_version=' + meson.project_version(), + '-o', '@OUTPUT@'] + + asciidoc_extra + + ['@INPUT@']) + +foreach txt, section : sources + # build man page(s) + xml = gen.process(txt) + man = custom_target(txt.underscorify() + '_man', + input: xml, + output: '@BASENAME@.' + section, + command: [xmlto, + '-m', manpage_xsl, + 'man', + '-o', '@OUTPUT@'] + + xmlto_extra + + ['@INPUT@'], + build_by_default : true) + + # build html pages + custom_target( + txt.underscorify() + '_html', + input: txt, + output: '@BASENAME@.html', + command: [asciidoc, + '-b', asciidoc_html, + '-d', 'manpage', + '-a', 'libtraceevent_version=' + meson.project_version(), + '-o', '@OUTPUT@'] + + asciidoc_extra + + ['@INPUT@'], + install: true, + install_dir: htmldir) +endforeach + +# Install path workaround because: +# +# - xmlto might generate more than one file and we would to tell meson +# about those output files. We could figure out which files are generated +# (see sed match in check-manpages.sh). +# +# - The man page generation puts all the generated files under sub dirs +# and it's not obvious how to tell Meson it should not do this without +# causing the install step to fail (confusion where the generated files +# are stored) +# +# Thus just use a plain old shell script to move the generated files to the +# right location. + +conf = configuration_data() +conf.set('SRCDIR', meson.current_build_dir()) +conf.set('MANDIR', mandir) +configure_file( + input: 'install-man.sh.in', + output: 'install-man.sh', + configuration: conf, +) + +meson.add_install_script( + join_paths(meson.current_build_dir(), 'install-man.sh')) diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 000000000000..1bbfe8afb280 --- /dev/null +++ b/include/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1 + +headers = [ + 'tracefs.h', +] + +foreach h : headers + install_headers(h, subdir : 'libtracefs') +endforeach diff --git a/meson.build b/meson.build new file mode 100644 index 000000000000..1ef7969d655a --- /dev/null +++ b/meson.build @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +project( + 'libtracefs', ['c'], + meson_version: '>= 0.50.0', + license: 'LGPL-2.1', + version: '1.6.3', + default_options: [ + 'c_std=gnu99', + 'buildtype=debug', + 'prefix=/usr/local', + 'warning_level=1', + ] +) + +library_version = meson.project_version() + +libtraceevent_dep = dependency('libtraceevent', version: '>= 1.7.0', required: true) +cunit_dep = dependency('cunit', required : false) + +prefixdir = get_option('prefix') +bindir = join_paths(prefixdir, get_option('bindir')) +mandir = join_paths(prefixdir, get_option('mandir')) +htmldir = join_paths(prefixdir, get_option('htmldir')) + +add_project_arguments( + [ + '-D_GNU_SOURCE', + ], + language : 'c', +) + +incdir = include_directories(['include']) + +subdir('src') +subdir('include') +if cunit_dep.found() + subdir('utest') +endif +subdir('samples') +if get_option('docs-build') + custom_target('check-doc', + output: 'dummy', + command : ['check-manpages.sh', + meson.current_source_dir() + '/Documentation'], + build_by_default : true) + subdir('Documentation') +endif diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 000000000000..9bcd66f49f06 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +option('docs-build', type : 'boolean', value : false, + description : 'build documentation') +option('htmldir', type : 'string', value : '', + description : 'directory for HTML documentation') +option('asciidoctor', type : 'boolean', value: false, + description : 'use asciidoctor instead of asciidoc') +option('docbook-xls-172', type : 'boolean', value : false, + description : 'enable docbook XLS 172 workaround') +option('asciidoc-no-roff', type : 'boolean', value : false, + description : 'enable no roff workaround') +option('man-bold-literal', type : 'boolean', value : false, + description : 'enable bold literals') +option('docbook-suppress-sp', type : 'boolean', value : false, + description : 'docbook suppress sp') diff --git a/samples/extract-example.sh b/samples/extract-example.sh new file mode 100644 index 000000000000..c5c0f702e7f0 --- /dev/null +++ b/samples/extract-example.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +cat $1 | sed -ne '/^EXAMPLE/,/FILES/ { /EXAMPLE/,+2d ; /^FILES/d ; /^--/d ; p}' > $2 diff --git a/samples/meson.build b/samples/meson.build new file mode 100644 index 000000000000..0c36231ef29a --- /dev/null +++ b/samples/meson.build @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +examples = [ + 'dynevents', + 'kprobes', + 'eprobes', + 'uprobes', + 'synth', + 'error', + 'filter', + 'function-filter', + 'hist', + 'hist-cont', + 'tracer', + 'stream', + 'instances-affinity', + 'cpu', +] + +extract_examples = find_program('extract-example.sh') +gen = generator(extract_examples, + output: '@BASENAME@.c', + arguments: ['@INPUT@', '@OUTPUT@']) + +foreach ex : examples + src = gen.process(meson.current_source_dir() + '/../Documentation/libtracefs-@0@.txt'.format(ex)) + executable( + ex.underscorify(), + src, + dependencies: [libtracefs_dep, libtraceevent_dep], + include_directories: [incdir] + ) +endforeach + +# sqlhist is unique and stands on its own +src = gen.process(meson.current_source_dir() + '/../Documentation/libtracefs-sql.txt') +executable( + 'sqlhist', + src, + dependencies: [libtracefs_dep, libtraceevent_dep], + include_directories: [incdir], + install: true, + install_dir: bindir, +) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 000000000000..43139b6de268 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +sources= [ + 'tracefs-dynevents.c', + 'tracefs-eprobes.c', + 'tracefs-events.c', + 'tracefs-filter.c', + 'tracefs-hist.c', + 'tracefs-instance.c', + 'tracefs-kprobes.c', + 'tracefs-marker.c', + 'tracefs-record.c', + 'tracefs-sqlhist.c', + 'tracefs-tools.c', + 'tracefs-uprobes.c', + 'tracefs-utils.c', +] + +flex = find_program('flex', required: true) +bison = find_program('bison', required: true) + +lgen = generator(flex, +output : '@PLAINNAME@.yy.c', +arguments : ['-o', '@OUTPUT@', '@INPUT@']) + +pgen = generator(bison, +output : ['@BASENAME@.tab.c', '@BASENAME@.tab.h'], +arguments : ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']) + +lfiles = lgen.process('sqlhist.l') +pfiles = pgen.process('sqlhist.y') + +libtracefs = library( + 'tracefs', + sources, lfiles, pfiles, + version: library_version, + dependencies: [libtraceevent_dep], + include_directories: [incdir], + install: true, +) + +libtracefs_static = static_library( + 'tracefs_static', + sources, lfiles, pfiles, + dependencies: [libtraceevent_dep], + include_directories: [incdir], + install: false, +) + +pkg = import('pkgconfig') +pkg.generate(libtracefs, + subdirs: 'libtracefs', + filebase: meson.project_name(), + name: meson.project_name(), + version: meson.project_version(), + description: 'Manage trace fs', + url: 'https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/', +) + +libtracefs_dep = declare_dependency( + include_directories: ['.'], + link_with: libtracefs, +) diff --git a/utest/meson.build b/utest/meson.build new file mode 100644 index 000000000000..8c8caf37803d --- /dev/null +++ b/utest/meson.build @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1 +# +# Copyright (c) 2022 Daniel Wagner, SUSE LLC + +source = [ + 'trace-utest.c', + 'tracefs-utest.c', +] + +e = executable( + 'trace-utest', + source, + include_directories: [incdir], + dependencies: [libtraceevent_dep, cunit_dep], + link_with: libtracefs_static) + +test('trace-utest', e)