nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Apply clang-format universally.

Browse source 
* It is tough to contribute to a project that doesn't use a formatter,
* It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files
* Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose,

Let's rip the bandaid off?

Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge.
This commit is contained in:
Graham Christensen 2025-07-18 12:47:27 -04:00
parent 41bf87ec70
commit e4f62e4608
587 changed files with 23258 additions and 23135 deletions
Download patch file Download diff file Expand all files Collapse all files

177
src/libmain/shared.cc
View file

@ -17,7 +17,7 @@
#include <unistd.h>
#include <signal.h>
#ifdef __linux__
#include <features.h>
# include <features.h>
#endif
#include <openssl/crypto.h>
@ -30,30 +30,27 @@
namespace nix {
char * * savedArgv;
char ** savedArgv;
static bool gcWarning = true;
void printGCWarning()
{
if (!gcWarning) return;
if (!gcWarning)
return;
static bool haveWarned = false;
warnOnce(haveWarned,
warnOnce(
haveWarned,
"you did not specify '--add-root'; "
"the result might be removed by the garbage collector");
}
void printMissing(ref<Store> store, const std::vector<DerivedPath> & paths, Verbosity lvl)
{
printMissing(store, store->queryMissing(paths), lvl);
}
void printMissing(
ref<Store> store,
const MissingPaths & missing,
Verbosity lvl)
void printMissing(ref<Store> store, const MissingPaths & missing, Verbosity lvl)
{
if (!missing.willBuild.empty()) {
if (missing.willBuild.size() == 1)
@ -70,51 +67,53 @@ void printMissing(
const float downloadSizeMiB = missing.downloadSize / (1024.f * 1024.f);
const float narSizeMiB = missing.narSize / (1024.f * 1024.f);
if (missing.willSubstitute.size() == 1) {
printMsg(lvl, "this path will be fetched (%.2f MiB download, %.2f MiB unpacked):",
downloadSizeMiB,
narSizeMiB);
printMsg(
lvl, "this path will be fetched (%.2f MiB download, %.2f MiB unpacked):", downloadSizeMiB, narSizeMiB);
} else {
printMsg(lvl, "these %d paths will be fetched (%.2f MiB download, %.2f MiB unpacked):",
printMsg(
lvl,
"these %d paths will be fetched (%.2f MiB download, %.2f MiB unpacked):",
missing.willSubstitute.size(),
downloadSizeMiB,
narSizeMiB);
}
std::vector<const StorePath *> willSubstituteSorted = {};
std::for_each(missing.willSubstitute.begin(), missing.willSubstitute.end(),
[&](const StorePath &p) { willSubstituteSorted.push_back(&p); });
std::sort(willSubstituteSorted.begin(), willSubstituteSorted.end(),
[](const StorePath *lhs, const StorePath *rhs) {
if (lhs->name() == rhs->name())
return lhs->to_string() < rhs->to_string();
else
return lhs->name() < rhs->name();
});
std::for_each(missing.willSubstitute.begin(), missing.willSubstitute.end(), [&](const StorePath & p) {
willSubstituteSorted.push_back(&p);
});
std::sort(
willSubstituteSorted.begin(), willSubstituteSorted.end(), [](const StorePath * lhs, const StorePath * rhs) {
if (lhs->name() == rhs->name())
return lhs->to_string() < rhs->to_string();
else
return lhs->name() < rhs->name();
});
for (auto p : willSubstituteSorted)
printMsg(lvl, " %s", store->printStorePath(*p));
}
if (!missing.unknown.empty()) {
printMsg(lvl, "don't know how to build these paths%s:",
(settings.readOnlyMode ? " (may be caused by read-only store access)" : ""));
printMsg(
lvl,
"don't know how to build these paths%s:",
(settings.readOnlyMode ? " (may be caused by read-only store access)" : ""));
for (auto & i : missing.unknown)
printMsg(lvl, " %s", store->printStorePath(i));
}
}
std::string getArg(const std::string & opt,
Strings::iterator & i, const Strings::iterator & end)
std::string getArg(const std::string & opt, Strings::iterator & i, const Strings::iterator & end)
{
++i;
if (i == end) throw UsageError("'%1%' requires an argument", opt);
if (i == end)
throw UsageError("'%1%' requires an argument", opt);
return *i;
}
#ifndef _WIN32
static void sigHandler(int signo) { }
static void sigHandler(int signo) {}
#endif
void initNix(bool loadConfig)
{
/* Turn on buffering for cerr. */
@ -139,7 +138,8 @@ void initNix(bool loadConfig)
/* Install a dummy SIGUSR1 handler for use with pthread_kill(). */
act.sa_handler = sigHandler;
if (sigaction(SIGUSR1, &act, 0)) throw SysError("handling SIGUSR1");
if (sigaction(SIGUSR1, &act, 0))
throw SysError("handling SIGUSR1");
#endif
#ifdef __APPLE__
@ -147,19 +147,26 @@ void initNix(bool loadConfig)
* Instead, add a dummy sigaction handler, and signalHandlerThread
* can handle the rest. */
act.sa_handler = sigHandler;
if (sigaction(SIGWINCH, &act, 0)) throw SysError("handling SIGWINCH");
if (sigaction(SIGWINCH, &act, 0))
throw SysError("handling SIGWINCH");
/* Disable SA_RESTART for interrupts, so that system calls on this thread
* error with EINTR like they do on Linux.
* Most signals on BSD systems default to SA_RESTART on, but Nix
* expects EINTR from syscalls to properly exit. */
act.sa_handler = SIG_DFL;
if (sigaction(SIGINT, &act, 0)) throw SysError("handling SIGINT");
if (sigaction(SIGTERM, &act, 0)) throw SysError("handling SIGTERM");
if (sigaction(SIGHUP, &act, 0)) throw SysError("handling SIGHUP");
if (sigaction(SIGPIPE, &act, 0)) throw SysError("handling SIGPIPE");
if (sigaction(SIGQUIT, &act, 0)) throw SysError("handling SIGQUIT");
if (sigaction(SIGTRAP, &act, 0)) throw SysError("handling SIGTRAP");
if (sigaction(SIGINT, &act, 0))
throw SysError("handling SIGINT");
if (sigaction(SIGTERM, &act, 0))
throw SysError("handling SIGTERM");
if (sigaction(SIGHUP, &act, 0))
throw SysError("handling SIGHUP");
if (sigaction(SIGPIPE, &act, 0))
throw SysError("handling SIGPIPE");
if (sigaction(SIGQUIT, &act, 0))
throw SysError("handling SIGQUIT");
if (sigaction(SIGTRAP, &act, 0))
throw SysError("handling SIGTRAP");
#endif
#ifndef _WIN32
@ -176,52 +183,52 @@ void initNix(bool loadConfig)
umask(0022);
}
LegacyArgs::LegacyArgs(const std::string & programName,
LegacyArgs::LegacyArgs(
const std::string & programName,
std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
: MixCommonArgs(programName), parseArg(parseArg)
: MixCommonArgs(programName)
, parseArg(parseArg)
{
addFlag({
.longName = "no-build-output",
.shortName = 'Q',
.description = "Do not show build output.",
.handler = {[&]() {setLogFormat(LogFormat::raw); }},
.handler = {[&]() { setLogFormat(LogFormat::raw); }},
});
addFlag({
.longName = "keep-failed",
.shortName ='K',
.shortName = 'K',
.description = "Keep temporary directories of failed builds.",
.handler = {&(bool&) settings.keepFailed, true},
.handler = {&(bool &) settings.keepFailed, true},
});
addFlag({
.longName = "keep-going",
.shortName ='k',
.shortName = 'k',
.description = "Keep going after a build fails.",
.handler = {&(bool&) settings.keepGoing, true},
.handler = {&(bool &) settings.keepGoing, true},
});
addFlag({
.longName = "fallback",
.description = "Build from source if substitution fails.",
.handler = {&(bool&) settings.tryFallback, true},
.handler = {&(bool &) settings.tryFallback, true},
});
auto intSettingAlias = [&](char shortName, const std::string & longName,
const std::string & description, const std::string & dest)
{
addFlag({
.longName = longName,
.shortName = shortName,
.description = description,
.labels = {"n"},
.handler = {[=](std::string s) {
auto n = string2IntWithUnitPrefix<uint64_t>(s);
settings.set(dest, std::to_string(n));
}},
});
};
auto intSettingAlias =
[&](char shortName, const std::string & longName, const std::string & description, const std::string & dest) {
addFlag({
.longName = longName,
.shortName = shortName,
.description = description,
.labels = {"n"},
.handler = {[=](std::string s) {
auto n = string2IntWithUnitPrefix<uint64_t>(s);
settings.set(dest, std::to_string(n));
}},
});
};
intSettingAlias(0, "cores", "Maximum number of CPU cores to use inside a build.", "cores");
intSettingAlias(0, "max-silent-time", "Number of seconds of silence before a build is killed.", "max-silent-time");
@ -243,23 +250,24 @@ LegacyArgs::LegacyArgs(const std::string & programName,
.longName = "store",
.description = "The URL of the Nix store to use.",
.labels = {"store-uri"},
.handler = {&(std::string&) settings.storeUri},
.handler = {&(std::string &) settings.storeUri},
});
}
bool LegacyArgs::processFlag(Strings::iterator & pos, Strings::iterator end)
{
if (MixCommonArgs::processFlag(pos, end)) return true;
if (MixCommonArgs::processFlag(pos, end))
return true;
bool res = parseArg(pos, end);
if (res) ++pos;
if (res)
++pos;
return res;
}
bool LegacyArgs::processArgs(const Strings & args, bool finish)
{
if (args.empty()) return true;
if (args.empty())
return true;
assert(args.size() == 1);
Strings ss(args);
auto pos = ss.begin();
@ -268,21 +276,20 @@ bool LegacyArgs::processArgs(const Strings & args, bool finish)
return true;
}
void parseCmdLine(int argc, char * * argv,
std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
void parseCmdLine(
int argc, char ** argv, std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
{
parseCmdLine(std::string(baseNameOf(argv[0])), argvToStrings(argc, argv), parseArg);
}
void parseCmdLine(const std::string & programName, const Strings & args,
void parseCmdLine(
const std::string & programName,
const Strings & args,
std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
{
LegacyArgs(programName, parseArg).parseCmdline(args);
}
void printVersion(const std::string & programName)
{
std::cout << fmt("%1% (Nix) %2%", programName, nixVersion) << std::endl;
@ -296,9 +303,7 @@ void printVersion(const std::string & programName)
std::cout << "Additional system types: " << concatStringsSep(", ", settings.extraPlatforms.get()) << "\n";
std::cout << "Features: " << concatStringsSep(", ", cfg) << "\n";
std::cout << "System configuration file: " << settings.nixConfDir + "/nix.conf" << "\n";
std::cout << "User configuration files: " <<
concatStringsSep(":", settings.nixUserConfFiles)
<< "\n";
std::cout << "User configuration files: " << concatStringsSep(":", settings.nixUserConfFiles) << "\n";
std::cout << "Store directory: " << settings.nixStore << "\n";
std::cout << "State directory: " << settings.nixStateDir << "\n";
std::cout << "Data directory: " << settings.nixDataDir << "\n";
@ -349,13 +354,15 @@ int handleExceptions(const std::string & programName, std::function<void()> fun)
return 0;
}
RunPager::RunPager()
{
if (!isatty(STDOUT_FILENO)) return;
if (!isatty(STDOUT_FILENO))
return;
char * pager = getenv("NIX_PAGER");
if (!pager) pager = getenv("PAGER");
if (pager && ((std::string) pager == "" || (std::string) pager == "cat")) return;
if (!pager)
pager = getenv("PAGER");
if (pager && ((std::string) pager == "" || (std::string) pager == "cat"))
return;
logger->stop();
@ -386,7 +393,6 @@ RunPager::RunPager()
#endif
}
RunPager::~RunPager()
{
try {
@ -402,13 +408,10 @@ RunPager::~RunPager()
}
}
PrintFreed::~PrintFreed()
{
if (show)
std::cout << fmt("%d store paths deleted, %s freed\n",
results.paths.size(),
showBytes(results.bytesFreed));
std::cout << fmt("%d store paths deleted, %s freed\n", results.paths.size(), showBytes(results.bytesFreed));
}
}
} // namespace nix