chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c9b8045
)
unit: make sure we detect messagbus/syslog going up
author
Lennart Poettering
<lennart@poettering.net>
Wed, 7 Apr 2010 23:22:51 +0000
(
01:22
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 7 Apr 2010 23:22:51 +0000
(
01:22
+0200)
unit.c
patch
|
blob
|
history
diff --git
a/unit.c
b/unit.c
index 6b8010b5322fbc2bdbe805d1281e8e8eb7dcebc4..6fa878345fcf8f9c89ed5bd90beb4742bd8775d1 100644
(file)
--- a/
unit.c
+++ b/
unit.c
@@
-826,6
+826,8
@@
static void retroactively_stop_dependencies(Unit *u) {
}
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
}
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
+ bool unexpected = false;
+
assert(u);
assert(os < _UNIT_ACTIVE_STATE_MAX);
assert(ns < _UNIT_ACTIVE_STATE_MAX);
assert(u);
assert(os < _UNIT_ACTIVE_STATE_MAX);
assert(ns < _UNIT_ACTIVE_STATE_MAX);
@@
-862,26
+864,24
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
case JOB_START:
case JOB_VERIFY_ACTIVE:
case JOB_START:
case JOB_VERIFY_ACTIVE:
- if (UNIT_IS_ACTIVE_OR_RELOADING(ns))
{
+ if (UNIT_IS_ACTIVE_OR_RELOADING(ns))
job_finish_and_invalidate(u->meta.job, true);
job_finish_and_invalidate(u->meta.job, true);
- return;
- } else if (ns == UNIT_ACTIVATING)
- return;
- else
+ else if (ns != UNIT_ACTIVATING) {
+ unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
job_finish_and_invalidate(u->meta.job, false);
+ }
break;
case JOB_RELOAD:
case JOB_RELOAD_OR_START:
break;
case JOB_RELOAD:
case JOB_RELOAD_OR_START:
- if (ns == UNIT_ACTIVE)
{
+ if (ns == UNIT_ACTIVE)
job_finish_and_invalidate(u->meta.job, true);
job_finish_and_invalidate(u->meta.job, true);
- return;
- } else if (ns == UNIT_ACTIVATING || ns == UNIT_ACTIVE_RELOADING)
- return;
- else
+ else if (ns != UNIT_ACTIVATING && ns != UNIT_ACTIVE_RELOADING) {
+ unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
job_finish_and_invalidate(u->meta.job, false);
+ }
break;
break;
@@
-889,13
+889,12
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
case JOB_RESTART:
case JOB_TRY_RESTART:
case JOB_RESTART:
case JOB_TRY_RESTART:
- if (ns == UNIT_INACTIVE)
{
+ if (ns == UNIT_INACTIVE)
job_finish_and_invalidate(u->meta.job, true);
job_finish_and_invalidate(u->meta.job, true);
- return;
- } else if (ns == UNIT_DEACTIVATING)
- return;
- else
+ else if (ns != UNIT_DEACTIVATING) {
+ unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
job_finish_and_invalidate(u->meta.job, false);
+ }
break;
break;
@@
-908,10
+907,12
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
/* If this state change happened without being requested by a
* job, then let's retroactively start or stop dependencies */
/* If this state change happened without being requested by a
* job, then let's retroactively start or stop dependencies */
- if (UNIT_IS_INACTIVE_OR_DEACTIVATING(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns))
- retroactively_start_dependencies(u);
- else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
- retroactively_stop_dependencies(u);
+ if (unexpected) {
+ if (UNIT_IS_INACTIVE_OR_DEACTIVATING(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns))
+ retroactively_start_dependencies(u);
+ else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
+ retroactively_stop_dependencies(u);
+ }
if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns)) {
if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns)) {