Author: markj
Date: Wed Sep 27 17:46:38 2017
New Revision: 324066
URL: https://svnweb.freebsd.org/changeset/base/324066
Log:
Use C99 initializers for DTrace provider methods.
This makes the definitions easier to read and more cscope-friendly.
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
head/sys/cddl/dev/dtmalloc/dtmalloc.c
head/sys/cddl/dev/fbt/fbt.c
head/sys/cddl/dev/profile/profile.c
head/sys/cddl/dev/prototype.c
head/sys/cddl/dev/sdt/sdt.c
head/sys/cddl/dev/systrace/systrace.c
head/sys/fs/nfsclient/nfs_clkdtrace.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Sep
27 17:46:11 2017 (r324065)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Sep
27 17:46:38 2017 (r324066)
@@ -339,17 +339,17 @@ static void
dtrace_nullop(void)
{}
-static dtrace_pops_t dtrace_provider_ops = {
- (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
- (void (*)(void *, modctl_t *))dtrace_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,
- (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
- NULL,
- NULL,
- NULL,
- (void (*)(void *, dtrace_id_t, void *))dtrace_nullop
+static dtrace_pops_t dtrace_provider_ops = {
+ .dtps_provide = (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
+ .dtps_provide_module = (void (*)(void *, modctl_t *))dtrace_nullop,
+ .dtps_enable = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+ .dtps_disable = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+ .dtps_suspend = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+ .dtps_resume = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+ .dtps_getargdesc = NULL,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
};
static dtrace_id_t dtrace_probeid_begin; /* special BEGIN probe */
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Wed Sep
27 17:46:11 2017 (r324065)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Wed Sep
27 17:46:38 2017 (r324066)
@@ -1455,29 +1455,29 @@ static const dtrace_pattr_t pid_attr = {
};
static dtrace_pops_t pid_pops = {
- fasttrap_pid_provide,
- NULL,
- fasttrap_pid_enable,
- fasttrap_pid_disable,
- NULL,
- NULL,
- fasttrap_pid_getargdesc,
- fasttrap_pid_getarg,
- NULL,
- fasttrap_pid_destroy
+ .dtps_provide = fasttrap_pid_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = fasttrap_pid_enable,
+ .dtps_disable = fasttrap_pid_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = fasttrap_pid_getargdesc,
+ .dtps_getargval = fasttrap_pid_getarg,
+ .dtps_usermode = NULL,
+ .dtps_destroy = fasttrap_pid_destroy
};
static dtrace_pops_t usdt_pops = {
- fasttrap_pid_provide,
- NULL,
- fasttrap_pid_enable,
- fasttrap_pid_disable,
- NULL,
- NULL,
- fasttrap_pid_getargdesc,
- fasttrap_usdt_getarg,
- NULL,
- fasttrap_pid_destroy
+ .dtps_provide = fasttrap_pid_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = fasttrap_pid_enable,
+ .dtps_disable = fasttrap_pid_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = fasttrap_pid_getargdesc,
+ .dtps_getargval = fasttrap_usdt_getarg,
+ .dtps_usermode = NULL,
+ .dtps_destroy = fasttrap_pid_destroy
};
static fasttrap_proc_t *
@@ -2251,9 +2251,9 @@ fasttrap_meta_remove(void *arg, dtrace_helper_provdesc
}
static dtrace_mops_t fasttrap_mops = {
- fasttrap_meta_create_probe,
- fasttrap_meta_provide,
- fasttrap_meta_remove
+ .dtms_create_probe = fasttrap_meta_create_probe,
+ .dtms_provide_pid = fasttrap_meta_provide,
+ .dtms_remove_pid = fasttrap_meta_remove
};
/*ARGSUSED*/
Modified: head/sys/cddl/dev/dtmalloc/dtmalloc.c
==============================================================================
--- head/sys/cddl/dev/dtmalloc/dtmalloc.c Wed Sep 27 17:46:11 2017
(r324065)
+++ head/sys/cddl/dev/dtmalloc/dtmalloc.c Wed Sep 27 17:46:38 2017
(r324066)
@@ -60,16 +60,16 @@ static dtrace_pattr_t dtmalloc_attr = {
};
static dtrace_pops_t dtmalloc_pops = {
- dtmalloc_provide,
- NULL,
- dtmalloc_enable,
- dtmalloc_disable,
- NULL,
- NULL,
- dtmalloc_getargdesc,
- NULL,
- NULL,
- dtmalloc_destroy
+ .dtps_provide = dtmalloc_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = dtmalloc_enable,
+ .dtps_disable = dtmalloc_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = dtmalloc_getargdesc,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = dtmalloc_destroy
};
static struct cdev *dtmalloc_cdev;
Modified: head/sys/cddl/dev/fbt/fbt.c
==============================================================================
--- head/sys/cddl/dev/fbt/fbt.c Wed Sep 27 17:46:11 2017 (r324065)
+++ head/sys/cddl/dev/fbt/fbt.c Wed Sep 27 17:46:38 2017 (r324066)
@@ -95,16 +95,16 @@ static dtrace_pattr_t fbt_attr = {
};
static dtrace_pops_t fbt_pops = {
- NULL,
- fbt_provide_module,
- fbt_enable,
- fbt_disable,
- fbt_suspend,
- fbt_resume,
- fbt_getargdesc,
- NULL,
- NULL,
- fbt_destroy
+ .dtps_provide = NULL,
+ .dtps_provide_module = fbt_provide_module,
+ .dtps_enable = fbt_enable,
+ .dtps_disable = fbt_disable,
+ .dtps_suspend = fbt_suspend,
+ .dtps_resume = fbt_resume,
+ .dtps_getargdesc = fbt_getargdesc,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = fbt_destroy
};
static struct cdev *fbt_cdev;
Modified: head/sys/cddl/dev/profile/profile.c
==============================================================================
--- head/sys/cddl/dev/profile/profile.c Wed Sep 27 17:46:11 2017
(r324065)
+++ head/sys/cddl/dev/profile/profile.c Wed Sep 27 17:46:38 2017
(r324066)
@@ -221,16 +221,16 @@ static dtrace_pattr_t profile_attr = {
};
static dtrace_pops_t profile_pops = {
- profile_provide,
- NULL,
- profile_enable,
- profile_disable,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- profile_destroy
+ .dtps_provide = profile_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = profile_enable,
+ .dtps_disable = profile_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = NULL,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = profile_destroy
};
static struct cdev *profile_cdev;
Modified: head/sys/cddl/dev/prototype.c
==============================================================================
--- head/sys/cddl/dev/prototype.c Wed Sep 27 17:46:11 2017
(r324065)
+++ head/sys/cddl/dev/prototype.c Wed Sep 27 17:46:38 2017
(r324066)
@@ -39,16 +39,16 @@ static dtrace_pattr_t prototype_attr = {
};
static dtrace_pops_t prototype_pops = {
- prototype_provide,
- NULL,
- prototype_enable,
- prototype_disable,
- NULL,
- NULL,
- prototype_getargdesc,
- NULL,
- NULL,
- prototype_destroy
+ .dtps_provide = prototype_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = prototype_enable,
+ .dtps_disable = prototype_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = prototype_getargdesc,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = prototype_destroy
};
static struct cdev *prototype_cdev;
Modified: head/sys/cddl/dev/sdt/sdt.c
==============================================================================
--- head/sys/cddl/dev/sdt/sdt.c Wed Sep 27 17:46:11 2017 (r324065)
+++ head/sys/cddl/dev/sdt/sdt.c Wed Sep 27 17:46:38 2017 (r324066)
@@ -85,16 +85,16 @@ static dtrace_pattr_t sdt_attr = {
};
static dtrace_pops_t sdt_pops = {
- sdt_provide_probes,
- NULL,
- sdt_enable,
- sdt_disable,
- NULL,
- NULL,
- sdt_getargdesc,
- NULL,
- NULL,
- sdt_destroy,
+ .dtps_provide = sdt_provide_probes,
+ .dtps_provide_module = NULL,
+ .dtps_enable = sdt_enable,
+ .dtps_disable = sdt_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = sdt_getargdesc,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = sdt_destroy,
};
static TAILQ_HEAD(, sdt_provider) sdt_prov_list;
Modified: head/sys/cddl/dev/systrace/systrace.c
==============================================================================
--- head/sys/cddl/dev/systrace/systrace.c Wed Sep 27 17:46:11 2017
(r324065)
+++ head/sys/cddl/dev/systrace/systrace.c Wed Sep 27 17:46:38 2017
(r324066)
@@ -160,16 +160,16 @@ static dtrace_pattr_t systrace_attr = {
};
static dtrace_pops_t systrace_pops = {
- systrace_provide,
- NULL,
- systrace_enable,
- systrace_disable,
- NULL,
- NULL,
- systrace_getargdesc,
- systrace_getargval,
- NULL,
- systrace_destroy
+ .dtps_provide = systrace_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = systrace_enable,
+ .dtps_disable = systrace_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = systrace_getargdesc,
+ .dtps_getargval = systrace_getargval,
+ .dtps_usermode = NULL,
+ .dtps_destroy = systrace_destroy
};
static dtrace_provider_id_t systrace_id;
Modified: head/sys/fs/nfsclient/nfs_clkdtrace.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clkdtrace.c Wed Sep 27 17:46:11 2017
(r324065)
+++ head/sys/fs/nfsclient/nfs_clkdtrace.c Wed Sep 27 17:46:38 2017
(r324066)
@@ -162,16 +162,16 @@ static char *dtnfsclient_miss_str = "miss";
static char *dtnfsclient_start_str = "start";
static dtrace_pops_t dtnfsclient_pops = {
- dtnfsclient_provide,
- NULL,
- dtnfsclient_enable,
- dtnfsclient_disable,
- NULL,
- NULL,
- dtnfsclient_getargdesc,
- NULL,
- NULL,
- dtnfsclient_destroy
+ .dtps_provide = dtnfsclient_provide,
+ .dtps_provide_module = NULL,
+ .dtps_enable = dtnfsclient_enable,
+ .dtps_disable = dtnfsclient_disable,
+ .dtps_suspend = NULL,
+ .dtps_resume = NULL,
+ .dtps_getargdesc = dtnfsclient_getargdesc,
+ .dtps_getargval = NULL,
+ .dtps_usermode = NULL,
+ .dtps_destroy = dtnfsclient_destroy
};
static dtrace_provider_id_t dtnfsclient_id;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
