dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/transaction: correctly skip unneeded operations for PropagatesStopTo=

Browse Source 
Follow-up for 48cb073db8

Break out from LIST_FOREACH correctly if nt == JOB_NOP.
Shouldn't have functional changes, just optimization.
This commit is contained in:
Mike Yuan
2023-07-06 02:17:36 +08:00
parent 9d54e578f7
commit 4893902be8
1 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/core/transaction.c
View File

@@ -902,6 +902,37 @@ void transaction_add_propagate_reload_jobs(
}
}
static JobType job_type_propagate_stop_graceful(Job *j) {
JobType type;
if (!j)
return JOB_STOP;
type = JOB_STOP;
LIST_FOREACH(transaction, i, j)
switch (i->type) {
case JOB_STOP:
case JOB_RESTART:
/* Nothing to worry about, an appropriate job is in-place */
return JOB_NOP;
case JOB_START:
/* This unit is pulled in by other dependency types in this transaction. We will run
* into job type conflict if we enqueue a stop job, so let's enqueue a restart job
* instead. */
type = JOB_RESTART;
break;
default: /* We don't care about others */
;
}
return type;
}
int transaction_add_job_and_dependencies(
Transaction *tr,
JobType type,
@@ -1081,31 +1112,11 @@ int transaction_add_job_and_dependencies(
* that handles it. */
if (!by || FLAGS_SET(flags, TRANSACTION_PROCESS_PROPAGATE_STOP_GRACEFUL))
UNIT_FOREACH_DEPENDENCY(dep, ret->unit, UNIT_ATOM_PROPAGATE_STOP_GRACEFUL) {
JobType nt = JOB_STOP;
JobType nt;
Job *j;
j = hashmap_get(tr->jobs, dep);
if (j)
LIST_FOREACH(transaction, i, j)
switch (i->type) {
case JOB_STOP:
case JOB_RESTART:
/* Nothing to worry about, an appropriate job is in-place */
nt = JOB_NOP;
break;
case JOB_START:
/* This unit is pulled in by other dependency types in
* this transaction. We will run into job type conflict
* if we enqueue a stop job, so let's enqueue a restart
* job instead. */
nt = JOB_RESTART;
default: /* We don't care about others */
;
}
nt = job_type_propagate_stop_graceful(j);
if (nt == JOB_NOP)
continue;