Tracepoint and TRACEPOINT_EVENT API cleanup

[ust.git] / tests / trace_event / trace_event_test.h

diff --git a/tests/trace_event/trace_event_test.h b/tests/trace_event/trace_event_test.h
index 38f0b466a369c034d499acdc2a09267590b2357f..3a126d42a3bdc0127f49bc9e6a31b9470f07dda5 100644 (file)
--- a/tests/trace_event/trace_event_test.h
+++ b/tests/trace_event/trace_event_test.h
@@ -1,4 +1,12 @@
-/* Copyright (C) 2010 Nils Carlson <nils.carlson@ericsson.com>
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM trace_event_test
+
+#if !defined(_TRACEPOINT_EVENT_TEST_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACEPOINT_EVENT_TEST_H
+
+/*
+ * Copyright (C) 2010 Nils Carlson <nils.carlson@ericsson.com>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,11 +22,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM trace_event_test
-
-#if !defined(_TRACEPOINT_EVENT_TEST_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACEPOINT_EVENT_TEST_H
 
 #include <ust/tracepoint.h>
 
@@ -28,17 +31,10 @@ TRACEPOINT_EVENT(test,
 
        TP_ARGS(time, count),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  time    )
-               __field(        unsigned long,  count   )
-       ),
-
-       TP_fast_assign(
-               __entry->time = time;
-               __entry->count = count;
-       ),
-
-       TP_printf("time=%lu count=%lu", __entry->time, __entry->count)
+       TP_FIELDS(
+               tp_field(unsigned long, time, time)
+               tp_field(unsigned long, count, count)
+       )
 );
 
 #endif /* _TRACEPOINT_EVENT_TEST_H */