Tracepoint probes don't need extern C

tracepoint.h has the proper extern C guards, so every liblttng-ust API
called from the probe has the proper linkage.

The rest of the symbols are only meaningful within the probe, so we
don't care if they are mangled or not.

This fixes all UST applications in tests/

Fixes #597

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/regression/tools/filtering/tp.h b/tests/regression/tools/filtering/tp.h
index 15f81e5c05895ac199fc777a5fe5edf4b552c874..dde56afbb71f130c81f47f81d6ede2afd85e0feb 100644 (file)
--- a/tests/regression/tools/filtering/tp.h
+++ b/tests/regression/tools/filtering/tp.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -51,7 +47,3 @@ TRACEPOINT_EVENT(tp, tptest,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/exit-fast/ust_tests_exitfast.h b/tests/regression/ust/exit-fast/ust_tests_exitfast.h
index 71d81f793ea74ac68fe01e79156f20b3ddaa5471..874dfc5a6fa53fb599f767c8dfe5d8921e3a8d1a 100644 (file)
--- a/tests/regression/ust/exit-fast/ust_tests_exitfast.h
+++ b/tests/regression/ust/exit-fast/ust_tests_exitfast.h
@@ -24,10 +24,6 @@
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER ust_tests_exitfast
 
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER ust_tests_exitfast
 

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-

 #if !defined(_TRACEPOINT_UST_TESTS_EXITFAST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_EXITFAST_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_EXITFAST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_EXITFAST_H
 


@@ -46,7 +42,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_exitfast, message, TRACE_INFO)
 #define TRACEPOINT_INCLUDE "./ust_tests_exitfast.h"
 
 #include <lttng/tracepoint-event.h>
 #define TRACEPOINT_INCLUDE "./ust_tests_exitfast.h"
 
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */

diff --git a/tests/regression/ust/high-throughput/tp.h b/tests/regression/ust/high-throughput/tp.h
index 12286b4dbf4edf5b648c195813726edd096e1eb7..b43cb4e0a4ac322de453f4799fec0ddfc726b2bd 100644 (file)
--- a/tests/regression/ust/high-throughput/tp.h
+++ b/tests/regression/ust/high-throughput/tp.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -55,7 +51,3 @@ TRACEPOINT_EVENT(tp, tptest_sighandler,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/linking/ust_tests_demo.h b/tests/regression/ust/linking/ust_tests_demo.h
index d2492b8753b7fc9f9e6b38c5b1078d46ce419ff0..e88c0e59263a6cd4d6566e43c12f915ccbaff9c5 100644 (file)
--- a/tests/regression/ust/linking/ust_tests_demo.h
+++ b/tests/regression/ust/linking/ust_tests_demo.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -55,7 +51,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo, done, TRACE_CRIT)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/linking/ust_tests_demo2.h b/tests/regression/ust/linking/ust_tests_demo2.h
index 25d42ad18eea0cdf19c96a508a0c2a666b051fe4..eec0349e35c26365cee5a67663a9a719519e65e8 100644 (file)
--- a/tests/regression/ust/linking/ust_tests_demo2.h
+++ b/tests/regression/ust/linking/ust_tests_demo2.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -62,7 +58,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/linking/ust_tests_demo3.h b/tests/regression/ust/linking/ust_tests_demo3.h
index c7b63dd8b2750c7d995b9853ea611e482d855b49..232d577aaea9186409c8254bdafc1fafef6e4264 100644 (file)
--- a/tests/regression/ust/linking/ust_tests_demo3.h
+++ b/tests/regression/ust/linking/ust_tests_demo3.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO3_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO3_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -47,7 +43,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo3, done, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/low-throughput/tp.h b/tests/regression/ust/low-throughput/tp.h
index b45a3dd87fd686af845c1ace38daa260676e727c..f6c8634bfa7247bc052d01c25709fe8ab3e9f727 100644 (file)
--- a/tests/regression/ust/low-throughput/tp.h
+++ b/tests/regression/ust/low-throughput/tp.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -39,7 +35,3 @@ TRACEPOINT_EVENT(tp, slow,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/multi-session/ust_gen_nevents.h b/tests/regression/ust/multi-session/ust_gen_nevents.h
index 58e4c17e3c712e528fade959a462c656b5503ae6..7a1c72870e07ca32fd79610dc262938a56ef953e 100644 (file)
--- a/tests/regression/ust/multi-session/ust_gen_nevents.h
+++ b/tests/regression/ust/multi-session/ust_gen_nevents.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_GEN_NEVENTS_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_GEN_NEVENTS_H
 
 #if !defined(_TRACEPOINT_UST_GEN_NEVENTS_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_GEN_NEVENTS_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -62,7 +58,3 @@ TRACEPOINT_EVENT(ust_gen_nevents, tptest3,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo.h b/tests/regression/ust/overlap/demo/ust_tests_demo.h
index 3e024b44eabb11b9f236e8352fa38130e9b651bd..c213e3e4bdd42356c62077080408a935140e30b2 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -57,7 +53,3 @@ TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo2.h b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
index cf4424b61e8426f15557cd79b7998c979f618a1c..262f651c31fc598b72ec59ca86fcb78466e3e20f 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo2.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo2.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -54,7 +50,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/regression/ust/overlap/demo/ust_tests_demo3.h b/tests/regression/ust/overlap/demo/ust_tests_demo3.h
index e58ee86f7200cee7cfb661dbe3caf1990d00f9c8..46a19ce90110cff5300af72d3ce2fb7c99378cc7 100644 (file)
--- a/tests/regression/ust/overlap/demo/ust_tests_demo3.h
+++ b/tests/regression/ust/overlap/demo/ust_tests_demo3.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO3_H
 
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO3_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -39,7 +35,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo3, done, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/utils/testapp/gen-ust-events/tp.h b/tests/utils/testapp/gen-ust-events/tp.h
index 6ffbc32abfb423d83d0236436b5091705108925a..ab6469d89b377369dd2f02f05b4551466e5e18cc 100644 (file)
--- a/tests/utils/testapp/gen-ust-events/tp.h
+++ b/tests/utils/testapp/gen-ust-events/tp.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -50,7 +46,3 @@ TRACEPOINT_EVENT(tp, tptest,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tests/utils/testapp/gen-ust-nevents/tp.h b/tests/utils/testapp/gen-ust-nevents/tp.h
index 739a9fdc310550183f7557767edd5dbeb7e4cafe..085ed6b9dd23d2235871af5b752928628dfc8331 100644 (file)
--- a/tests/utils/testapp/gen-ust-nevents/tp.h
+++ b/tests/utils/testapp/gen-ust-nevents/tp.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 
 #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_TP_H
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-

 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *


@@ -126,7 +122,3 @@ TRACEPOINT_EVENT(tp, tptest5,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

-
-#ifdef __cplusplus
-}
-#endif