maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fetchMercurial: Don't fetch hashes we already have

Browse source
This commit is contained in:
Eelco Dolstra 2017-11-01 18:43:11 +01:00
parent 1969f357b7
commit e026bc3b05
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 74 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/libutil/util.cc
View file

@ -895,32 +895,46 @@ std::vector<char *> stringsToCharPtrs(const Strings & ss)
string runProgram(Path program, bool searchPath, const Strings & args,
const std::experimental::optional<std::string> & input)
{
RunOptions opts(program, args);
opts.searchPath = searchPath;
opts.input = input;
auto res = runProgram(opts);
if (!statusOk(res.first))
throw ExecError(res.first, fmt("program '%1%' %2%", program, statusToString(res.first)));
return res.second;
}
std::pair<int, std::string> runProgram(const RunOptions & options)
{
checkInterrupt();
/* Create a pipe. */
Pipe out, in;
out.create();
if (input) in.create();
if (options.input) in.create();
/* Fork. */
Pid pid = startProcess([&]() {
if (dup2(out.writeSide.get(), STDOUT_FILENO) == -1)
throw SysError("dupping stdout");
if (input && dup2(in.readSide.get(), STDIN_FILENO) == -1)
if (options.input && dup2(in.readSide.get(), STDIN_FILENO) == -1)
throw SysError("dupping stdin");
Strings args_(args);
args_.push_front(program);
Strings args_(options.args);
args_.push_front(options.program);
restoreSignals();
if (searchPath)
execvp(program.c_str(), stringsToCharPtrs(args_).data());
if (options.searchPath)
execvp(options.program.c_str(), stringsToCharPtrs(args_).data());
else
execv(program.c_str(), stringsToCharPtrs(args_).data());
execv(options.program.c_str(), stringsToCharPtrs(args_).data());
throw SysError(format("executing '%1%'") % program);
throw SysError("executing '%1%'", options.program);
});
out.writeSide = -1;
@ -935,11 +949,11 @@ string runProgram(Path program, bool searchPath, const Strings & args,
});
if (input) {
if (options.input) {
in.readSide = -1;
writerThread = std::thread([&]() {
try {
writeFull(in.writeSide.get(), *input);
writeFull(in.writeSide.get(), *options.input);
promise.set_value();
} catch (...) {
promise.set_exception(std::current_exception());
@ -952,14 +966,11 @@ string runProgram(Path program, bool searchPath, const Strings & args,
/* Wait for the child to finish. */
int status = pid.wait();
if (!statusOk(status))
throw ExecError(status, format("program '%1%' %2%")
% program % statusToString(status));
/* Wait for the writer thread to finish. */
if (input) promise.get_future().get();
if (options.input) promise.get_future().get();
return result;
return {status, result};
}

17
src/libutil/util.hh
View file

@ -245,6 +245,23 @@ string runProgram(Path program, bool searchPath = false,
const Strings & args = Strings(),
const std::experimental::optional<std::string> & input = {});
struct RunOptions
{
Path program;
bool searchPath = true;
Strings args;
std::experimental::optional<std::string> input;
bool _killStderr = false;
RunOptions(const Path & program, const Strings & args)
: program(program), args(args) { };
RunOptions & killStderr(bool v) { _killStderr = true; return *this; }
};
std::pair<int, std::string> runProgram(const RunOptions & options);
class ExecError : public Error
{
public: