From dc3b014c2706cfc7d5ed64e19e197303520acf4d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 26 Oct 2017 11:13:38 -0400 Subject: [PATCH] Add preload_provider app Shared object provider can be built and used independently of the app under test. Signed-off-by: Jonathan Rajotte --- lttng_ivc/apps/preload_provider/Makefile | 46 ++++++ lttng_ivc/apps/preload_provider/app.c | 190 +++++++++++++++++++++++ lttng_ivc/apps/preload_provider/tp.c | 16 ++ lttng_ivc/apps/preload_provider/tp.h | 74 +++++++++ lttng_ivc/settings.py | 1 + 5 files changed, 327 insertions(+) create mode 100644 lttng_ivc/apps/preload_provider/Makefile create mode 100644 lttng_ivc/apps/preload_provider/app.c create mode 100644 lttng_ivc/apps/preload_provider/tp.c create mode 100644 lttng_ivc/apps/preload_provider/tp.h diff --git a/lttng_ivc/apps/preload_provider/Makefile b/lttng_ivc/apps/preload_provider/Makefile new file mode 100644 index 0000000..d92063c --- /dev/null +++ b/lttng_ivc/apps/preload_provider/Makefile @@ -0,0 +1,46 @@ +# Copyright (C) 2017 Jonathan Rajotte +# +# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED +# OR IMPLIED. ANY USE IS AT YOUR OWN RISK. +# +# Permission is hereby granted to use or copy this program for any +# purpose, provided the above notices are retained on all copies. +# Permission to modify the code and to distribute modified code is +# granted, provided the above notices are retained, and a notice that +# the code was modified is included with the above copyright notice. + +PROVIDER_LIBS = -llttng-ust -ldl +APP_LIBS = -ldl +LOCAL_CPPFLAGS += -I. + +.PHONY: app provider app-enum provider-enum + +provider: libtp.so +provider-enum: libtp-enum.so + + +app: app.o + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(APP_LIBS) + +app.o: app.c + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -c -o $@ $< + +libtp.so: tp.o + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) --shared -o $@ $< $(PROVIDER_LIBS) $(LDFLAGS) + +tp.o: tp.c + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $< + +app-enum: app-enum.o + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(APP_LIBS) + +app-enum.o: app.c + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -DIVC_ENUM -c -o $@ $< + +libtp-enum.so: tp-enum.o + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) --shared -o $@ $< $(PROVIDER_LIBS) $(LDFLAGS) + +tp-enum.o: tp.c + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -DIVC_ENUM -fpic -c -o $@ $< + + diff --git a/lttng_ivc/apps/preload_provider/app.c b/lttng_ivc/apps/preload_provider/app.c new file mode 100644 index 0000000..7da44d8 --- /dev/null +++ b/lttng_ivc/apps/preload_provider/app.c @@ -0,0 +1,190 @@ +/* + * Copyright (C) - 2012 David Goulet + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; version 2.1 of the License. + * + * This library 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 Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TRACEPOINT_DEFINE +#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE +#include "tp.h" + +#define NSEC_PER_USEC 1000 +#define NSEC_PER_SEC 1000000000 + +static inline +int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2) +{ + struct timespec delta; + + assert(t1 && t2); + delta.tv_sec = t2->tv_sec - t1->tv_sec; + delta.tv_nsec = t2->tv_nsec - t1->tv_nsec; + return ((int64_t) NSEC_PER_SEC * (int64_t) delta.tv_sec) + + (int64_t) delta.tv_nsec; +} + +static inline +int usleep_safe(useconds_t usec) +{ + int ret = 0; + struct timespec t1, t2; + int64_t time_remaining_ns = (int64_t) usec * (int64_t) NSEC_PER_USEC; + + ret = clock_gettime(CLOCK_MONOTONIC, &t1); + if (ret) { + ret = -1; + perror("clock_gettime"); + goto end; + } + + while (time_remaining_ns > 0) { + ret = usleep(time_remaining_ns / (int64_t) NSEC_PER_USEC); + if (ret && errno != EINTR) { + perror("usleep"); + goto end; + } + + ret = clock_gettime(CLOCK_MONOTONIC, &t2); + if (ret) { + perror("clock_gettime"); + goto end; + } + + time_remaining_ns -= elapsed_time_ns(&t1, &t2); + } +end: + return ret; +} + +void create_file(const char *path) +{ + static bool file_created = false; + int ret; + + if (!path || file_created) { + return; + } + + ret = creat(path, S_IRWXU); + if (ret < 0) { + fprintf(stderr, "Failed to create file %s\n", path); + return; + } + + (void) close(ret); + file_created = true; +} + +static +void wait_on_file(const char *path) +{ + if (!path) { + return; + } + for (;;) { + int ret; + struct stat buf; + + ret = stat(path, &buf); + if (ret == -1 && errno == ENOENT) { + (void) poll(NULL, 0, 10); /* 10 ms delay */ + continue; /* retry */ + } + if (ret) { + perror("stat"); + exit(EXIT_FAILURE); + } + break; /* found */ + } +} + +int main(int argc, char **argv) +{ + unsigned int i, netint; + long values[] = { 1, 2, 3 }; + char text[10] = "test"; + double dbl = 2.0; + float flt = 2222.0; + int nr_iter = 100, ret = 0; + useconds_t nr_usec = 0; + char *after_first_event_file_path = NULL; + char *before_last_event_file_path = NULL; + + if (argc >= 2) { + /* + * If nr_iter is negative, do an infinite tracing loop. + */ + nr_iter = atoi(argv[1]); + } + + if (argc >= 3) { + /* By default, don't wait unless user specifies. */ + nr_usec = atoi(argv[2]); + } + + if (argc >= 4) { + after_first_event_file_path = argv[3]; + } + + if (argc >= 5) { + before_last_event_file_path = argv[4]; + } + + for (i = 0; nr_iter < 0 || i < nr_iter; i++) { + if (nr_iter >= 0 && i == nr_iter - 1) { + /* + * Wait on synchronization before writing last + * event. + */ + wait_on_file(before_last_event_file_path); + } + netint = htonl(i); + tracepoint(tp, tptest, i, netint, values, text, + strlen(text), dbl, flt); + tracepoint(tp, tpenum, 1); + + /* + * First loop we create the file if asked to indicate + * that at least one tracepoint has been hit. + */ + create_file(after_first_event_file_path); + if (nr_usec) { + if (usleep_safe(nr_usec)) { + ret = -1; + goto end; + } + } + } + +end: + exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE); +} diff --git a/lttng_ivc/apps/preload_provider/tp.c b/lttng_ivc/apps/preload_provider/tp.c new file mode 100644 index 0000000..7f4fcd2 --- /dev/null +++ b/lttng_ivc/apps/preload_provider/tp.c @@ -0,0 +1,16 @@ +/* + * Copyright (c) - 2012 David Goulet + * + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR + * IMPLIED. ANY USE IS AT YOUR OWN RISK. + * + * Permission is hereby granted to use or copy this program for any purpose, + * provided the above notices are retained on all copies. Permission to modify + * the code and to distribute modified code is granted, provided the above + * notices are retained, and a notice that the code was modified is included + * with the above copyright notice. + */ + +#define TRACEPOINT_CREATE_PROBES + +#include "tp.h" diff --git a/lttng_ivc/apps/preload_provider/tp.h b/lttng_ivc/apps/preload_provider/tp.h new file mode 100644 index 0000000..c9bba0a --- /dev/null +++ b/lttng_ivc/apps/preload_provider/tp.h @@ -0,0 +1,74 @@ +#undef TRACEPOINT_PROVIDER +#define TRACEPOINT_PROVIDER tp + +#undef TRACEPOINT_INCLUDE +#define TRACEPOINT_INCLUDE "./tp.h" + +#if !defined(_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) +#define _TP_H + +/* + * Copyright (C) 2011 Mathieu Desnoyers + * + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + * + * Permission is hereby granted to use or copy this program + * for any purpose, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. + */ + +#include + +#ifdef IVC_ENUM +TRACEPOINT_ENUM( + tp, + tp_enum, + TP_ENUM_VALUES( + ctf_enum_value("ZERO", 0) + ctf_enum_value("ONE", 1) + ) +) + +TRACEPOINT_EVENT(tp, tpenum, + TP_ARGS(int, intarg), + TP_FIELDS( + ctf_enum(tp, tp_enum, int, enum_field, intarg) + ) +) +#else +TRACEPOINT_EVENT(tp, tpenum, + TP_ARGS(int, intarg), + TP_FIELDS( + ctf_integer(int, intfield, intarg) + ) +) +#endif + +TRACEPOINT_EVENT(tp, tptest, + TP_ARGS(int, anint, int, netint, long *, values, + char *, text, size_t, textlen, + double, doublearg, float, floatarg), + TP_FIELDS( + ctf_integer(int, intfield, anint) + ctf_integer_hex(int, intfield2, anint) + ctf_integer(long, longfield, anint) + ctf_integer_network(int, netintfield, netint) + ctf_integer_network_hex(int, netintfieldhex, netint) + ctf_array(long, arrfield1, values, 3) + ctf_array_text(char, arrfield2, text, 10) + ctf_sequence(char, seqfield1, text, size_t, textlen) + ctf_sequence_text(char, seqfield2, text, size_t, textlen) + ctf_string(stringfield, text) + ctf_float(float, floatfield, floatarg) + ctf_float(double, doublefield, doublearg) + ) +) + + +#endif /* _TRACEPOINT_TP_H */ + +/* This part must be outside ifdef protection */ +#include diff --git a/lttng_ivc/settings.py b/lttng_ivc/settings.py index a2a1b2f..adfa6b5 100644 --- a/lttng_ivc/settings.py +++ b/lttng_ivc/settings.py @@ -11,6 +11,7 @@ git_remote_folder = os.path.dirname(os.path.abspath(__file__)) + "/runtime/git_r app_folder = os.path.dirname(os.path.abspath(__file__)) + "/runtime/git_remote" apps_folder = os.path.dirname(os.path.abspath(__file__)) + "/apps" apps_gen_events_folder = os.path.join(apps_folder, "gen_ust_events") +apps_preload_provider_folder = os.path.join(apps_folder, "preload_provider") tmp_object_prefix = "lttng-ivc-" -- 2.34.1