[lttng-dev] [lttng-ust PATCH] Fix tests/benchmark

[lttng-dev] [lttng-ust PATCH] Fix tests/benchmark

[Zifei Tong]

Add copyright notice.

Remove extern C guard with respect to #597.

Signed-off-by: Zifei Tong <soariez at gmail.com>
---
 tests/benchmark/tp.c                  | 24 ++++++++++++++++++++++++
 tests/benchmark/ust_tests_benchmark.h | 28 +++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/tests/benchmark/tp.c b/tests/benchmark/tp.c
index a4f5352..4a5aa36 100644
--- a/tests/benchmark/tp.c
+++ b/tests/benchmark/tp.c
@@ -1,2 +1,26 @@
+/*
+ * tp.c
+ *
+ * Copyright (c) 2013 Zifei Tong <soariez at gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #define TRACEPOINT_CREATE_PROBES
 #include "ust_tests_benchmark.h"
diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h
index 0ee986f..f7d7864 100644
--- a/tests/benchmark/ust_tests_benchmark.h
+++ b/tests/benchmark/ust_tests_benchmark.h
@@ -4,9 +4,27 @@
 #if !defined(_TRACEPOINT_UST_TESTS_BENCHMARK_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_BENCHMARK_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+/*
+ * Copyright (C) 2013  Zifei Tong <soariez at gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 #include <lttng/tracepoint.h>
 
@@ -24,7 +42,3 @@ TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
-- 
1.8.4.2

[lttng-dev] [lttng-ust PATCH] Fix tests/benchmark

[Mathieu Desnoyers]

----- Original Message -----
> From: "Zifei Tong" <soariez@gmail.com>
> To: "mathieu desnoyers" <mathieu.desnoyers at efficios.com>
> Cc: lttng-dev at lists.lttng.org, "Zifei Tong" <soariez at gmail.com>
> Sent: Friday, November 15, 2013 10:04:55 AM
> Subject: [lttng-ust PATCH] Fix tests/benchmark
> 
> Add copyright notice.
> 
> Remove extern C guard with respect to #597.
> 
> Signed-off-by: Zifei Tong <soariez at gmail.com>

Merged, thanks!

Mathieu

> ---
>  tests/benchmark/tp.c                  | 24 ++++++++++++++++++++++++
>  tests/benchmark/ust_tests_benchmark.h | 28 +++++++++++++++++++++-------
>  2 files changed, 45 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/benchmark/tp.c b/tests/benchmark/tp.c
> index a4f5352..4a5aa36 100644
> --- a/tests/benchmark/tp.c
> +++ b/tests/benchmark/tp.c
> @@ -1,2 +1,26 @@
> +/*
> + * tp.c
> + *
> + * Copyright (c) 2013 Zifei Tong <soariez at gmail.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> deal
> + * in the Software without restriction, including without limitation the
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included
> in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE
> + * SOFTWARE.
> + */
> +
>  #define TRACEPOINT_CREATE_PROBES
>  #include "ust_tests_benchmark.h"
> diff --git a/tests/benchmark/ust_tests_benchmark.h
> b/tests/benchmark/ust_tests_benchmark.h
> index 0ee986f..f7d7864 100644
> --- a/tests/benchmark/ust_tests_benchmark.h
> +++ b/tests/benchmark/ust_tests_benchmark.h
> @@ -4,9 +4,27 @@
>  #if !defined(_TRACEPOINT_UST_TESTS_BENCHMARK_H) ||
>  defined(TRACEPOINT_HEADER_MULTI_READ)
>  #define _TRACEPOINT_UST_TESTS_BENCHMARK_H
>  
> -#ifdef __cplusplus
> -extern "C" {
> -#endif
> +/*
> + * Copyright (C) 2013  Zifei Tong <soariez at gmail.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> deal
> + * in the Software without restriction, including without limitation the
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included
> in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE
> + * SOFTWARE.
> + */
>  
>  #include <lttng/tracepoint.h>
>  
> @@ -24,7 +42,3 @@ TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
>  
>  /* This part must be outside ifdef protection */
>  #include <lttng/tracepoint-event.h>
> -
> -#ifdef __cplusplus
> -}
> -#endif
> --
> 1.8.4.2
> 
> 

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com