Wrap soft and hard doom in an CombinedDoom.

If softdoom factor has been overridden, we shall not adjust the automatic one.

1 files changed, 17 insertions, 1 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/util/doom.h b/staging_vespalib/src/vespa/vespalib/util/doom.h
index ee0c1af3177..89421f69686 100644
--- a/staging_vespalib/src/vespa/vespalib/util/doom.h
+++ b/staging_vespalib/src/vespa/vespalib/util/doom.h
@@ -20,5 +20,21 @@ public:
     fastos::TimeStamp left() const { return _timeOfDoom - _clock.getTimeNS(); }
 };
 
-} // namespace vespalib
+class CombinedDoom {
+public:
+    CombinedDoom(const vespalib::Clock &clock, fastos::SteadyTimeStamp softDoom,
+                 fastos::SteadyTimeStamp hardDoom, bool explicitSoftDoom)
+        : _soft(clock, softDoom),
+          _hard(clock, hardDoom),
+          _isExplicitSoftDoom(explicitSoftDoom)
+    { }
+    const Doom & soft() const { return _soft; }
+    const Doom & hard() const { return _hard; }
+    bool isExplicitSoftDoom() const { return _isExplicitSoftDoom; }
+private:
+    Doom _soft;
+    Doom _hard;
+    bool _isExplicitSoftDoom;
+};
 
+}