Page MenuHomeFreeBSD
Files F96141259

D29746.id.diff
No OneTemporary
Actions

D29746.id.diff
View Options

diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -105,6 +105,7 @@
static int realtimer_delete(struct itimer *);
static void realtimer_clocktime(clockid_t, struct timespec *);
static void realtimer_expire(void *);
+static void realtimer_expire_l(struct itimer *it, bool proc_locked);
static int register_posix_clock(int, const struct kclock *);
static void itimer_fire(struct itimer *it);
@@ -919,7 +920,7 @@
if ((it->it_flags & ITF_PSTOPPED) != 0) {
it->it_flags &= ~ITF_PSTOPPED;
if ((it->it_flags & ITF_DELETING) == 0)
- realtimer_expire(it);
+ realtimer_expire_l(it, true);
}
ITIMER_UNLOCK(it);
}
@@ -1663,18 +1664,14 @@
.tv_nsec = (ns) % 1000000000 \
}
-/* Timeout callback for realtime timer */
static void
-realtimer_expire(void *arg)
+realtimer_expire_l(struct itimer *it, bool proc_locked)
{
struct timespec cts, ts;
struct timeval tv;
- struct itimer *it;
struct proc *p;
uint64_t interval, now, overruns, value;
- it = (struct itimer *)arg;
-
realtimer_clocktime(it->it_clockid, &cts);
/* Only fire if time is reached. */
if (timespeccmp(&cts, &it->it_time.it_value, >=)) {
@@ -1708,8 +1705,9 @@
/* single shot timer ? */
timespecclear(&it->it_time.it_value);
}
+
+ p = it->it_proc;
if (timespecisset(&it->it_time.it_value)) {
- p = it->it_proc;
if (P_SHOULDSTOP(p) || P_KILLED(p)) {
it->it_flags |= ITF_PSTOPPED;
} else {
@@ -1719,9 +1717,14 @@
realtimer_expire, it);
}
}
+
itimer_enter(it);
ITIMER_UNLOCK(it);
+ if (proc_locked)
+ PROC_UNLOCK(p);
itimer_fire(it);
+ if (proc_locked)
+ PROC_LOCK(p);
ITIMER_LOCK(it);
itimer_leave(it);
} else if (timespecisset(&it->it_time.it_value)) {
@@ -1738,6 +1741,13 @@
}
}
+/* Timeout callback for realtime timer */
+static void
+realtimer_expire(void *arg)
+{
+ realtimer_expire_l(arg, false);
+}
+
static void
itimer_fire(struct itimer *it)
{

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 24, 8:10 PM (6 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12484289
Default Alt Text
D29746.id.diff (1 KB)

Event Timeline