X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.cpp;h=1318bd3ec2910156eb548e47f79c3711eb65261a;hb=037b1e14789223c89e88e8bd74baffa4d0956571;hp=965649545561ab79637e6e1cc5764b25df4af4ef;hpb=0ef0cbbf1a20bb0d7f7f44df604783dc0a1d23ae;p=lyx.git diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp index 9656495455..1318bd3ec2 100644 --- a/src/support/ForkedCalls.cpp +++ b/src/support/ForkedCalls.cpp @@ -21,7 +21,7 @@ #include "support/os.h" #include "support/Timeout.h" -#include +#include "support/bind.h" #include #include @@ -34,6 +34,7 @@ # define SIGKILL 9 # include # include +# undef max #else # include # include @@ -41,19 +42,9 @@ # include # endif # include -# ifndef CXX_GLOBAL_CSTD - using std::signal; - using std::strerror; -# endif #endif -using boost::bind; - -using std::endl; -using std::equal_to; -using std::find_if; -using std::string; -using std::vector; +using namespace std; namespace lyx { @@ -67,16 +58,15 @@ namespace { // ///////////////////////////////////////////////////////////////////// -class Murder : public boost::signals::trackable { +class Murder { public: // static void killItDead(int secs, pid_t pid) { - if (secs > 0) { + if (secs > 0) new Murder(secs, pid); - } else if (pid != 0) { + else if (pid != 0) support::kill(pid, SIGKILL); - } } // @@ -84,32 +74,27 @@ public: { if (pid_ != 0) support::kill(pid_, SIGKILL); - lyxerr << "Killed " << pid_ << std::endl; + lyxerr << "Killed " << pid_ << endl; delete this; } private: // Murder(int secs, pid_t pid) - : timeout_(0), pid_(pid) + : timeout_(1000*secs, Timeout::ONETIME), pid_(pid) { - timeout_ = new Timeout(1000*secs, Timeout::ONETIME); - timeout_->timeout.connect(boost::bind(&Murder::kill, this)); - timeout_->start(); + // Connection is closed with this. + timeout_.timeout.connect([this](){ kill(); }); + timeout_.start(); } // - ~Murder() - { - delete timeout_; - } - // - Timeout * timeout_; + Timeout timeout_; // pid_t pid_; }; -} // namespace anon +} // namespace ///////////////////////////////////////////////////////////////////// @@ -123,9 +108,12 @@ ForkedProcess::ForkedProcess() {} +bool ForkedProcess::IAmAChild = false; + + void ForkedProcess::emitSignal() { - if (signal_.get()) { + if (signal_) { signal_->operator()(pid_, retval_); } } @@ -134,10 +122,14 @@ void ForkedProcess::emitSignal() // Spawn the child process int ForkedProcess::run(Starttype type) { - retval_ = 0; + retval_ = 0; pid_ = generateChild(); if (pid_ <= 0) { // child or fork failed. retval_ = 1; + if (pid_ == 0) + //we also do this in fork(), too, but maybe someone will try + //to bypass that + IAmAChild = true; return retval_; } @@ -158,7 +150,7 @@ int ForkedProcess::run(Starttype type) bool ForkedProcess::running() const { - if (!pid()) + if (pid() <= 0) return false; #if !defined (_WIN32) @@ -178,31 +170,39 @@ bool ForkedProcess::running() const void ForkedProcess::kill(int tol) { lyxerr << "ForkedProcess::kill(" << tol << ')' << endl; - if (pid() == 0) { + if (pid() <= 0) { lyxerr << "Can't kill non-existent process!" << endl; return; } - // The weird (std::max)(a,b) signature prevents expansion - // of an evil MSVC macro. - int const tolerance = (std::max)(0, tol); + int const tolerance = max(0, tol); if (tolerance == 0) { // Kill it dead NOW! Murder::killItDead(0, pid()); - } else { int ret = support::kill(pid(), SIGHUP); // The process is already dead if wait_for_death is false bool const wait_for_death = (ret == 0 && errno != ESRCH); - if (wait_for_death) { + if (wait_for_death) Murder::killItDead(tolerance, pid()); - } } } +pid_t ForkedProcess::fork() { +#if !defined (HAVE_FORK) + return -1; +#else + pid_t pid = ::fork(); + if (pid == 0) + IAmAChild = true; + return pid; +#endif +} + + // Wait for child process to finish. Returns returncode from child. int ForkedProcess::waitForChild() { @@ -219,14 +219,14 @@ int ForkedProcess::waitForChild() DWORD exit_code = 0; if (!GetExitCodeProcess(hProcess, &exit_code)) { lyxerr << "GetExitCodeProcess failed waiting for child\n" - << getChildErrorMessage() << std::endl; + << getChildErrorMessage() << endl; } else retval_ = exit_code; break; } case WAIT_FAILED: lyxerr << "WaitForSingleObject failed waiting for child\n" - << getChildErrorMessage() << std::endl; + << getChildErrorMessage() << endl; break; } @@ -270,23 +270,27 @@ int ForkedProcess::waitForChild() // ///////////////////////////////////////////////////////////////////// +ForkedCall::ForkedCall(string const & path, string const & lpath) + : cmd_prefix_(to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path, lpath)))) +{} + int ForkedCall::startScript(Starttype wait, string const & what) { if (wait != Wait) { - retval_ = startScript(what, SignalTypePtr()); + retval_ = startScript(what, sigPtr()); return retval_; } - command_ = what; + command_ = commandPrep(trim(what)); signal_.reset(); return run(Wait); } -int ForkedCall::startScript(string const & what, SignalTypePtr signal) +int ForkedCall::startScript(string const & what, sigPtr signal) { - command_ = what; + command_ = commandPrep(trim(what)); signal_ = signal; return run(DontWait); @@ -296,10 +300,17 @@ int ForkedCall::startScript(string const & what, SignalTypePtr signal) // generate child in background int ForkedCall::generateChild() { - string line = trim(command_); - if (line.empty()) + if (command_.empty()) return 1; + // Make sure that a V2 python is run, if available. + string const line = cmd_prefix_ + + (prefixIs(command_, "python -tt") + ? os::python() + command_.substr(10) : command_); + +#if !defined (_WIN32) + // POSIX + // Split the input command up into an array of words stored // in a contiguous block of memory. The array contains pointers // to each word. @@ -316,37 +327,44 @@ int ForkedCall::generateChild() // 2. If we are inside quotes, then don't replace the white space // but do remove the quotes themselves. We do this naively by // replacing the quote with '\0' which is fine if quotes - // delimit the entire word. + // delimit the entire word. However, if quotes do not delimit the + // entire word (i.e., open quote is inside word), simply discard + // them such as not to break the current word. char inside_quote = 0; + char c_before_open_quote = ' '; vector::iterator it = vec.begin(); + vector::iterator itc = vec.begin(); vector::iterator const end = vec.end(); - for (; it != end; ++it) { + for (; it != end; ++it, ++itc) { char const c = *it; if (!inside_quote) { - if (c == ' ') - *it = '\0'; - else if (c == '\'' || c == '"') { -#if defined (_WIN32) - // How perverse! - // spawnvp *requires* the quotes or it will - // split the arg at the internal whitespace! - // Make shure the quote is a DOS-style one. - *it = '"'; -#else - *it = '\0'; -#endif + if (c == '\'' || c == '"') { + if (c_before_open_quote == ' ') + *itc = '\0'; + else + --itc; inside_quote = c; + } else { + if (c == ' ') + *itc = '\0'; + else + *itc = c; + c_before_open_quote = c; } } else if (c == inside_quote) { -#if defined (_WIN32) - *it = '"'; -#else - *it = '\0'; -#endif + if (c_before_open_quote == ' ') + *itc = '\0'; + else + --itc; inside_quote = 0; - } + } else + *itc = c; } + // Clear what remains. + for (; itc != end; ++itc) + *itc = '\0'; + // Build an array of pointers to each word. it = vec.begin(); vector argv; @@ -356,23 +374,20 @@ int ForkedCall::generateChild() argv.push_back(&*it); prev = *it; } - argv.push_back(0); + argv.push_back(nullptr); // Debug output. if (lyxerr.debugging(Debug::FILES)) { vector::iterator ait = argv.begin(); vector::iterator const aend = argv.end(); lyxerr << "\n\t" << line - << "\n\tInterpretted as:\n\n"; + << "\n\tInterpreted as:\n\n"; for (; ait != aend; ++ait) if (*ait) lyxerr << '\t'<< *ait << '\n'; - lyxerr << "" << std::endl; + lyxerr << "" << endl; } -#ifdef _WIN32 - pid_t const cpid = spawnvp(_P_NOWAIT, argv[0], &*argv.begin()); -#else // POSIX pid_t const cpid = ::fork(); if (cpid == 0) { // Child @@ -383,6 +398,24 @@ int ForkedCall::generateChild() << strerror(errno) << endl; _exit(1); } +#else + // Windows + + pid_t cpid = -1; + + STARTUPINFO startup; + PROCESS_INFORMATION process; + + memset(&startup, 0, sizeof(STARTUPINFO)); + memset(&process, 0, sizeof(PROCESS_INFORMATION)); + + startup.cb = sizeof(STARTUPINFO); + + if (CreateProcess(0, (LPSTR)line.c_str(), 0, 0, FALSE, + CREATE_NO_WINDOW, 0, 0, &startup, &process)) { + CloseHandle(process.hThread); + cpid = (pid_t)process.hProcess; + } #endif if (cpid < 0) { @@ -403,16 +436,16 @@ int ForkedCall::generateChild() namespace ForkedCallQueue { /// A process in the queue -typedef std::pair Process; +typedef pair Process; /** Add a process to the queue. Processes are forked sequentially * only one is running at a time. * Connect to the returned signal and you'll be informed when * the process has ended. */ -ForkedCall::SignalTypePtr add(std::string const & process); +ForkedCall::sigPtr add(string const & process); /// in-progress queue -static std::queue callQueue_; +static queue callQueue_; /// flag whether queue is running static bool running_ = 0; @@ -424,10 +457,10 @@ void stopCaller(); /// void callback(pid_t, int); -ForkedCall::SignalTypePtr add(string const & process) +ForkedCall::sigPtr add(string const & process) { - ForkedCall::SignalTypePtr ptr; - ptr.reset(new ForkedCall::SignalType); + ForkedCall::sigPtr ptr; + ptr.reset(new ForkedCall::sig); callQueue_.push(Process(process, ptr)); if (!running_) startCaller(); @@ -442,10 +475,10 @@ void callNext() Process pro = callQueue_.front(); callQueue_.pop(); // Bind our chain caller - pro.second->connect(boost::bind(&ForkedCallQueue::callback, _1, _2)); + pro.second->connect(callback); ForkedCall call; - // If we fail to fork the process, then emit the signal - // to tell the outside world that it failed. + //If we fail to fork the process, then emit the signal + //to tell the outside world that it failed. if (call.startScript(pro.first, pro.second) > 0) pro.second->operator()(0,1); } @@ -480,8 +513,7 @@ bool running() return running_; } -} // namespace ForkedCallsQueue - +} // namespace ForkedCallQueue ///////////////////////////////////////////////////////////////////// @@ -504,7 +536,7 @@ string const getChildErrorMessage() (LPTSTR) &t_message, 0, 0 ) != 0; - std::ostringstream ss; + ostringstream ss; ss << "LyX: Error waiting for child: " << error_code; if (ok) { @@ -520,8 +552,8 @@ string const getChildErrorMessage() namespace ForkedCallsController { -typedef boost::shared_ptr ForkedProcessPtr; -typedef std::list ListType; +typedef shared_ptr ForkedProcessPtr; +typedef list ListType; typedef ListType::iterator iterator; @@ -531,8 +563,8 @@ static ListType forkedCalls; iterator find_pid(pid_t pid) { return find_if(forkedCalls.begin(), forkedCalls.end(), - bind(equal_to(), - bind(&ForkedCall::pid, _1), + lyx::bind(equal_to(), + lyx::bind(&ForkedCall::pid, _1), pid)); } @@ -565,19 +597,21 @@ void handleCompletedProcesses() DWORD exit_code = 0; if (!GetExitCodeProcess(hProcess, &exit_code)) { lyxerr << "GetExitCodeProcess failed waiting for child\n" - << getChildErrorMessage() << std::endl; + << getChildErrorMessage() << endl; // Child died, so pretend it returned 1 actCall->setRetValue(1); } else { actCall->setRetValue(exit_code); } + CloseHandle(hProcess); remove_it = true; break; } case WAIT_FAILED: lyxerr << "WaitForSingleObject failed waiting for child\n" - << getChildErrorMessage() << std::endl; + << getChildErrorMessage() << endl; actCall->setRetValue(1); + CloseHandle(hProcess); remove_it = true; break; }