From patchwork Thu Jul 7 14:27:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 12909737 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 4DFBBC433EF for ; Thu, 7 Jul 2022 14:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235614AbiGGO1b (ORCPT ); Thu, 7 Jul 2022 10:27:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235337AbiGGO12 (ORCPT ); Thu, 7 Jul 2022 10:27:28 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 816C927CEC for ; Thu, 7 Jul 2022 07:27:27 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 395DF1FF24; Thu, 7 Jul 2022 14:27:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1657204046; 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=6tXFlFzM9U8hrSDmkeejy2tT1Q3pOMZPQijHnXVFuyo=; b=irDaeN36u9QVLDEmbAkffpjPOuvlkF88+3x00ErmTvWqYWcNxrQ+yu3S7zjmzTAFhGp5Ia IQE1wsZa+wLjsZKAK32Zo9EcI9HTgFQs166PE0H0P+S7JoLA+umMlg3Pgm1Nv5wIk8MzQx K76bssvOpydI5s1SnS1VTZNSPjIIVWw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1657204046; 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=6tXFlFzM9U8hrSDmkeejy2tT1Q3pOMZPQijHnXVFuyo=; b=3nct58+lg6ktuk1a5b68uuK45vZbrrGpytKWOM34aP6gYSGc6k/ftO6mfagq/61Tm4nEeA MYb9EvLnvGhxS8BA== 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 2AA1E13461; Thu, 7 Jul 2022 14:27:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 29deCk7txmJ8MAAAMHmgww (envelope-from ); Thu, 07 Jul 2022 14:27:26 +0000 From: Daniel Wagner To: linux-trace-devel@vger.kernel.org Cc: Daniel Wagner Subject: [RFC v2] libtraceevent: Add initial support for meson Date: Thu, 7 Jul 2022 16:27:23 +0200 Message-Id: <20220707142723.8721-1-dwagner@suse.de> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Add support for building the project with meson. It's not complete yet, for example building and installing the documentation is missing. The rest should work as expected. The only thing I was not really clear what the purpose is the libtraceevent-dynamic-list which seems not be used or installed. The meson build will also generate the file but using the host nm and not the cross tool chain if any is used. I didn't want to invest too much time figuring out this detail if it is actually not used. Obviously, meson is not make and there are some changes in how to use this build system. The meson documentation is outstanding good and usually has good tips and tricks to solve problems. But sure there is learning curve but hopefully not so step. Anyway, as pure user the build steps are (in source tree builds are not supported): # configure using .build as build directory and install destination # /tmp/test meson .build --prefix=/tmp/test # trigger the build ninja -C .build # install the library ninja -C .build install I am using an alias for 'ninja -C .build' which is called 'ni'. This makes way more convenient to use. Signed-off-by: Daniel Wagner --- v2: - changed include path exported in pkg-config exports the same paths as per Makefile v1: - initial version include/traceevent/meson.build | 12 ++++++++++ meson.build | 38 ++++++++++++++++++++++++++++++++ meson_options.txt | 2 ++ plugins/dynamic_list.sh | 14 ++++++++++++ plugins/meson.build | 40 ++++++++++++++++++++++++++++++++++ src/meson.build | 35 +++++++++++++++++++++++++++++ utest/meson.build | 14 ++++++++++++ 7 files changed, 155 insertions(+) create mode 100644 include/traceevent/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100755 plugins/dynamic_list.sh create mode 100644 plugins/meson.build create mode 100644 src/meson.build create mode 100644 utest/meson.build diff --git a/include/traceevent/meson.build b/include/traceevent/meson.build new file mode 100644 index 000000000000..8e114cccf627 --- /dev/null +++ b/include/traceevent/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1 + +headers = [ + 'event-parse.h', + 'event-utils.h', + 'kbuffer.h', + 'trace-seq.h', +] + +foreach h : headers + install_headers(h, subdir : 'traceevent') +endforeach diff --git a/meson.build b/meson.build new file mode 100644 index 000000000000..ef27a12fe76a --- /dev/null +++ b/meson.build @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: LGPL-2.1 + +project( + 'libtraceevent', ['c'], + meson_version: '>= 0.47.0', + license: 'LGPL-2.1', + version: '1.5.3', + default_options: [ + 'c_std=gnu99', + 'buildtype=release', + 'prefix=/usr', + 'warning_level=1', + ] +) + +library_version = meson.project_version() + +cunit_dep = dependency('cunit', required : false) + +prefixdir = get_option('prefix') +libdir = join_paths(prefixdir, get_option('libdir')) + +plugindir = get_option('plugindir') == '' ? join_paths(libdir, 'libtraceevent/plugins') : get_option('plugindir') + +add_project_arguments( + [ + '-D_GNU_SOURCE', + '-DPLUGIN_DIR="@0@"'.format(plugindir), + ], + language : 'c', +) + +incdir = include_directories(['include', 'include/traceevent']) + +subdir('src') +subdir('include/traceevent') +subdir('plugins') +subdir('utest') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 000000000000..ee52f11799dd --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: LGPL-2.1 +option('plugindir', type : 'string', description : 'set the plugin dir') diff --git a/plugins/dynamic_list.sh b/plugins/dynamic_list.sh new file mode 100755 index 000000000000..e1480eaa694f --- /dev/null +++ b/plugins/dynamic_list.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# SPDX-License-Identifier: LGPL-2.1 + +symbol_type=$(nm -u -D $@ | awk 'NF>1 {print $1}' | xargs echo "U w W" | + tr 'w ' 'W\n' | sort -u | xargs echo) + +if [ "$symbol_type" = "U W" ]; then + echo '{' + + nm -u -D $@ | awk 'NF>1 {sub("@.*", "", $2); print "\t"$2";"}' | + sort -u + + echo '};' +fi diff --git a/plugins/meson.build b/plugins/meson.build new file mode 100644 index 000000000000..659f864581d0 --- /dev/null +++ b/plugins/meson.build @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: LGPL-2.1 + +plugins = [ + 'plugin_jbd2.c', + 'plugin_hrtimer.c', + 'plugin_kmem.c', + 'plugin_kvm.c', + 'plugin_mac80211.c', + 'plugin_sched_switch.c', + 'plugin_function.c', + 'plugin_futex.c', + 'plugin_xen.c', + 'plugin_scsi.c', + 'plugin_cfg80211.c', + 'plugin_tlb.c', +] + +pdeps = [] +foreach plugin : plugins + pdeps += library( + plugin.replace('.c', ''), + plugin, + name_prefix: '', + version: library_version, + dependencies: [libtraceevent_dep], + include_directories: [incdir], + install: true, + install_dir: plugindir) +endforeach + +# not used? +dynamic_list_file = find_program('dynamic_list.sh') +custom_target( + 'dynamic_list', + depends: pdeps, + input: pdeps, + output: 'libtraceevent-dynamic-list', + command: [dynamic_list_file, '@INPUT@'], + capture: true, + build_by_default: true) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 000000000000..eca4f489d963 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: LGPL-2.1 + +sources= [ + 'event-parse-api.c', + 'event-parse.c', + 'event-plugin.c', + 'kbuffer-parse.c', + 'parse-filter.c', + 'parse-utils.c', + 'tep_strerror.c', + 'trace-seq.c', +] + +libtraceevent = library( + 'traceevent', + sources, + version: library_version, + include_directories: [incdir], + install: true, +) + +pkg = import('pkgconfig') +pkg.generate(libtraceevent, + subdirs: 'traceevent', + filebase: meson.project_name(), + name: meson.project_name(), + version: meson.project_version(), + description: 'Manage trace event', + url: 'https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/', +) + +libtraceevent_dep = declare_dependency( + include_directories: ['.'], + link_with: libtraceevent, +) diff --git a/utest/meson.build b/utest/meson.build new file mode 100644 index 000000000000..e6ad5b50e9be --- /dev/null +++ b/utest/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1 + +source = [ + 'trace-utest.c', + 'traceevent-utest.c', +] + +e = executable( + 'trace-utest', + source, + include_directories: [incdir], + dependencies: [libtraceevent_dep, cunit_dep]) + +test('trace-utest', e)