From 0356e3c21f16a946f9abf94dd51a886b3df15174 Mon Sep 17 00:00:00 2001 From: sbekele Date: Tue, 26 Nov 2024 20:02:15 +0000 Subject: [PATCH] ze make updated --- xprof/xprof.rb.in | 4 ++-- ze/Makefile.am | 6 +++++- ze/sampling_daemon.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in index 161ab2f3..b5d805f7 100755 --- a/xprof/xprof.rb.in +++ b/xprof/xprof.rb.in @@ -813,13 +813,13 @@ def trace_and_on_node_processing(usr_argv) lm_babeltrace(backends) if OPTIONS[:archive] end - syncd.local_barrier('waiting_for_lttng_setup') - if sampling? sampling_daemon = SamplingDaemon.new sampling_daemon&.start(Process.pid) end + syncd.local_barrier('waiting_for_lttng_setup') + # Launch User Command begin XprofExitCode.update(launch_usr_bin(h, usr_argv), usr_argv.join(' ')) diff --git a/ze/Makefile.am b/ze/Makefile.am index a38f6ad1..65da9ed1 100644 --- a/ze/Makefile.am +++ b/ze/Makefile.am @@ -185,7 +185,11 @@ libzetracepoints_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/inclu libzetracepoints_la_CFLAGS = -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare $(WERROR) $(LTTNG_UST_CFLAGS) libzetracepoints_la_LDFLAGS = $(LTTNG_UST_LIBS) -lib_LTLIBRARIES = libze_loader.la libZEInterval.la +zedir = $(pkglibdir)/ze +ze_LTLIBRARIES = libze_loader.la + +bt2dir = $(pkglibdir)/bt2 +bt2_LTLIBRARIES = libZEInterval.la nodist_libze_loader_la_SOURCES = \ $(ZE_PROBES_INCL) \ diff --git a/ze/sampling_daemon.c b/ze/sampling_daemon.c index 987edf4c..db87a0a2 100644 --- a/ze/sampling_daemon.c +++ b/ze/sampling_daemon.c @@ -742,10 +742,12 @@ int main(int argc, char **argv) { int parent_pid = 0; int verbose = 0; void *handle = NULL; + if (argc < 2) { _USAGE_MSG("", argv[0]); return 1; } + parent_pid = atoi(argv[1]); if (parent_pid <= 0) { _ERROR_MSG("Invalid or missing parent PID.");