From e1b8b05ef3034ede65fb84141a5a3a908304ddd5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 20 Aug 2014 13:45:31 +0200 Subject: [PATCH] Use threads for external commands refs #6589 fixes #6942 --- components/compat/externalcommandlistener.cpp | 27 +++++++++++-------- components/compat/externalcommandlistener.hpp | 1 + 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/components/compat/externalcommandlistener.cpp b/components/compat/externalcommandlistener.cpp index a4f76a4d9..f93610955 100644 --- a/components/compat/externalcommandlistener.cpp +++ b/components/compat/externalcommandlistener.cpp @@ -113,6 +113,8 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath) FILE *fp = fdopen(fd, "r"); if (fp == NULL) { + (void) close(fd); + std::ostringstream msgbuf; msgbuf << "fdopen() for fifo path '" << commandPath << "' failed with error code " << errno << ", \"" << Utility::FormatErrorNumber(errno) << "\""; Log(LogCritical, "ExternalCommandListener", msgbuf.str()); @@ -128,21 +130,24 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath) (line[strlen(line) - 1] == '\r' || line[strlen(line) - 1] == '\n')) line[strlen(line) - 1] = '\0'; - String command = line; - - try { - Log(LogInformation, "ExternalCommandListener", "Executing external command: " + command); - - ExternalCommandProcessor::Execute(command); - } catch (const std::exception&) { - std::ostringstream msgbuf; - msgbuf << "External command failed."; - Log(LogWarning, "ExternalCommandListener", msgbuf.str()); - } + Utility::QueueAsyncCallback(boost::bind(&ExternalCommandListener::ExecuteCommand, line)); } delete line; fclose(fp); } } + +void ExternalCommandListener::ExecuteCommand(const String& command) +{ + try { + Log(LogInformation, "ExternalCommandListener", "Executing external command: " + command); + + ExternalCommandProcessor::Execute(command); + } catch (const std::exception&) { + std::ostringstream msgbuf; + msgbuf << "External command failed: " << command; + Log(LogWarning, "ExternalCommandListener", msgbuf.str()); + } +} #endif /* _WIN32 */ diff --git a/components/compat/externalcommandlistener.hpp b/components/compat/externalcommandlistener.hpp index 0006aec33..342a3d2b7 100644 --- a/components/compat/externalcommandlistener.hpp +++ b/components/compat/externalcommandlistener.hpp @@ -49,6 +49,7 @@ private: boost::thread m_CommandThread; void CommandPipeThread(const String& commandPath); + static void ExecuteCommand(const String& command); #endif /* _WIN32 */ }; -- 2.40.0