mirror of
https://github.com/systemd/systemd
synced 2025-12-28 11:54:45 +01:00
Compare commits
2 Commits
e11ec61d65
...
e9eec8b5d2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9eec8b5d2 | ||
|
|
cb9d621ebb |
@ -375,10 +375,6 @@ static int scope_start(Unit *u) {
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Now u->pids have been moved into the scope cgroup, it's not needed
|
|
||||||
* anymore. */
|
|
||||||
u->pids = set_free(u->pids);
|
|
||||||
|
|
||||||
s->result = SCOPE_SUCCESS;
|
s->result = SCOPE_SUCCESS;
|
||||||
|
|
||||||
scope_set_state(s, SCOPE_RUNNING);
|
scope_set_state(s, SCOPE_RUNNING);
|
||||||
@ -386,7 +382,13 @@ static int scope_start(Unit *u) {
|
|||||||
/* Set the maximum runtime timeout. */
|
/* Set the maximum runtime timeout. */
|
||||||
scope_arm_timer(s, usec_add(UNIT(s)->active_enter_timestamp.monotonic, s->runtime_max_usec));
|
scope_arm_timer(s, usec_add(UNIT(s)->active_enter_timestamp.monotonic, s->runtime_max_usec));
|
||||||
|
|
||||||
/* Start watching the PIDs currently in the scope */
|
/* On unified we use proper notifications hence we can unwatch the PIDs
|
||||||
|
* we just attached to the scope. This can also be done on legacy as
|
||||||
|
* we're going to update the list of the processes we watch with the
|
||||||
|
* PIDs currently in the scope anyway. */
|
||||||
|
unit_unwatch_all_pids(u);
|
||||||
|
|
||||||
|
/* Start watching the PIDs currently in the scope (legacy hierarchy only) */
|
||||||
(void) unit_enqueue_rewatch_pids(u);
|
(void) unit_enqueue_rewatch_pids(u);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3725,7 +3725,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
|
|||||||
this_run = now(CLOCK_MONOTONIC);
|
this_run = now(CLOCK_MONOTONIC);
|
||||||
|
|
||||||
l = u64log2(this_run - e->last_run);
|
l = u64log2(this_run - e->last_run);
|
||||||
assert(l < sizeof(e->delays));
|
assert(l < ELEMENTSOF(e->delays));
|
||||||
e->delays[l]++;
|
e->delays[l]++;
|
||||||
|
|
||||||
if (this_run - e->last_log >= 5*USEC_PER_SEC) {
|
if (this_run - e->last_log >= 5*USEC_PER_SEC) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user