From owner-p4-projects@FreeBSD.ORG Mon Apr 24 23:30:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34EAF16A405; Mon, 24 Apr 2006 23:30:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFA6E16A400 for ; Mon, 24 Apr 2006 23:30:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72B2B43D48 for ; Mon, 24 Apr 2006 23:30:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ONUbw0007140 for ; Mon, 24 Apr 2006 23:30:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ONUbHl007134 for perforce@freebsd.org; Mon, 24 Apr 2006 23:30:37 GMT (envelope-from jb@freebsd.org) Date: Mon, 24 Apr 2006 23:30:37 GMT Message-Id: <200604242330.k3ONUbHl007134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 96026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 23:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=96026 Change 96026 by jb@jb_freebsd2 on 2006/04/24 23:30:03 Change 'struct modctl' to modctl_t to be consistent with the rest of the Solaris code. We compatible-ise to modctl_t. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#15 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hook.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#15 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -245,7 +246,7 @@ /* dtps_provide */ (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop, /* dtps_provide_module */ - (void (*)(void *, struct modctl *))dtrace_nullop, + (void (*)(void *, modctl_t *))dtrace_nullop, /* dtps_enable */ (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, /* dtps_disable */ @@ -429,6 +430,7 @@ dtrace_dynvar_t *dtrace_dynvar(dtrace_dstate_t *, uint_t, dtrace_key_t *, size_t, dtrace_dynvar_op_t); dtrace_state_t *dtrace_state_create(struct cdev *); int dtrace_dstate_init(dtrace_dstate_t *, size_t); +int dtrace_probe_provide_cb(linker_file_t, void *); static char *dtrace_strdup(const char *); static dof_hdr_t *dtrace_dof_copyin(uintptr_t, int *); static dof_hdr_t *dtrace_dof_create(dtrace_state_t *); @@ -537,8 +539,8 @@ static void dtrace_helper_trace(dtrace_helper_action_t *r, dtrace_mstate_t *, dtrace_vstate_t *, int); static void dtrace_helpers_destroy(void); static void dtrace_helpers_duplicate(proc_t *, proc_t *); -static void dtrace_module_loaded(struct modctl *); -static void dtrace_module_unloaded(struct modctl *); +static void dtrace_module_loaded(modctl_t *); +static void dtrace_module_unloaded(modctl_t *); static void dtrace_predicate_hold(dtrace_predicate_t *); static void dtrace_predicate_release(dtrace_predicate_t *, dtrace_vstate_t *); static void dtrace_probe_description(const dtrace_probe_t *, dtrace_probedesc_t *); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hook.c#3 (text+ko) ==== @@ -3,7 +3,7 @@ * DTrace Hook Functions */ static void -dtrace_module_loaded(struct modctl *ctl) +dtrace_module_loaded(modctl_t *ctl) { dtrace_provider_t *prv; @@ -58,7 +58,7 @@ } static void -dtrace_module_unloaded(struct modctl *ctl) +dtrace_module_unloaded(modctl_t *ctl) { dtrace_probe_t template, *probe, *first, *next; dtrace_provider_t *prov; ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#4 (text+ko) ==== @@ -84,7 +84,7 @@ if (pops->dtps_provide_module == NULL) { ASSERT(pops->dtps_provide != NULL); provider->dtpv_pops.dtps_provide_module = - (void (*)(void *, struct modctl *))dtrace_nullop; + (void (*)(void *, modctl_t *))dtrace_nullop; } if (pops->dtps_suspend == NULL) {