Page MenuHomeFreeBSD
Files F148441917

D47657.id146738.diff
No OneTemporary
Actions

D47657.id146738.diff
View Options

diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -143,7 +143,7 @@
IFLIB opt_iflib.h
KDTRACE_HOOKS opt_global.h
KDTRACE_FRAME opt_kdtrace.h
-KDTRACE_NO_MIB_SDT opt_global.h
+KDTRACE_MIB_SDT opt_global.h
KN_HASHSIZE opt_kqueue.h
KSTACK_MAX_PAGES
KSTACK_PAGES
diff --git a/sys/conf/std.debug b/sys/conf/std.debug
--- a/sys/conf/std.debug
+++ b/sys/conf/std.debug
@@ -15,3 +15,4 @@
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default
options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence
+options KDTRACE_MIB_SDT # Add SDT probes to network counters
diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug
--- a/sys/conf/std.nodebug
+++ b/sys/conf/std.nodebug
@@ -15,6 +15,7 @@
nooptions KCOV
nooptions MALLOC_DEBUG_MAXZONES
nooptions QUEUE_MACRO_DEBUG_TRASH
+nooptions KDTRACE_MIB_SDT
# Net80211 debugging
nooptions IEEE80211_DEBUG
diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h
--- a/sys/netinet/in_kdtrace.h
+++ b/sys/netinet/in_kdtrace.h
@@ -54,7 +54,7 @@
SDT_PROVIDER_DECLARE(udp);
SDT_PROVIDER_DECLARE(udplite);
-#ifndef KDTRACE_NO_MIB_SDT
+#ifdef KDTRACE_MIB_SDT
SDT_PROVIDER_DECLARE(mib);
SDT_PROBE_DECLARE(mib, ip, count, ips_total);
diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c
--- a/sys/netinet/in_kdtrace.c
+++ b/sys/netinet/in_kdtrace.c
@@ -36,7 +36,7 @@
SDT_PROVIDER_DEFINE(udp);
SDT_PROVIDER_DEFINE(udplite);
-#ifndef KDTRACE_NO_MIB_SDT
+#ifdef KDTRACE_MIB_SDT
#define MIB_PROBE_IP(name) \
SDT_PROBE_DEFINE1(mib, ip, count, name, \
"int")
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -357,7 +357,7 @@
(uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \
(uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5)
-#ifndef KDTRACE_NO_MIB_SDT
+#ifdef KDTRACE_MIB_SDT
#define MIB_SDT_PROBE1(...) SDT_PROBE1(mib, __VA_ARGS__)
#define MIB_SDT_PROBE2(...) SDT_PROBE2(mib, __VA_ARGS__)
#else

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 10:07 PM (5 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29928935
Default Alt Text
D47657.id146738.diff (2 KB)

Event Timeline