/**
- * \file syscall.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * \file forkedcall.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
*
* Interface cleaned up by
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
*
* An instance of Class Forkedcall represents a single child process.
*
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "forkedcall.h"
#include "forkedcontr.h"
#include "lstrings.h"
#include "debug.h"
#include "frontends/Timeout.h"
+#include <boost/bind.hpp>
+
#include <cerrno>
-#include <sys/types.h>
-#include <sys/wait.h>
#include <csignal>
#include <cstdlib>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <unistd.h>
+#include <vector>
+
using std::endl;
+using std::string;
+using std::vector;
#ifndef CXX_GLOBAL_CSTD
using std::strerror;
#endif
-
-Forkedcall::Forkedcall()
- : pid_(0), retval_(0)
-{}
-
-
-int Forkedcall::startscript(Starttype wait, string const & what)
-{
- if (wait == Wait) {
- command_ = what;
- retval_ = 0;
-
- pid_ = generateChild();
- if (pid_ <= 0) { // child or fork failed.
- retval_ = 1;
- } else {
- retval_ = waitForChild();
- }
-
- return retval_;
- }
-
- // DontWait
- retval_ = startscript(what, SignalTypePtr());
- return retval_;
-}
-
-
-int Forkedcall::startscript(string const & what, SignalTypePtr signal)
-{
- command_ = what;
- signal_ = signal;
- retval_ = 0;
-
- pid_ = generateChild();
- if (pid_ <= 0) { // child or fork failed.
- retval_ = 1;
- return retval_;
- }
-
- // Non-blocking execution.
- // Integrate into the Controller
- ForkedcallsController & contr = ForkedcallsController::get();
- contr.addCall(*this);
-
- return retval_;
-}
-
-
-void Forkedcall::emitSignal()
-{
- if (signal_.get()) {
- signal_->emit(command_, pid_, retval_);
- }
-}
+namespace lyx {
+namespace support {
namespace {
-class Murder : public SigC::Object {
+class Murder : public boost::signals::trackable {
public:
//
static void killItDead(int secs, pid_t pid)
if (secs > 0) {
new Murder(secs, pid);
} else if (pid != 0) {
- lyx::kill(pid, SIGKILL);
+ lyx::support::kill(pid, SIGKILL);
}
}
void kill()
{
if (pid_ != 0) {
- lyx::kill(pid_, SIGKILL);
+ lyx::support::kill(pid_, SIGKILL);
}
lyxerr << "Killed " << pid_ << std::endl;
delete this;
: timeout_(0), pid_(pid)
{
timeout_ = new Timeout(1000*secs, Timeout::ONETIME);
- timeout_->timeout.connect(SigC::slot(this, &Murder::kill));
+ timeout_->timeout.connect(boost::bind(&Murder::kill, this));
timeout_->start();
}
} // namespace anon
-void Forkedcall::kill(int tol)
+ForkedProcess::ForkedProcess()
+ : pid_(0), retval_(0)
+{}
+
+
+void ForkedProcess::emitSignal()
{
- lyxerr << "Forkedcall::kill(" << tol << ")" << std::endl;
+ if (signal_.get()) {
+ signal_->operator()(pid_, retval_);
+ }
+}
+
+
+// Spawn the child process
+int ForkedProcess::run(Starttype type)
+{
+ retval_ = 0;
+ pid_ = generateChild();
+ if (pid_ <= 0) { // child or fork failed.
+ retval_ = 1;
+ return retval_;
+ }
+
+ switch (type) {
+ case Wait:
+ retval_ = waitForChild();
+ break;
+ case DontWait: {
+ // Integrate into the Controller
+ ForkedcallsController & contr = ForkedcallsController::get();
+ contr.addCall(*this);
+ break;
+ }
+ }
+
+ return retval_;
+}
+
+
+bool ForkedProcess::running() const
+{
+ if (!pid())
+ return false;
+
+ // Un-UNIX like, but we don't have much use for
+ // knowing if a zombie exists, so just reap it first.
+ int waitstatus;
+ waitpid(pid(), &waitstatus, WNOHANG);
+
+ // Racy of course, but it will do.
+ if (::kill(pid(), 0) && errno == ESRCH)
+ return false;
+ return true;
+}
+
+
+void ForkedProcess::kill(int tol)
+{
+ lyxerr << "ForkedProcess::kill(" << tol << ')' << endl;
if (pid() == 0) {
lyxerr << "Can't kill non-existent process!" << endl;
return;
Murder::killItDead(0, pid());
} else {
- int ret = lyx::kill(pid(), SIGHUP);
+ int ret = lyx::support::kill(pid(), SIGHUP);
// The process is already dead if wait_for_death is false
bool const wait_for_death = (ret == 0 && errno != ESRCH);
// Wait for child process to finish. Returns returncode from child.
-int Forkedcall::waitForChild() {
+int ForkedProcess::waitForChild()
+{
// We'll pretend that the child returns 1 on all error conditions.
retval_ = 1;
int status;
wait = false;
} else if (WIFSIGNALED(status)) {
lyxerr << "LyX: Child didn't catch signal "
- << WTERMSIG(status)
+ << WTERMSIG(status)
<< "and died. Too bad." << endl;
wait = false;
} else if (WIFSTOPPED(status)) {
lyxerr << "LyX: Child (pid: " << pid_
<< ") stopped on signal "
- << WSTOPSIG(status)
+ << WSTOPSIG(status)
<< ". Waiting for child to finish." << endl;
} else {
lyxerr << "LyX: Something rotten happened while "
}
+int Forkedcall::startscript(Starttype wait, string const & what)
+{
+ if (wait != Wait) {
+ retval_ = startscript(what, SignalTypePtr());
+ return retval_;
+ }
+
+ command_ = what;
+ signal_.reset();
+ return run(Wait);
+}
+
+
+int Forkedcall::startscript(string const & what, SignalTypePtr signal)
+{
+ command_ = what;
+ signal_ = signal;
+
+ return run(DontWait);
+}
+
+
// generate child in background
-pid_t Forkedcall::generateChild()
+int Forkedcall::generateChild()
{
- const int MAX_ARGV = 255;
- char *syscmd = 0;
- char *argv[MAX_ARGV];
-
- string childcommand(command_); // copy
- bool more = true;
- string rest = split(command_, childcommand, ' ');
-
- int index = 0;
- while (more) {
- childcommand = frontStrip(childcommand);
- if (syscmd == 0) {
- syscmd = new char[childcommand.length() + 1];
- childcommand.copy(syscmd, childcommand.length());
- syscmd[childcommand.length()] = '\0';
- }
- if (!childcommand.empty()) {
- char * tmp = new char[childcommand.length() + 1];
- childcommand.copy(tmp, childcommand.length());
- tmp[childcommand.length()] = '\0';
- argv[index++] = tmp;
+ string line = trim(command_);
+ if (line.empty())
+ return 1;
+
+ // Split the input command up into an array of words stored
+ // in a contiguous block of memory.
+ char const * const c_str = line.c_str();
+ // Don't forget the terminating `\0' character.
+ vector<char> vec(c_str, c_str + line.size() + 1);
+ // Turn the string into an array of words, each terminated with '\0'.
+ std::replace(vec.begin(), vec.end(), ' ', '\0');
+
+ // Build an array of pointers to each word.
+ vector<char>::iterator vit = vec.begin();
+ vector<char>::iterator vend = vec.end();
+ vector<char *> argv;
+ char prev = '\0';
+ for (; vit != vend; ++vit) {
+ if (*vit != '\0' && prev == '\0')
+ argv.push_back(&*vit);
+ prev = *vit;
+ }
+ // Strip quotes. Does so naively, assuming that the word begins
+ // and ends in quotes.
+ vector<char *>::iterator ait = argv.begin();
+ vector<char *>::iterator const aend = argv.end();
+ for (; ait != aend; ++ait) {
+ char * word = *ait;
+ std::size_t const len = strlen(word);
+ if (len >= 2) {
+ char & first = word[0];
+ char & last = word[len-1];
+
+ if (first == last &&
+ (first == '\'' || first == '"')) {
+ first = '\0';
+ last = '\0';
+ *ait += 1;
+ }
}
-
- // reinit
- more = !rest.empty();
- if (more)
- rest = split(rest, childcommand, ' ');
}
- argv[index] = 0;
+
+ ait = argv.begin();
+ for (; ait != aend; ++ait)
+ std::cout << *ait << std::endl;
+ argv.push_back(0);
#ifndef __EMX__
- pid_t cpid = ::fork();
- if (cpid == 0) { // child
- execvp(syscmd, argv);
- // If something goes wrong, we end up here:
- lyxerr << "execvp failed: "
+ pid_t const cpid = ::fork();
+ if (cpid == 0) {
+ // Child
+ execvp(argv[0], &*argv.begin());
+
+ // If something goes wrong, we end up here
+ lyxerr << "execvp of \"" << command_ << "\" failed: "
<< strerror(errno) << endl;
+ _exit(1);
}
#else
- pid_t cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND,
- syscmd, argv);
+ pid_t const cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND,
+ argv[0], &*argv.begin());
#endif
- if (cpid < 0) { // error
- lyxerr << "Could not fork: "
- << strerror(errno) << endl;
+ if (cpid < 0) {
+ // Error.
+ lyxerr << "Could not fork: " << strerror(errno) << endl;
}
return cpid;
}
+
+} // namespace support
+} // namespace lyx
projects / lyx.git / blobdiff