#include "support/os.h"
#include "support/Timeout.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <cerrno>
#include <queue>
# include <unistd.h>
# endif
# include <sys/wait.h>
-# ifndef CXX_GLOBAL_CSTD
- using std::signal;
- using std::strerror;
-# endif
#endif
-using boost::bind;
+using namespace std;
-using std::endl;
-using std::equal_to;
-using std::find_if;
-using std::string;
-using std::vector;
namespace lyx {
{
if (pid_ != 0)
support::kill(pid_, SIGKILL);
- lyxerr << "Killed " << pid_ << std::endl;
+ lyxerr << "Killed " << pid_ << endl;
delete this;
}
Murder(int secs, pid_t pid)
: timeout_(1000*secs, Timeout::ONETIME), pid_(pid)
{
- timeout_.timeout.connect(boost::bind(&Murder::kill, this));
+ timeout_.timeout.connect(lyx::bind(&Murder::kill, this));
timeout_.start();
}
{}
+bool ForkedProcess::IAmAChild = false;
+
+
void ForkedProcess::emitSignal()
{
if (signal_.get()) {
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_;
}
bool ForkedProcess::running() const
{
- if (!pid())
+ if (pid() <= 0)
return false;
#if !defined (_WIN32)
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;
}
- int const tolerance = std::max(0, tol);
+ int const tolerance = max(0, tol);
if (tolerance == 0) {
// Kill it dead NOW!
Murder::killItDead(0, 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()
{
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;
}
if (line.empty())
return 1;
+#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.
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
inside_quote = c;
}
} else if (c == inside_quote) {
-#if defined (_WIN32)
- *it = '"';
-#else
*it = '\0';
-#endif
inside_quote = 0;
}
}
for (; ait != aend; ++ait)
if (*ait)
lyxerr << '\t'<< *ait << '\n';
- lyxerr << "</command>" << std::endl;
+ lyxerr << "</command>" << 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
<< 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) {
namespace ForkedCallQueue {
/// A process in the queue
-typedef std::pair<std::string, ForkedCall::SignalTypePtr> Process;
+typedef pair<string, ForkedCall::SignalTypePtr> 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::SignalTypePtr add(string const & process);
/// in-progress queue
-static std::queue<Process> callQueue_;
+static queue<Process> callQueue_;
/// flag whether queue is running
static bool running_ = 0;
Process pro = callQueue_.front();
callQueue_.pop();
// Bind our chain caller
- pro.second->connect(boost::bind(&ForkedCallQueue::callback, _1, _2));
+ pro.second->connect(lyx::bind(&ForkedCallQueue::callback, _1, _2));
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);
}
(LPTSTR) &t_message, 0, 0
) != 0;
- std::ostringstream ss;
+ ostringstream ss;
ss << "LyX: Error waiting for child: " << error_code;
if (ok) {
namespace ForkedCallsController {
-typedef boost::shared_ptr<ForkedProcess> ForkedProcessPtr;
-typedef std::list<ForkedProcessPtr> ListType;
+typedef shared_ptr<ForkedProcess> ForkedProcessPtr;
+typedef list<ForkedProcessPtr> ListType;
typedef ListType::iterator iterator;
iterator find_pid(pid_t pid)
{
return find_if(forkedCalls.begin(), forkedCalls.end(),
- bind(equal_to<pid_t>(),
- bind(&ForkedCall::pid, _1),
+ lyx::bind(equal_to<pid_t>(),
+ lyx::bind(&ForkedCall::pid, _1),
pid));
}
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;
}