mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-17 18:11:00 +03:00
546f38433a
When debugging with tracepoints, we see string pointers:
zfs 3017 [006] 8878.728915: zfs:zfs_set__error: ffffffffa0eec3fc:3013:ffffffffa0ebcd60(): error 0x2
ffffffffa0e1ca43 spa_open_common (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e1cbe3 spa_open (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e6f6ef zfs_ioc_stable (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa0e6f2a9 zfsdev_ioctl (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffff811909dd do_vfs_ioctl ([kernel.kallsyms])
ffffffff81190c41 sys_ioctl ([kernel.kallsyms])
ffffffff8156e2e9 system_call_fastpath ([kernel.kallsyms])
7ff7d8be69c7 __GI___ioctl (/lib64/libc-2.19.so)
7ff7d90cac53 lzc_ioctl.constprop.3 (/lib64/libzfs_core.so.1.0.0)
636f695f637a6c00 [unknown] ([unknown])
Printing the actual strings is more convenient:
zfs 3461 [001] 10599.847692: zfs:zfs_set__error: spa.c:3013:spa_open_common(): error 0x2
ffffffffa116ba43 spa_open_common (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa116bbe3 spa_open (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa11be8df zfs_ioc_stable (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffffa11be499 zfsdev_ioctl (/lib/modules/3.12.21-gentoo-r1/extra/zfs/zfs.ko)
ffffffff811909dd do_vfs_ioctl ([kernel.kallsyms])
ffffffff81190c41 sys_ioctl ([kernel.kallsyms])
ffffffff8156e2e9 system_call_fastpath ([kernel.kallsyms])
7f11b843c9c7 __GI___ioctl (/lib64/libc-2.19.so)
7f11b8920c53 lzc_ioctl.constprop.3 (/lib64/libzfs_core.so.1.0.0)
636f695f637a6c00 [unknown] ([unknown])
A few other tracepoints have strings as well, so switch to printing
the actual string values at the same time.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4212
123 lines
3.7 KiB
C
123 lines
3.7 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
|
|
*/
|
|
|
|
/* Do not include this file directly. Please use <sys/trace.h> instead. */
|
|
#ifndef _SYS_TRACE_DBGMSG_INDIRECT
|
|
#error "trace_dbgmsg.h included directly"
|
|
#endif
|
|
|
|
/*
|
|
* This file defines tracepoint events for use by the dbgmsg(),
|
|
* dprintf(), and SET_ERROR() interfaces. These are grouped here because
|
|
* they all provide a way to store simple messages in the debug log (as
|
|
* opposed to events used by the DTRACE_PROBE interfaces which typically
|
|
* dump structured data).
|
|
*
|
|
* This header is included inside the trace.h multiple inclusion guard,
|
|
* and it is guarded above against direct inclusion, so it and need not
|
|
* be guarded separately.
|
|
*/
|
|
|
|
/*
|
|
* Generic support for four argument tracepoints of the form:
|
|
*
|
|
* DTRACE_PROBE4(...,
|
|
* const char *, ...,
|
|
* const char *, ...,
|
|
* int, ...,
|
|
* const char *, ...);
|
|
*/
|
|
|
|
DECLARE_EVENT_CLASS(zfs_dprintf_class,
|
|
TP_PROTO(const char *file, const char *function, int line,
|
|
const char *msg),
|
|
TP_ARGS(file, function, line, msg),
|
|
TP_STRUCT__entry(
|
|
__string(file, file)
|
|
__string(function, function)
|
|
__field(int, line)
|
|
__string(msg, msg)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(file, strchr(file, '/') ?
|
|
strrchr(file, '/') + 1 : file)
|
|
__assign_str(function, function);
|
|
__entry->line = line;
|
|
__assign_str(msg, msg);
|
|
),
|
|
TP_printk("%s:%d:%s(): %s", __get_str(file), __entry->line,
|
|
__get_str(function), __get_str(msg))
|
|
);
|
|
|
|
#define DEFINE_DPRINTF_EVENT(name) \
|
|
DEFINE_EVENT(zfs_dprintf_class, name, \
|
|
TP_PROTO(const char *file, const char *function, int line, \
|
|
const char *msg), \
|
|
TP_ARGS(file, function, line, msg))
|
|
DEFINE_DPRINTF_EVENT(zfs_zfs__dprintf);
|
|
|
|
/*
|
|
* Generic support for four argument tracepoints of the form:
|
|
*
|
|
* DTRACE_PROBE4(...,
|
|
* const char *, ...,
|
|
* const char *, ...,
|
|
* int, ...,
|
|
* uintptr_t, ...);
|
|
*/
|
|
|
|
DECLARE_EVENT_CLASS(zfs_set_error_class,
|
|
TP_PROTO(const char *file, const char *function, int line,
|
|
uintptr_t error),
|
|
TP_ARGS(file, function, line, error),
|
|
TP_STRUCT__entry(
|
|
__string(file, file)
|
|
__string(function, function)
|
|
__field(int, line)
|
|
__field(uintptr_t, error)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(file, strchr(file, '/') ?
|
|
strrchr(file, '/') + 1 : file)
|
|
__assign_str(function, function);
|
|
__entry->line = line;
|
|
__entry->error = error;
|
|
),
|
|
TP_printk("%s:%d:%s(): error 0x%lx", __get_str(file), __entry->line,
|
|
__get_str(function), __entry->error)
|
|
);
|
|
|
|
#ifdef TP_CONDITION
|
|
#define DEFINE_SET_ERROR_EVENT(name) \
|
|
DEFINE_EVENT_CONDITION(zfs_set_error_class, name, \
|
|
TP_PROTO(const char *file, const char *function, int line, \
|
|
uintptr_t error), \
|
|
TP_ARGS(file, function, line, error), \
|
|
TP_CONDITION(error))
|
|
#else
|
|
#define DEFINE_SET_ERROR_EVENT(name) \
|
|
DEFINE_EVENT(zfs_set_error_class, name, \
|
|
TP_PROTO(const char *file, const char *function, int line, \
|
|
uintptr_t error), \
|
|
TP_ARGS(file, function, line, error))
|
|
#endif
|
|
DEFINE_SET_ERROR_EVENT(zfs_set__error);
|