summaryrefslogtreecommitdiff
path: root/src/configuration.hpp
diff options
context:
space:
mode:
authorKrzysztof Grobelny <krzysztof.grobelny@intel.com>2020-07-03 13:35:09 +0300
committerKarol Wachowski <karol.wachowski@intel.com>2020-07-17 09:48:46 +0300
commitd113e4284674d112aff0744fe734581bd3fc4abf (patch)
tree727b644c30a050f39d5fdd21452f40d70cf1df1a /src/configuration.hpp
parent1d453d987d5ece338aad08cee315fbacf179e692 (diff)
downloadvirtual-media-d113e4284674d112aff0744fe734581bd3fc4abf.tar.xz
Fixing multiple problems with state machine in virtual media
- Previously machine did not handle AnyEvent correctly, implementation in BaseState was always run - Changing from ActiveState to ReadyState was bugged, previously only one of event SubprocessStopped or UdevNotification caused state change when it is required to wait for both - Introduced longer timer when waiting for ReadyState during Eject and ActiveState during Inject, because ndbkit can timeout during Eject and it is required to complete before next inject can success. - Added event notification when process is terminated - Added resourcess classes to handle deletion and notifications Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com> Signed-off-by: Karol Wachowski <karol.wachowski@intel.com> Change-Id: Ie914e650c2f15bd73cdc87582ea77a94997a3472 Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
Diffstat (limited to 'src/configuration.hpp')
-rw-r--r--src/configuration.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/configuration.hpp b/src/configuration.hpp
index 68606cc..25f9855 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -29,6 +29,8 @@ class Configuration
struct MountPoint
{
+ static constexpr int defaultTimeout = 30;
+
NBDDevice nbdDevice;
std::string unixSocket;
std::string endPointId;
@@ -39,7 +41,8 @@ class Configuration
static std::vector<std::string> toArgs(const MountPoint& mp)
{
- const auto timeout = std::to_string(mp.timeout.value_or(30));
+ const auto timeout =
+ std::to_string(mp.timeout.value_or(defaultTimeout));
std::vector<std::string> args = {
"-t", timeout, "-u", mp.unixSocket, mp.nbdDevice.to_path(),
"-n"};