X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Funit.h;h=03031892d0f33f8b5477218d01db5a18a356603e;hb=6124958c7bda3fed9b079e8217781480797703f5;hp=fb158d511d398a7c36febc5fc67cf4c190f3f2d6;hpb=399ab2b1ac07be5afa9708b3280d4e1a4cceb5b8;p=elogind.git diff --git a/src/unit.h b/src/unit.h index fb158d511..03031892d 100644 --- a/src/unit.h +++ b/src/unit.h @@ -80,6 +80,7 @@ enum UnitActiveState { UNIT_ACTIVE, UNIT_ACTIVE_RELOADING, UNIT_INACTIVE, + UNIT_INACTIVE_MAINTENANCE, UNIT_ACTIVATING, UNIT_DEACTIVATING, _UNIT_ACTIVE_STATE_MAX, @@ -95,7 +96,11 @@ static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) { } static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_DEACTIVATING; + return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING; +} + +static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) { + return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE; } enum UnitDependency { @@ -153,10 +158,10 @@ struct Meta { * the job for it */ Job *job; - timestamp inactive_exit_timestamp; - timestamp active_enter_timestamp; - timestamp active_exit_timestamp; - timestamp inactive_enter_timestamp; + dual_timestamp inactive_exit_timestamp; + dual_timestamp active_enter_timestamp; + dual_timestamp active_exit_timestamp; + dual_timestamp inactive_enter_timestamp; /* Counterparts in the cgroup filesystem */ CGroupBonding *cgroup_bondings;