X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events-constructor%2Fmain.cpp;h=35240ac146d65375d00e3a106516f7327f57c650;hb=051356a81761338485706e779d046d7fb8dbfe1d;hp=8cb4f78985045b6e9b5370f4aa04ee50dc0082fe;hpb=a4cc1b1ff4fc661a3980bbe2ceba789acf05dfce;p=lttng-tools.git diff --git a/tests/utils/testapp/gen-ust-events-constructor/main.cpp b/tests/utils/testapp/gen-ust-events-constructor/main.cpp index 8cb4f7898..35240ac14 100644 --- a/tests/utils/testapp/gen-ust-events-constructor/main.cpp +++ b/tests/utils/testapp/gen-ust-events-constructor/main.cpp @@ -5,45 +5,29 @@ */ #include "obj.h" -#include "tp-a.h" #include "tp-so.h" +#include "tp-so_c.h" #include "tp.h" /* Use tracepoints defined and provided by shared libraries. */ void test_constructor_so(void) __attribute__((constructor)); void test_constructor_so(void) { - tracepoint(tp_so, constructor_c_provider_shared_library); + tracepoint(tp_so_c, constructor_c_provider_shared_library); } void test_destructor_so(void) __attribute__((destructor)); void test_destructor_so(void) { - tracepoint(tp_so, destructor_c_provider_shared_library); + tracepoint(tp_so_c, destructor_c_provider_shared_library); } Objso g_objso_shared_library("global - shared library define and provider"); -/* Use tracepoints defined and provided by static archive. */ -void test_constructor_a(void) __attribute__((constructor)); -void test_constructor_a(void) -{ - tracepoint(tp_a, constructor_c_provider_static_archive); -} - -void test_destructor_a(void) __attribute__((destructor)); -void test_destructor_a(void) -{ - tracepoint(tp_a, destructor_c_provider_static_archive); -} - -Obja g_obja_static_archive("global - static archive define and provider"); - int main(void) { Obj l_obj("main() local"); Objso l_objso("main() local - shared library define and provider"); - Obja l_obja("main() local - static archive define and provider"); tracepoint(tp, main); return 0;