Hi Yannick, Is this for the UST 0.x or 2.0 branch ?
Thanks, Mathieu * Yannick Brosseau ([email protected]) wrote: > Signed-off-by: Yannick Brosseau <[email protected]> > --- > tests/runtests | 2 +- > tests/tracepoint/Makefile.am | 11 ++++------- > tests/tracepoint/run | 2 +- > tests/tracepoint/tracepoint_test.c | 22 +++++++++++----------- > tests/tracepoint/tracepoint_test.h | 4 ++-- > 5 files changed, 19 insertions(+), 22 deletions(-) > > diff --git a/tests/runtests b/tests/runtests > index e669210..86cb910 100755 > --- a/tests/runtests > +++ b/tests/runtests > @@ -44,7 +44,7 @@ simple_harness_run dlopen/dlopen.sh > simple_harness_run same_line_marker/same_line_marker.sh > > # This testcase is currently broken, do not run. > -# simple_harness_run tracepoint/run > +simple_harness_run tracepoint/run > > simple_harness_run libustctl_function_tests/libustctl_function_tests > > diff --git a/tests/tracepoint/Makefile.am b/tests/tracepoint/Makefile.am > index 3c3fe90..90ff287 100644 > --- a/tests/tracepoint/Makefile.am > +++ b/tests/tracepoint/Makefile.am > @@ -2,13 +2,10 @@ SUBDIRS = benchmark > > AM_CPPFLAGS = -I$(top_srcdir)/include > > -#noinst_PROGRAMS = tracepoint_test > -#tracepoint_test_SOURCES = tracepoint_test.c tracepoint_test.h > -#tracepoint_test_LDADD = $(top_builddir)/libust/libust.la > $(top_builddir)/libust-initializer.o > +noinst_PROGRAMS = tracepoint_test > +tracepoint_test_SOURCES = tracepoint_test.c tracepoint_test.h > +tracepoint_test_LDADD = $(top_builddir)/libust/libust.la > $(top_builddir)/libust-initializer.o > > -#FIXME: this test is broken: > -#ust/tests/tracepoint/tracepoint_test.c:64: undefined reference to > -#`register_trace_ust_event_msg' > -#CFLAGS_tracepoint_test.o = -I$(src) > +CFLAGS_tracepoint_test.o = -I$(src) > noinst_SCRIPTS = run > EXTRA_DIST = run > diff --git a/tests/tracepoint/run b/tests/tracepoint/run > index d63f42d..b7e5029 100755 > --- a/tests/tracepoint/run > +++ b/tests/tracepoint/run > @@ -10,7 +10,7 @@ fi > source $TESTDIR/test_functions.sh > source $TESTDIR/tap.sh > > -starttest "Testing Tracepoints" > +starttest "Testing Deprecated Tracepoints" > plan_tests 6 > USTTRACE="$TESTDIR/../usttrace" > > diff --git a/tests/tracepoint/tracepoint_test.c > b/tests/tracepoint/tracepoint_test.c > index 34cdb11..88cb379 100644 > --- a/tests/tracepoint/tracepoint_test.c > +++ b/tests/tracepoint/tracepoint_test.c > @@ -32,8 +32,8 @@ > #include <ust/marker.h> > #include "tracepoint_test.h" > > -DEFINE_TRACEPOINT(ust_event); > -DEFINE_TRACEPOINT(ust_event2); > +DEFINE_TRACE(ust_event); > +DEFINE_TRACE(ust_event2); > > static struct message msg_probe3 = { > .payload = "probe3", > @@ -47,7 +47,7 @@ void tp_probe4(void *data, unsigned int p4) > { > int i; > for (i = 0; i < 100; i++) { > - ust_marker_tp(event2, ust_event2, tp_probe4, "probe4 %u", p4); > + ust_marker(event2, "probe4 %u", p4); > } > } > > @@ -60,8 +60,8 @@ void tp_probe3(void *data, unsigned int p3) > { > struct message *msg; > msg = (struct message*) data; > - ust_marker_tp(event_msg, ust_event_msg, > - tp_probe3, "probe %s", msg->payload); > + ust_marker(event_msg, > + "probe %s", msg->payload); > } > > /* > @@ -72,7 +72,7 @@ void tp_probe2(void *data, unsigned int p2) > { > int i; > for (i = 0; i < 5; i++) { > - ust_marker_tp(event, ust_event, tp_probe2, "probe %u", 13); > + ust_marker(event, "probe %u", 13); > } > } > > @@ -84,16 +84,16 @@ void tp_probe(void *data, unsigned int p1) > { > int i; > for (i = 0; i < 5; i++) { > - ust_marker_tp(event, ust_event, tp_probe, "probe %u", p1); > + ust_marker(event, "probe %u", p1); > } > } > > static void __attribute__((constructor)) init() > { > - register_tracepoint(ust_event, tp_probe, NULL); > - register_tracepoint(ust_event, tp_probe2, NULL); > - register_tracepoint(ust_event, tp_probe3, &msg_probe3); > - register_tracepoint(ust_event2, tp_probe4, NULL); > + __register_tracepoint(ust_event, tp_probe, NULL); > + __register_tracepoint(ust_event, tp_probe2, NULL); > + __register_tracepoint(ust_event, tp_probe3, &msg_probe3); > + __register_tracepoint(ust_event2, tp_probe4, NULL); > } > > int main(int argc, char **argv) { > diff --git a/tests/tracepoint/tracepoint_test.h > b/tests/tracepoint/tracepoint_test.h > index 1899fe4..6b4dcdb 100644 > --- a/tests/tracepoint/tracepoint_test.h > +++ b/tests/tracepoint/tracepoint_test.h > @@ -1,7 +1,7 @@ > #include <ust/tracepoint.h> > > -DECLARE_TRACEPOINT(ust_event, TP_PROTO(unsigned int v), TP_ARGS(v)); > -DECLARE_TRACEPOINT(ust_event2, TP_PROTO(unsigned int v), TP_ARGS(v)); > +DECLARE_TRACE(ust_event, TP_PROTO(unsigned int v), TP_ARGS(v)); > +DECLARE_TRACE(ust_event2, TP_PROTO(unsigned int v), TP_ARGS(v)); > > struct message { > char *payload; > -- > 1.7.6.3 > > > _______________________________________________ > ltt-dev mailing list > [email protected] > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev > -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com _______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
