make "make distcheck" work

[lyx.git] / src / support / forkedcontr.h

diff --git a/src/support/forkedcontr.h b/src/support/forkedcontr.h
index 58b7e33e164bcf80b643faa010ca4570783294a8..9e88d6828930e8de20529c039f58cadb9474eba5 100644 (file)
--- a/src/support/forkedcontr.h
+++ b/src/support/forkedcontr.h
@@ -16,48 +16,34 @@
 #ifndef FORKEDCONTR_H
 #define FORKEDCONTR_H
 
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/trackable.hpp>
-
-#include <sys/types.h> // needed for pid_t
+#include <boost/shared_ptr.hpp>
 
+#include <csignal>
+//#include <sys/types.h> // needed for pid_t
 #include <list>
 #include <vector>
 
-class Timeout;
-
 namespace lyx {
 namespace support {
 
 class ForkedProcess;
 
-class ForkedcallsController : public boost::signals::trackable {
+class ForkedcallsController {
 public:
-       /// We need this to avoid warnings.
-       ForkedcallsController();
-       /** This d-tor should really be private, but making it public
-        *   allows egcs 1.1 to compile the class.
-        */
-       ~ForkedcallsController();
-
        /// Get hold of the only controller that can exist inside the process.
        static ForkedcallsController & get();
 
-       /// Add a new child process to the list of controlled processes.
-       void addCall(ForkedProcess const &);
+       /// Are there any completed child processes to be cleaned-up after?
+       bool processesCompleted() const { return current_child != -1; }
 
-       /** This method is connected to the timer. Every XX ms it is called
-        *  so that we can check on the status of the children. Those that
-        *  are found to have finished are removed from the list and their
-        *  callback function is passed the final return state.
+       /** Those child processes that are found to have finished are removed
+        *  from the list and their callback function is passed the final
+        *  return state.
         */
-       void timer();
-
-       /// Return a vector of the pids of all the controlled processes.
-       std::vector<pid_t> const getPIDs() const;
+       void handleCompletedProcesses();
 
-       /// Get the command string of the process.
-       std::string const getCommand(pid_t) const;
+       /// Add a new child process to the list of controlled processes.
+       void addCall(ForkedProcess const &);
 
        /** Kill this process prematurely and remove it from the list.
         *  The process is killed within tolerance secs.
@@ -65,22 +51,36 @@ public:
         */
        void kill(pid_t, int tolerance = 5);
 
-       /// Signal emitted when the list of current child processes changes.
-       boost::signal0<void> childrenChanged;
+       struct Data {
+               Data() : pid(0), status(0) {}
+               pid_t pid;
+               int status;
+       };
+
+       /** These data are used by the SIGCHLD handler to populate a list
+        *  of child processes that have completed and been reaped.
+        *  The associated signals are then emitted within the main LyX
+        *  event loop.
+        */
+       std::vector<Data> reaped_children;
+       sig_atomic_t current_child;
 
 private:
-       ///
+       ForkedcallsController();
        ForkedcallsController(ForkedcallsController const &);
+       ~ForkedcallsController();
+
+       typedef boost::shared_ptr<ForkedProcess> ForkedProcessPtr;
+       typedef std::list<ForkedProcessPtr> ListType;
+       typedef ListType::iterator iterator;
+
+       iterator find_pid(pid_t);
 
        /// The child processes
-       typedef std::list<ForkedProcess *> ListType;
-       ///
        ListType forkedCalls;
 
-       /** The timer. Enables us to check the status of the children
-        *  every XX ms and to invoke a callback on completion.
-        */
-       Timeout * timeout_;
+       /// Used to block SIGCHLD signals.
+       sigset_t newMask, oldMask;
 };
 
 } // namespace support