Page MenuHomeFreeBSD
Files F115821703

D47822.id147128.diff
No OneTemporary
Actions

D47822.id147128.diff
View Options

diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -462,8 +462,10 @@
int64_t sleep_time = 0;
int64_t all_time = 0;
#endif
-#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
+#if defined(KDTRACE_HOOKS)
uintptr_t state = 0;
+#endif
+#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
int doing_lockprof = 0;
#endif
@@ -475,10 +477,10 @@
all_time -= lockstat_nsecs(&rw->lock_object);
state = v;
}
+ state = v;
#endif
#ifdef LOCK_PROFILING
doing_lockprof = 1;
- state = v;
#endif
if (SCHEDULER_STOPPED())
@@ -937,8 +939,10 @@
int64_t sleep_time = 0;
int64_t all_time = 0;
#endif
-#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
+#if defined(KDTRACE_HOOKS)
uintptr_t state = 0;
+#endif
+#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
int doing_lockprof = 0;
#endif
int extra_work = 0;
@@ -957,11 +961,11 @@
all_time -= lockstat_nsecs(&rw->lock_object);
state = v;
}
+ state = v;
#endif
#ifdef LOCK_PROFILING
extra_work = 1;
doing_lockprof = 1;
- state = v;
#endif
if (SCHEDULER_STOPPED())
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -583,8 +583,10 @@
int64_t sleep_time = 0;
int64_t all_time = 0;
#endif
-#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
+#if defined(KDTRACE_HOOKS)
uintptr_t state = 0;
+#endif
+#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
int doing_lockprof = 0;
#endif
int extra_work = 0;
@@ -602,11 +604,11 @@
all_time -= lockstat_nsecs(&sx->lock_object);
state = x;
}
+ state = x;
#endif
#ifdef LOCK_PROFILING
extra_work = 1;
doing_lockprof = 1;
- state = x;
#endif
if (SCHEDULER_STOPPED())
@@ -1035,7 +1037,7 @@
int64_t sleep_time = 0;
int64_t all_time = 0;
#endif
-#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
+#if defined(KDTRACE_HOOKS)
uintptr_t state = 0;
#endif
int extra_work __sdt_used = 0;
@@ -1050,10 +1052,10 @@
all_time -= lockstat_nsecs(&sx->lock_object);
state = x;
}
+ state = x;
#endif
#ifdef LOCK_PROFILING
extra_work = 1;
- state = x;
#endif
if (SCHEDULER_STOPPED())

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 3:49 AM (14 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17851052
Default Alt Text
D47822.id147128.diff (2 KB)

Event Timeline