Index: usr.bin/Makefile =================================================================== --- usr.bin/Makefile +++ usr.bin/Makefile @@ -11,6 +11,7 @@ banner \ basename \ beep \ + boottrace \ brandelf \ bsdcat \ bsdiff \ Index: usr.bin/boottrace/Makefile =================================================================== --- /dev/null +++ usr.bin/boottrace/Makefile @@ -0,0 +1,3 @@ +PROG= boottrace + +.include Index: usr.bin/boottrace/boottrace.1 =================================================================== --- /dev/null +++ usr.bin/boottrace/boottrace.1 @@ -0,0 +1,87 @@ +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2022 NetApp, Inc. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd January 17, 2022 +.Dt BOOTTRACE 1 +.Os +.Sh NAME +.Nm boottrace +.Nd trace command execution with +.Xr boottrace 4 +.Sh SYNOPSIS +.Nm +.Ar utility Op Ar argument ... +.Sh DESCRIPTION +The +.Nm +utility +executes the specified +.Ar utility , +creating two +.Xr boottrace 4 +trace entries before and after its execution. +.Sh ENVIRONMENT +The +.Ev PATH +environment variable is used to locate the requested +.Ar utility +if the name contains no +.Ql / +characters. +.Sh EXIT STATUS +If +.Ar utility +was executed successfully, its exit status is returned. +If +.Ar utility +terminated abnormally, a warning message is printed to stderr. +If the +.Ar utility +could not be found or run, an error message is printed to stderr, and +the +.Nm +program will terminate. +.Sh EXAMPLES +Execute the +.Xr dumpon 8 +utility, logging the trace entries: +.Bd -literal -offset indent +$ boottrace dumpon -z /dev/gpt/swap0 +.Ed +.Pp +This will appear in the output of +.Va sysctl kern.boottrace.log : +.Bd -literal -offset indent +CPU msecs delta process event PID CPUtime IBlks OBlks + 0 63918567 0 kernel (proc0) sysinit 0x2100001 0 0.00 0 0 + +\&... + + 0 64076940 120605 boottrace dumpon start 1602 0.00 0 0 + 0 64076942 2 boottrace dumpon done 1602 0.00 0 0 +.Ed +.Sh SEE ALSO +.Xr boottrace 4 , +.Xr rc.subr 8 Index: usr.bin/boottrace/boottrace.c =================================================================== --- /dev/null +++ usr.bin/boottrace/boottrace.c @@ -0,0 +1,71 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 NetApp, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +static void +usage(void) +{ + fprintf(stderr, "usage: boottrace utility [argument ...]\n"); + exit(1); +} + +int +main(int argc, char **argv) +{ + pid_t pid; + int status; + + if (argc < 2) + usage(); + argv++; + + BOOTTRACE("%s start", *argv); + pid = fork(); + if (pid == -1) { + exit(1); + } else if (pid == 0) { + execvp(*argv, argv); + err(1, "execvp %s", *argv); + } + waitpid(pid, &status, 0); + if (!WIFEXITED(status)) + warnx("command terminated abnormally"); + BOOTTRACE("%s done", *argv); + + return (WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE); +}