49ee64e5e6
Older versions of GCC (e.g. GCC 4.4.7 on RHEL6) do not allow duplicate typedef declarations with the same type. The trace.h header contains some typedefs to avoid 'unknown type' errors for C files that haven't declared the type in question. But this causes build failures for C files that have already declared the type. Newer versions of GCC (e.g. v4.6) allow duplicate typedefs with the same type unless pedantic error checking is in force. To support the older versions we need to remove the duplicate typedefs. Removal of the typedefs means we can't built tracepoints code using those types unless the required headers have been included. To facilitate this, all tracepoint event declarations have been moved out of trace.h into separate headers. Each new header is explicitly included from the C file that uses the events defined therein. The trace.h header is still indirectly included form zfs_context.h and provides the implementation of the dprintf(), dbgmsg(), and SET_ERROR() interfaces. This makes those interfaces readily available throughout the code base. The macros that redefine DTRACE_PROBE* to use Linux tracepoints are also still provided by trace.h, so it is a prerequisite for the other trace_*.h headers. These new Linux implementation-specific headers do introduce a small divergence from upstream ZFS in several core C files, but this should not present a significant maintenance burden. Signed-off-by: Ned Bass <bass6@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #2953
69 lines
2.0 KiB
C
69 lines
2.0 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
|
|
#if defined(_KERNEL) && defined(HAVE_DECLARE_EVENT_CLASS)
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM zfs
|
|
|
|
#if !defined(_TRACE_ZFS_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_ZFS_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <sys/types.h>
|
|
|
|
/*
|
|
* The sys/trace_dbgmsg.h header defines tracepoint events for
|
|
* dprintf(), dbgmsg(), and SET_ERROR().
|
|
*/
|
|
#define _SYS_TRACE_DBGMSG_INDIRECT
|
|
#include <sys/trace_dbgmsg.h>
|
|
#undef _SYS_TRACE_DBGMSG_INDIRECT
|
|
|
|
/*
|
|
* Redefine the DTRACE_PROBE* functions to use Linux tracepoints
|
|
*/
|
|
#undef DTRACE_PROBE1
|
|
#define DTRACE_PROBE1(name, t1, arg1) \
|
|
trace_zfs_##name((arg1))
|
|
|
|
#undef DTRACE_PROBE2
|
|
#define DTRACE_PROBE2(name, t1, arg1, t2, arg2) \
|
|
trace_zfs_##name((arg1), (arg2))
|
|
|
|
#undef DTRACE_PROBE3
|
|
#define DTRACE_PROBE3(name, t1, arg1, t2, arg2, t3, arg3) \
|
|
trace_zfs_##name((arg1), (arg2), (arg3))
|
|
|
|
#undef DTRACE_PROBE4
|
|
#define DTRACE_PROBE4(name, t1, arg1, t2, arg2, t3, arg3, t4, arg4) \
|
|
trace_zfs_##name((arg1), (arg2), (arg3), (arg4))
|
|
|
|
#endif /* _TRACE_ZFS_H */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_PATH sys
|
|
#define TRACE_INCLUDE_FILE trace
|
|
#include <trace/define_trace.h>
|
|
|
|
#endif /* _KERNEL && HAVE_DECLARE_EVENT_CLASS */
|