mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-17 00:30:55 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
240 lines
5.9 KiB
C++
240 lines
5.9 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file ForkedCalls.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Asger Alstrup
|
|
* \author Angus Leeming
|
|
* \author Alfredo Braunstein
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef FORKEDCALLS_H
|
|
#define FORKEDCALLS_H
|
|
|
|
#include "support/signals.h"
|
|
#include "support/strfwd.h"
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#include <memory>
|
|
|
|
|
|
namespace lyx {
|
|
namespace support {
|
|
|
|
class ForkedProcess {
|
|
public:
|
|
///
|
|
enum Starttype {
|
|
///
|
|
Wait,
|
|
///
|
|
DontWait
|
|
};
|
|
|
|
///
|
|
ForkedProcess();
|
|
///
|
|
virtual ~ForkedProcess() {}
|
|
///
|
|
virtual std::shared_ptr<ForkedProcess> clone() const = 0;
|
|
|
|
/** A Signal signal can be emitted once the forked process
|
|
* has finished. It passes:
|
|
* the PID of the child and;
|
|
* the return value from the child.
|
|
*
|
|
* We use a signal rather than simply a callback function so that
|
|
* we can return easily to C++ methods, rather than just globally
|
|
* accessible functions.
|
|
*/
|
|
typedef signals2::signal<void(pid_t, int)> sig;
|
|
typedef sig::slot_type slot;
|
|
|
|
/** The signal is connected in the calling routine to the desired
|
|
* slot. We pass a shared_ptr rather than a reference to the signal
|
|
* because it is eminently possible for the instance of the calling
|
|
* class (and hence the signal) to be destructed before the forked
|
|
* call is complete.
|
|
*
|
|
* Use Slot::track or Signal::scoped_connection to ensure that the
|
|
* connection is closed before the slot expires.
|
|
*/
|
|
typedef std::shared_ptr<sig> sigPtr;
|
|
|
|
/** Invoking the following methods makes sense only if the command
|
|
* is running asynchronously!
|
|
*/
|
|
|
|
/** gets the PID of the child process.
|
|
* Used by the timer.
|
|
*/
|
|
pid_t pid() const { return pid_; }
|
|
|
|
/** Emit the signal.
|
|
* Used by the timer.
|
|
*/
|
|
void emitSignal();
|
|
|
|
/** Set the return value of the child process.
|
|
* Used by the timer.
|
|
*/
|
|
void setRetValue(int r) { retval_ = r; }
|
|
|
|
/// Returns the identifying command (for display in the GUI perhaps).
|
|
std::string const & command() const { return command_; }
|
|
|
|
/// is the process running ?
|
|
bool running() const;
|
|
|
|
/** Kill child prematurely.
|
|
* First, a SIGHUP is sent to the child.
|
|
* If that does not end the child process within "tolerance"
|
|
* seconds, the SIGKILL signal is sent to the child.
|
|
* When the child is dead, the callback is called.
|
|
*/
|
|
void kill(int tolerance = 5);
|
|
|
|
/// Returns true if this is a child process
|
|
static bool iAmAChild() { return IAmAChild; }
|
|
|
|
protected:
|
|
/** Spawn the child process.
|
|
* Returns returncode from child.
|
|
*/
|
|
int run(Starttype type);
|
|
|
|
/// implement our own version of fork()
|
|
/// it just returns -1 if ::fork() is not defined
|
|
/// otherwise, it forks and sets the global child-process
|
|
/// boolean IAmAChild
|
|
pid_t fork();
|
|
|
|
/// Callback function
|
|
sigPtr signal_;
|
|
|
|
/// identifying command (for display in the GUI perhaps).
|
|
std::string command_;
|
|
|
|
/// Process ID of child
|
|
pid_t pid_;
|
|
|
|
/// Return value from child
|
|
int retval_;
|
|
private:
|
|
/// generate child in background
|
|
virtual int generateChild() = 0;
|
|
|
|
///
|
|
static bool IAmAChild;
|
|
|
|
/// Wait for child process to finish. Updates returncode from child.
|
|
int waitForChild();
|
|
};
|
|
|
|
|
|
/**
|
|
* An instance of class ForkedCall represents a single child process.
|
|
*
|
|
* Class ForkedCall uses fork() and execvp() to lauch the child process.
|
|
*
|
|
* Once launched, control is returned immediately to the parent process
|
|
* but a Signal can be emitted upon completion of the child.
|
|
*
|
|
* The child process is not killed when the ForkedCall instance goes out of
|
|
* scope, but it can be killed by an explicit invocation of the kill() member
|
|
* function.
|
|
*/
|
|
|
|
class ForkedCall : public ForkedProcess {
|
|
public:
|
|
///
|
|
ForkedCall(std::string const & path = empty_string(),
|
|
std::string const & lpath = empty_string());
|
|
///
|
|
virtual std::shared_ptr<ForkedProcess> clone() const {
|
|
return std::make_shared<ForkedCall>(*this);
|
|
}
|
|
|
|
/** Start the child process.
|
|
*
|
|
* The command "what" is passed to execvp() for execution. "$$s" is
|
|
* replaced accordingly by commandPrep().
|
|
*
|
|
* There are two startScript commands available. They differ in that
|
|
* the second receives a signal that is executed on completion of
|
|
* the command. This makes sense only for a command executed
|
|
* in the background, ie DontWait.
|
|
*
|
|
* The other startscript command can be executed either blocking
|
|
* or non-blocking, but no signal will be emitted on finishing.
|
|
*/
|
|
int startScript(Starttype, std::string const & what);
|
|
|
|
///
|
|
int startScript(std::string const & what, sigPtr ptr);
|
|
|
|
private:
|
|
///
|
|
virtual int generateChild();
|
|
///
|
|
std::string cmd_prefix_;
|
|
};
|
|
|
|
|
|
/**
|
|
* This interfaces a queue of forked processes. In order not to
|
|
* hose the system with multiple processes running simultaneously, you can
|
|
* request the addition of your process to this queue and it will be
|
|
* executed when its turn comes.
|
|
*
|
|
*/
|
|
|
|
namespace ForkedCallQueue {
|
|
|
|
ForkedCall::sigPtr add(std::string const & process);
|
|
/// Query whether the queue is running a forked process now.
|
|
bool running();
|
|
|
|
} // namespace ForkedCallQueue
|
|
|
|
|
|
/**
|
|
* Control of child processes launched using fork() and execvp().
|
|
*/
|
|
|
|
namespace ForkedCallsController {
|
|
|
|
/// Add a new child process to the list of controlled processes.
|
|
void addCall(ForkedProcess const &);
|
|
|
|
/** 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 handleCompletedProcesses();
|
|
|
|
/** Kill this process prematurely and remove it from the list.
|
|
* The process is killed within tolerance secs.
|
|
* See forkedcall.[Ch] for details.
|
|
*/
|
|
void kill(pid_t, int tolerance = 5);
|
|
|
|
} // namespace ForkedCallsController
|
|
|
|
|
|
#if defined(_WIN32)
|
|
// a wrapper for GetLastError() and FormatMessage().
|
|
std::string const getChildErrorMessage();
|
|
#endif
|
|
|
|
} // namespace support
|
|
} // namespace lyx
|
|
|
|
#endif // FORKEDCALLS_H
|