Merged, thanks! Mathieu
----- On Jul 30, 2015, at 4:43 PM, Jeremie Galarneau [email protected] wrote: > This rename comes as an effort to remain consistent with the tracepoint > naming scheme used by Log4J and JUL. > > The associated change in lttng-tools is introduced as of d8c7bda0. > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > liblttng-ust-python-agent/lttng_ust_python.c | 2 +- > liblttng-ust-python-agent/lttng_ust_python.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/liblttng-ust-python-agent/lttng_ust_python.c > b/liblttng-ust-python-agent/lttng_ust_python.c > index d10daf1..be534c6 100644 > --- a/liblttng-ust-python-agent/lttng_ust_python.c > +++ b/liblttng-ust-python-agent/lttng_ust_python.c > @@ -27,6 +27,6 @@ void py_tracepoint(const char *asctime, const char *msg, > const char *logger_name, const char *funcName, unsigned int > lineno, > unsigned int int_loglevel, unsigned int thread, const char > *threadName) > { > - tracepoint(lttng_python, user_event, asctime, msg, logger_name, > funcName, > + tracepoint(lttng_python, event, asctime, msg, logger_name, funcName, > lineno, int_loglevel, thread, threadName); > } > diff --git a/liblttng-ust-python-agent/lttng_ust_python.h > b/liblttng-ust-python-agent/lttng_ust_python.h > index 8ac7604..5554c59 100644 > --- a/liblttng-ust-python-agent/lttng_ust_python.h > +++ b/liblttng-ust-python-agent/lttng_ust_python.h > @@ -24,7 +24,7 @@ > #include <lttng/tracepoint.h> > #include <stdbool.h> > > -TRACEPOINT_EVENT(lttng_python, user_event, > +TRACEPOINT_EVENT(lttng_python, event, > TP_ARGS( > const char *, asctime, > const char *, msg, > -- > 2.4.6 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
