Module Name: src
Committed By: pgoyette
Date: Sun Jul 17 05:18:12 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt [pgoyette-localcount]: fbt.c
src/external/cddl/osnet/dev/sdt [pgoyette-localcount]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [pgoyette-localcount]:
dtrace.c
Log Message:
Add the d_localcount member to the various {b,c}devsw structures.
No need for these to be conditional on _MODULE as dtrace is always
a module.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.1 src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.2
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sun Jul 17 05:18:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.18.2.1 2016/07/16 11:27:12 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.18.2.2 2016/07/17 05:18:11 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -56,6 +56,7 @@
#include <sys/syscall.h>
#include <sys/uio.h>
#include <sys/unistd.h>
+#include <sys/localcount.h>
#include <machine/cpu.h>
#if defined(__i386__) || defined(__amd64__)
@@ -151,10 +152,22 @@ static void fbt_resume(void *, dtrace_id
#define FBT_ADDR2NDX(addr) ((((uintptr_t)(addr)) >> 4) & fbt_probetab_mask)
#define FBT_PROBETAB_SIZE 0x8000 /* 32k entries -- 128K total */
+struct localcount fbt_localcount;
+
static const struct cdevsw fbt_cdevsw = {
- fbt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER, NULL
+ .d_open = fbt_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = fbt_localcount,
+ .d_flag = D_OTHER
};
static dtrace_pattr_t fbt_attr = {
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.1 src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.2
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sun Jul 17 05:18:11 2016
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.1 2016/07/16 11:27:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.2 2016/07/17 05:18:11 pgoyette Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/queue.h>
+#include <sys/localcount.h>
#define KDTRACE_HOOKS
#include <sys/sdt.h>
@@ -118,13 +119,25 @@ sdt_open(dev_t dev, int flags, int mode,
return (0);
}
+struct localcount sdt_localcount;
+
static const struct cdevsw sdt_cdevsw = {
- sdt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER, NULL
+ .d_open = sdt_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = sdt_localcount,
+ .d_flag = D_OTHER
};
#endif
-
+
static TAILQ_HEAD(, sdt_provider) sdt_prov_list;
#ifdef __FreeBSD__
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.1 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.2
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sun Jul 17 05:18:11 2016
@@ -134,6 +134,7 @@
#include <sys/vmem.h>
#include <sys/module.h>
#include <sys/cpu.h>
+#include <sys/localcount.h>
#include <netinet/in.h>
#include "dtrace_cddl.h"
#include "dtrace_debug.c"
@@ -15337,10 +15338,23 @@ static dev_type_open(dtrace_open);
/* Pseudo Device Entry points */
/* Just opens, clones to the fileops below */
+
+struct localcount dtrace_localcount;
+
const struct cdevsw dtrace_cdevsw = {
- dtrace_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER | D_MPSAFE, NULL
+ .d_open = dtrace_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = dtrace_localcount,
+ .d_flag = D_OTHER | D_MPSAFE
};
static int dtrace_ioctl(struct file *fp, u_long cmd, void *data);
