Merge branch 'master' of git.lttng.org:/home/git/lttng-ust

diff --git a/include/Makefile.am b/include/Makefile.am
index 3a667956a3db3554b8dfc6cfc37640f05df126d9..cd4619deb176665bcb563d820b37e87cfab71820 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,7 +9,6 @@ nobase_include_HEADERS = \
        lttng/ust-ctl.h \
        lttng/version.h \
        lttng/ust-abi.h \
-       lttng/ust-comm.h \
        lttng/ringbuffer-abi.h \
        lttng/ust-tracer.h \
        lttng/usterr-signal-safe.h \
@@ -32,6 +31,7 @@ nobase_include_HEADERS = \
 noinst_HEADERS = \
        usterr.h \
        ust_snprintf.h \
+       lttng/ust-comm.h \
        lttng/compat.h \
        lttng/marker-internal.h \
        lttng/tracepoint-internal.h \

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 6023ba5e9fec0dab5160435dce41386a7aeb7e89..e44c0331212158fd255c61056ac2c240c607669d 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -62,13 +62,13 @@ extern "C" {
 
 #define TP_PARAMS(args...)     args
 #define TP_PROTO(args...)      args
-#define TP_ARGS(args...)       args
+#define TP_VARS(args...)       args
 
 #define __CHECK_TRACE(provider, name, proto, args)                     \
        do {                                                            \
                if (caa_unlikely(__tracepoint_##provider##___##name.state))     \
                        __DO_TRACE(&__tracepoint_##provider##___##name, \
-                               TP_PROTO(proto), TP_ARGS(args));        \
+                               TP_PROTO(proto), TP_VARS(args));        \
        } while (0)
 
 /*
@@ -81,7 +81,7 @@ extern "C" {
        static inline void __trace_##provider##___##name(proto)         \
        {                                                               \
                __CHECK_TRACE(provider, name, TP_PROTO(data_proto),     \
-                             TP_ARGS(data_args));                      \
+                             TP_VARS(data_args));                      \
        }                                                               \
        static inline int                                               \
        __register_trace_##provider##___##name(void (*probe)(data_proto), void *data)   \
@@ -196,7 +196,7 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
  * TRACEPOINT_EVENT(< [com_company_]project[_component] >, < event >,
  *     TP_PROTO(int arg0, void *arg1, char *string, size_t strlen,
  *              long *arg4, size_t arg4_len),
- *     TP_ARGS(arg0, arg1, string, strlen, arg4, arg4_len),
+ *     TP_VARS(arg0, arg1, string, strlen, arg4, arg4_len),
  *     TP_FIELDS(
  *
  *         * Integer, printed in base 10 * 
@@ -283,7 +283,7 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
  *     *  TP_PROTO1/TP_PROTO2/TP_PROTO3 ugliness.)
  *     *
  *
- *     TP_ARGS(rq, prev, next),
+ *     TP_VARS(rq, prev, next),
  *
  *     *
  *     * Fast binary tracing: define the trace record via

diff --git a/include/lttng/ust-comm.h b/include/lttng/ust-comm.h
index f5da9559000e9f3dcc502daddbd43deaf236a283..deb0438bedd577179196c803dc7316243bcb7f53 100644 (file)
--- a/include/lttng/ust-comm.h
+++ b/include/lttng/ust-comm.h
@@ -6,19 +6,19 @@
  *                      Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
- * 
- * This program is distributed in the hope that it will be useful,
+ * 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; only
+ * 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 General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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
  */
 
 /*

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 43044ac9020b001601381070be12b65b01082558..0d5611d2ca3391353c896183afd6b83fa8d3120d 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -27,8 +27,8 @@
 #undef TP_PROTO
 #define TP_PROTO(args...)
 
-#undef TP_ARGS
-#define TP_ARGS(args...)
+#undef TP_VARS
+#define TP_VARS(args...)
 
 #undef TP_FIELDS
 #define TP_FIELDS(args...)

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 90e58e09319674ddd62b82d1c44e4bb516b9d216..901f491716263c294c3a01fdb8f7341dab61f4f9 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -421,8 +421,8 @@ static inline size_t __event_get_align__##_provider##___##_name(_proto)           \
 #undef TP_PROTO
 #define TP_PROTO(args...) args
 
-#undef TP_ARGS
-#define TP_ARGS(args...) args
+#undef TP_VARS
+#define TP_VARS(args...) args
 
 #undef TP_FIELDS
 #define TP_FIELDS(args...) args

diff --git a/liblttng-ust-comm/Makefile.am b/liblttng-ust-comm/Makefile.am
index 16dc3a693824aa8f64fa2be069d67f41648cc207..2ae997c5bb92a7812af1990a673ffd91de322ede 100644 (file)
--- a/liblttng-ust-comm/Makefile.am
+++ b/liblttng-ust-comm/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = liblttng-ust-comm.la
+noinst_LTLIBRARIES = liblttng-ust-comm.la
 
 liblttng_ust_comm_la_SOURCES = lttng-ust-comm.c

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 2903d57574b68d3d11f839604a324fb81079bde2..8b2e775a779d3ff966c4d241d3e18c6532c189d6 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -1,19 +1,20 @@
 /*
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C)  2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
- * 
- * This program is distributed in the hope that it will be useful,
+ * 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; only
+ * 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 General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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
  */
 
 #define _GNU_SOURCE

diff --git a/liblttng-ust-java/lttng_ust_java.h b/liblttng-ust-java/lttng_ust_java.h
index ccb623310daed134ba0fdcbbe2054175b850addb..67e8d2d75b4825407d672c02fe8f914d0c35bfb3 100644 (file)
--- a/liblttng-ust-java/lttng_ust_java.h
+++ b/liblttng-ust-java/lttng_ust_java.h
@@ -26,7 +26,7 @@
 
 TRACEPOINT_EVENT(lttng_ust_java_string,
        TP_PROTO(const char *name, const char *args),
-       TP_ARGS(name, args),
+       TP_VARS(name, args),
        TP_FIELDS(
                ctf_string(name, name)
                ctf_string(args, args)

diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h
index 8835dba67e2e29ce6347d558e47903418a9e107a..c8525fd92c3c743e090b8a9e3e2d547723dd63b2 100644 (file)
--- a/liblttng-ust/probes/lttng-probe-ust.h
+++ b/liblttng-ust/probes/lttng-probe-ust.h
@@ -28,7 +28,7 @@ TRACEPOINT_EVENT(lttng, metadata,
 
        TP_PROTO(const char *str),
 
-       TP_ARGS(str),
+       TP_VARS(str),
 
        /*
         * Not exactly a string: more a sequence of bytes (dynamic

diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h
index 4bd105bddd790b93aafdb6e0d5b176a80fe072b5..f86df70a944d27d8e58bd370c9287fadcdb81b89 100644 (file)
--- a/tests/fork/ust_tests_fork.h
+++ b/tests/fork/ust_tests_fork.h
@@ -31,7 +31,7 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_fork, before_fork,
 
 TRACEPOINT_EVENT(ust_tests_fork, after_fork_child,
        TP_PROTO(pid_t pid),
-       TP_ARGS(pid),
+       TP_VARS(pid),
        TP_FIELDS(
                ctf_integer(pid_t, pid, pid)
        )

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 40f2cc19b966fdaccaf2159c0d57a9ff63ca89ed..9f38e983a90a054de2bb9e16aebd03f0ca04cfee 100644 (file)
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -32,7 +32,7 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest,
        TP_PROTO(int anint, int netint, long *values,
                 char *text, size_t textlen,
                 double doublearg, float floatarg),
-       TP_ARGS(anint, netint, values, text, textlen,
+       TP_VARS(anint, netint, values, text, textlen,
                doublearg, floatarg),
        TP_FIELDS(
                ctf_integer(int, intfield, anint)

diff --git a/tests/register_test/tp.h b/tests/register_test/tp.h
index 2a9081342d17ff57bb87e6690be5bd81b7d4a003..ced2478d228eab75dc88c53c2cac0100ce73ccf1 100644 (file)
--- a/tests/register_test/tp.h
+++ b/tests/register_test/tp.h
@@ -26,7 +26,7 @@
 
 TRACEPOINT_EVENT(hello_tptest,
                 TP_PROTO(int anint),
-                TP_ARGS(anint),
+                TP_VARS(anint),
                 TP_FIELDS());
 
 #endif /* _TRACE_TP_H */

diff --git a/tests/trace_event/trace_event_test.h b/tests/trace_event/trace_event_test.h
index 19fab2ffc6623857017e999c0727fdd2ec9eafb3..72528b8260eb86f3d702e6afc8ed045c8c823026 100644 (file)
--- a/tests/trace_event/trace_event_test.h
+++ b/tests/trace_event/trace_event_test.h
@@ -29,7 +29,7 @@ TRACEPOINT_EVENT(test,
 
        TP_PROTO(unsigned long time, unsigned long count),
 
-       TP_ARGS(time, count),
+       TP_VARS(time, count),
 
        TP_FIELDS(
                tp_field(unsigned long, time, time)

diff --git a/tests/tracepoint/benchmark/tracepoint_benchmark.h b/tests/tracepoint/benchmark/tracepoint_benchmark.h
index 3b735ff224ba6469a1810ce470ca513f3449d1c5..b64fb14ce024fb3f7f447165d7ced28e589346bf 100644 (file)
--- a/tests/tracepoint/benchmark/tracepoint_benchmark.h
+++ b/tests/tracepoint/benchmark/tracepoint_benchmark.h
@@ -26,7 +26,7 @@
 
 TRACEPOINT_EVENT(ust_event,
                 TP_PROTO(unsigned int v),
-                TP_ARGS(v),
+                TP_VARS(v),
                 TP_FIELDS());
 
 #endif /* _TRACE_TRACEPOINT_BENCHMARK_H */

diff --git a/tests/tracepoint/tracepoint_test.h b/tests/tracepoint/tracepoint_test.h
index 1899fe4e8c16bb2ed965c80281a531845f56790c..bca4be2fd5497e5e26626f7ceb46e32348bee40f 100644 (file)
--- 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_TRACEPOINT(ust_event, TP_PROTO(unsigned int v), TP_VARS(v));
+DECLARE_TRACEPOINT(ust_event2, TP_PROTO(unsigned int v), TP_VARS(v));
 
 struct message {
        char *payload;