OrcLib: CommandAgent: handle configuration attribute 'timeout'

Author: fabienfl-orc

src/OrcLib/CommandAgent.cpp

@@ -697,6 +697,11 @@ std::shared_ptr<CommandExecute> CommandAgent::PrepareCommandExecute(const std::s
             break;
     }
 
+    if (message->GetTimeout().has_value())
+    {
+        retval->m_timeout = *message->GetTimeout();
+    }
+
     if (m_bChildDebug)
     {
         Log::Debug(L"CommandAgent: Configured dump file path '{}'", m_TempDir);
@@ -780,6 +785,17 @@ HRESULT CommandAgent::ExecuteNextCommand()
 
         if (SUCCEEDED(hr))
         {
+            if (command->GetTimeout().has_value() && command->GetTimeout()->count() != 0)
+            {
+                auto timer = std::make_shared<Concurrency::timer<CommandMessage::Message>>(
+                    (unsigned int)command->GetTimeout()->count(),
+                    CommandMessage::MakeAbortMessage(command->GetProcessHandle()),
+                    static_cast<CommandMessage::ITarget*>(&m_cmdAgentBuffer));
+
+                command->SetTimeoutTimer(timer);
+                timer->start();
+            }
+
             {
                 Concurrency::critical_section::scoped_lock s(m_cs);
                 m_RunningCommands.push_back(command);
@@ -1271,6 +1287,15 @@ void CommandAgent::run()
                 }
             }
             break;
+            case CommandMessage::Abort: {
+                Log::Info("Abort process");
+
+                if (!TerminateProcess(request->ProcessHandle(), E_ABORT))
+                {
+                    Log::Error(L"Failed to terminate process [{}]", LastWin32Error());
+                }
+            }
+            break;
             case CommandMessage::TerminateAll: {
                 Log::Critical(L"Kill all running tasks: {}", m_Keyword);
 

src/OrcLib/CommandAgent.h

@@ -77,11 +77,12 @@ class CommandAgent : public Concurrency::agent
 {
 public:
     CommandAgent(
-        CommandMessage::ISource& source,
+        CommandMessage::PriorityMessageBuffer& source,
         ArchiveMessage::ITarget& archive,
         CommandNotification::ITarget& target,
         unsigned int max_running_tasks = DEFAULT_MAX_RUNNING_PROCESSES)
-        : m_source(source)
+        : m_cmdAgentBuffer(source)
+        , m_source(source)
         , m_target(target)
         , m_archive(archive)
         , m_MaximumRunningSemaphore(max_running_tasks)
@@ -133,6 +134,7 @@ class CommandAgent : public Concurrency::agent
 
     CommandNotification::ITarget& m_target;
     CommandMessage::ISource& m_source;
+    CommandMessage::PriorityMessageBuffer& m_cmdAgentBuffer;
 
     ArchiveMessage::ITarget& m_archive;
 

src/OrcLib/CommandExecute.h

@@ -212,6 +212,10 @@ class CommandExecute
     const std::optional<std::wstring>& GetOrcTool() const { return m_orcTool; }
     void SetOrcTool(const std::optional<std::wstring>& tool) { m_orcTool = tool; }
 
+    const std::optional<std::chrono::milliseconds>& GetTimeout() const { return m_timeout; }
+
+    void SetTimeoutTimer(std::shared_ptr<void> timer) { m_timeoutTimer = std::move(timer); }
+
     ~CommandExecute(void);
 
 private:
@@ -220,6 +224,8 @@ class CommandExecute
     std::wstring m_commandLine;
     STARTUPINFO m_si;
     PROCESS_INFORMATION m_pi;
+    std::optional<std::chrono::milliseconds> m_timeout;
+    std::shared_ptr<void> m_timeoutTimer;
     std::optional<std::wstring> m_originResourceName;
     std::optional<std::wstring> m_originFriendlyName;
     std::optional<std::wstring> m_executableSha1;