diff options
| -rw-r--r-- | usr/src/uts/common/dtrace/dtrace.c | 68 |
1 files changed, 37 insertions, 31 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c index 50ad857549..0fd20b7f45 100644 --- a/usr/src/uts/common/dtrace/dtrace.c +++ b/usr/src/uts/common/dtrace/dtrace.c @@ -241,26 +241,39 @@ static dtrace_pattr_t dtrace_provider_attr = { }; static void -dtrace_nullop(void) -{} +dtrace_nullop_provide(void *arg __unused, + const dtrace_probedesc_t *spec __unused) +{ +} + +static void +dtrace_nullop_module(void *arg __unused, struct modctl *mp __unused) +{ +} + +static void +dtrace_nullop(void *arg __unused, dtrace_id_t id __unused, void *parg __unused) +{ +} static int -dtrace_enable_nullop(void) +dtrace_enable_nullop(void *arg __unused, dtrace_id_t id __unused, + void *parg __unused) { return (0); } static dtrace_pops_t dtrace_provider_ops = { - (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop, - (void (*)(void *, struct modctl *))dtrace_nullop, - (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - NULL, - NULL, - NULL, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop + .dtps_provide = dtrace_nullop_provide, + .dtps_provide_module = dtrace_nullop_module, + .dtps_enable = dtrace_enable_nullop, + .dtps_disable = dtrace_nullop, + .dtps_suspend = dtrace_nullop, + .dtps_resume = dtrace_nullop, + .dtps_getargdesc = NULL, + .dtps_getargval = NULL, + .dtps_mode = NULL, + .dtps_destroy = dtrace_nullop }; static dtrace_id_t dtrace_probeid_begin; /* special BEGIN probe */ @@ -8282,22 +8295,18 @@ dtrace_register(const char *name, const dtrace_pattr_t *pap, uint32_t priv, if (pops->dtps_provide == NULL) { ASSERT(pops->dtps_provide_module != NULL); - provider->dtpv_pops.dtps_provide = - (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop; + provider->dtpv_pops.dtps_provide = dtrace_nullop_provide; } if (pops->dtps_provide_module == NULL) { ASSERT(pops->dtps_provide != NULL); - provider->dtpv_pops.dtps_provide_module = - (void (*)(void *, struct modctl *))dtrace_nullop; + provider->dtpv_pops.dtps_provide_module = dtrace_nullop_module; } if (pops->dtps_suspend == NULL) { ASSERT(pops->dtps_resume == NULL); - provider->dtpv_pops.dtps_suspend = - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop; - provider->dtpv_pops.dtps_resume = - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop; + provider->dtpv_pops.dtps_suspend = dtrace_nullop; + provider->dtpv_pops.dtps_resume = dtrace_nullop; } provider->dtpv_arg = arg; @@ -8364,8 +8373,7 @@ dtrace_unregister(dtrace_provider_id_t id) int i, self = 0, noreap = 0; dtrace_probe_t *probe, *first = NULL; - if (old->dtpv_pops.dtps_enable == - (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop) { + if (old->dtpv_pops.dtps_enable == dtrace_enable_nullop) { /* * If DTrace itself is the provider, we're called with locks * already held. @@ -8527,8 +8535,7 @@ dtrace_invalidate(dtrace_provider_id_t id) { dtrace_provider_t *pvp = (dtrace_provider_t *)id; - ASSERT(pvp->dtpv_pops.dtps_enable != - (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop); + ASSERT(pvp->dtpv_pops.dtps_enable != dtrace_enable_nullop); mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); @@ -8568,8 +8575,7 @@ dtrace_condense(dtrace_provider_id_t id) /* * Make sure this isn't the dtrace provider itself. */ - ASSERT(prov->dtpv_pops.dtps_enable != - (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop); + ASSERT(prov->dtpv_pops.dtps_enable != dtrace_enable_nullop); mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); @@ -15875,7 +15881,7 @@ dtrace_resume(void) } static int -dtrace_cpu_setup(cpu_setup_t what, processorid_t cpu) +dtrace_cpu_setup(cpu_setup_t what, processorid_t cpu, void *ptr __unused) { ASSERT(MUTEX_HELD(&cpu_lock)); mutex_enter(&dtrace_lock); @@ -15936,7 +15942,7 @@ dtrace_cpu_setup(cpu_setup_t what, processorid_t cpu) static void dtrace_cpu_setup_initial(processorid_t cpu) { - (void) dtrace_cpu_setup(CPU_CONFIG, cpu); + (void) dtrace_cpu_setup(CPU_CONFIG, cpu, NULL); } static void @@ -16043,7 +16049,7 @@ dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) dtrace_debugger_init = dtrace_suspend; dtrace_debugger_fini = dtrace_resume; - register_cpu_setup_func((cpu_setup_func_t *)dtrace_cpu_setup, NULL); + register_cpu_setup_func(dtrace_cpu_setup, NULL); ASSERT(MUTEX_HELD(&cpu_lock)); @@ -17157,7 +17163,7 @@ dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) } bzero(&dtrace_anon, sizeof (dtrace_anon_t)); - unregister_cpu_setup_func((cpu_setup_func_t *)dtrace_cpu_setup, NULL); + unregister_cpu_setup_func(dtrace_cpu_setup, NULL); dtrace_cpu_init = NULL; dtrace_helpers_cleanup = NULL; dtrace_helpers_fork = NULL; |