[DTrace-devel] [PATCH 1/4] Enable the default ERROR probe handler

Kris Van Hees kris.van.hees at oracle.com
Wed Jun 10 08:23:29 PDT 2020


Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
---
 libdtrace/dt_handle.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libdtrace/dt_handle.c b/libdtrace/dt_handle.c
index c678faff..c63fb284 100644
--- a/libdtrace/dt_handle.c
+++ b/libdtrace/dt_handle.c
@@ -16,7 +16,6 @@
 #include <dt_impl.h>
 #include <dt_program.h>
 
-#ifdef FIXME
 static const char _dt_errprog[] =
 "dtrace:::ERROR"
 "{"
@@ -26,16 +25,13 @@ static const char _dt_errprog[] =
 "	trace(arg4);"
 "	trace(arg5);"
 "}";
-#endif
 
 int
 dtrace_handle_err(dtrace_hdl_t *dtp, dtrace_handle_err_f *hdlr, void *arg)
 {
 	dtrace_prog_t *pgp = NULL;
-#ifdef FIXME
 	dt_stmt_t *stp;
 	dtrace_ecbdesc_t *edp;
-#endif
 
 	/*
 	 * We don't currently support multiple error handlers.
@@ -51,7 +47,6 @@ dtrace_handle_err(dtrace_hdl_t *dtp, dtrace_handle_err_f *hdlr, void *arg)
 	if (dtp->dt_options[DTRACEOPT_GRABANON] != DTRACEOPT_UNSET)
 		goto out;
 
-#if 0
 	if ((pgp = dtrace_program_strcompile(dtp, _dt_errprog,
 	    DTRACE_PROBESPEC_NAME, DTRACE_C_ZDEFS, 0, NULL)) == NULL)
 		return (dt_set_errno(dtp, dtrace_errno(dtp)));
@@ -62,7 +57,6 @@ dtrace_handle_err(dtrace_hdl_t *dtp, dtrace_handle_err_f *hdlr, void *arg)
 	edp = stp->ds_desc->dtsd_ecbdesc;
 	assert(edp != NULL);
 	edp->dted_uarg = DT_ECB_ERROR;
-#endif
 
 out:
 	dtp->dt_errhdlr = hdlr;
-- 
2.26.0




More information about the DTrace-devel mailing list