-/* 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
* 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(_TRACE_EVENT_TEST_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_EVENT_TEST_H
#include <ust/tracepoint.h>
-TRACE_EVENT(test,
+TRACEPOINT_EVENT(test,
TP_PROTO(unsigned long time, unsigned long count),
- 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_VARS(time, 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 /* _TRACE_EVENT_TEST_H */
+#endif /* _TRACEPOINT_EVENT_TEST_H */
/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH .
#define TRACE_INCLUDE_FILE trace_event_test
-#include <ust/define_trace.h>
+#include <ust/tracepoint_event.h>