Module Name: src
Committed By: darran
Date: Thu Mar 11 23:28:08 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
src/external/cddl/osnet/dist/uts/common/sys: dtrace.h
src/external/cddl/osnet/sys/sys: types.h
Log Message:
DTrace: fix a few build issues for tools and the dtrace provider operation
interface.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/types.h
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/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.7 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.8
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.7 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Thu Mar 11 23:28:07 2010
@@ -344,13 +344,13 @@
}
static dtrace_pops_t dtrace_provider_ops = {
- (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop,
+ (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
#if defined(sun)
(void (*)(void *, modctl_t *))dtrace_nullop,
#else
(void (*)(void *, dtrace_modctl_t *))dtrace_nullop,
#endif
- (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+ (int (*)(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,
@@ -7443,7 +7443,7 @@
if (pops->dtps_provide == NULL) {
ASSERT(pops->dtps_provide_module != NULL);
provider->dtpv_pops.dtps_provide =
- (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop;
+ (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop;
}
if (pops->dtps_provide_module == NULL) {
Index: src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.6 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.7
--- src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.6 Tue Mar 2 00:55:46 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Thu Mar 11 23:28:07 2010
@@ -2299,6 +2299,7 @@
extern void dtrace_getfsr(uint64_t *);
#endif
+#if defined(sun)
#define DTRACE_CPUFLAG_ISSET(flag) \
(cpu_core[curcpu_id].cpuc_dtrace_flags & (flag))
@@ -2307,6 +2308,16 @@
#define DTRACE_CPUFLAG_CLEAR(flag) \
(cpu_core[curcpu_id].cpuc_dtrace_flags &= ~(flag))
+#else
+#define DTRACE_CPUFLAG_ISSET(flag) \
+ (cpu_core[cpu_number()].cpuc_dtrace_flags & (flag))
+
+#define DTRACE_CPUFLAG_SET(flag) \
+ (cpu_core[cpu_number()].cpuc_dtrace_flags |= (flag))
+
+#define DTRACE_CPUFLAG_CLEAR(flag) \
+ (cpu_core[cpu_number()].cpuc_dtrace_flags &= ~(flag))
+#endif
#endif /* _KERNEL */
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.10 src/external/cddl/osnet/sys/sys/types.h:1.11
--- src/external/cddl/osnet/sys/sys/types.h:1.10 Wed Mar 10 23:41:56 2010
+++ src/external/cddl/osnet/sys/sys/types.h Thu Mar 11 23:28:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.10 2010/03/10 23:41:56 darran Exp $ */
+/* $NetBSD: types.h,v 1.11 2010/03/11 23:28:07 darran Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -68,10 +68,15 @@
#else
#include <sys/stdint.h>
#endif
+#ifdef _NETBSD_SOURCE
+#include_next <sys/types.h>
+#include_next <sys/ccompile.h>
+#else
#define _NETBSD_SOURCE
#include_next <sys/types.h>
#include_next <sys/ccompile.h>
#undef _NETBSD_SOURCE
+#endif
#ifndef _KERNEL
#include <stdarg.h>
