mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-08 22:20:38 +02:00
3af52f845f
* nix/boost: This directory and all files inside it are removed. * nix/libstore/build.cc (Goal::trace): Use ‘std::string’ instead of ‘const format &’. (DerivationGoal::startBuilder, ...): Use ‘std::format’ or ‘std::vformat’ instead of ‘boost::format’. * nix/libstore/builtins.cc (builtinDownload): Same. * nix/libstore/derivations.cc (DerivationOutput::parseHashInfo, ...): Same. * nix/libstore/gc.cc (LocalStore::openGCLock, ...): Same. * nix/libstore/globals.cc (Settings::_get): Same. * nix/libstore/local-store.cc: (checkStoreNotSymlink, ...): Same. * nix/libstore/misc.cc (dfsVisit, showBytes): Same * nix/libstore/optimise-store.cc (makeWritable, ...): Same. * nix/libstore/pathlocks.cc (openLockFile, ...): Same. * nix/libstore/references.cc (search, scanForReferences): Same. * nix/libstore/sqlite.hh (throwSQLiteError): Use ‘std::string’ instead of ‘const format &’. * nix/libstore/sqlite.cc (throwSQLiteError): Use ‘std::string’ instead of ‘const format &’. * nix/libstore/store-api.cc (assertStorePath, ...): Use ‘std::format’ instead of ‘boost::format’. * nix/libutil/affinity.cc (setAffinityTo): Same. * nix/libutil/archive.cc (dumpContents, ...): Same. * nix/libutil/hash.cc (parseHash, parseHash32, parseHash16or32, hashFile): Same. * nix/libutil/hash.hh (parseHash, parseHash32, parseHash16or32, isHash): Same. * nix/libutil/serialise.cc : Add ‘<cassert>’ header file. * nix/libutil/spawn.cc (addPhaseAfter, ...): Use ‘std::format’ instead of ‘boost::format’. * nix/libutil/types.hh (FormatOrString): Removed. (BaseError, BaseError::addPrefix, SysError, MakeError): Use ‘std::string or std::string_view’ instead of ‘FormatOrString’. * nix/libutil/util.hh (Nest::open, printMsg_, warnOnce, expect): Same. * nix/libutil/util.cc (BaseError::BaseError, ...): Same. (writeToStderr, _interrupted): Use std::uncaught_exceptions() instead of std::uncaught_exception() * nix/nix-daemon/nix-daemon.cc (performOp, ...): Same. * nix/nix-daemon/guix-daemon.cc (string_to_bool, ...): Same. * nix/local.mk: Remove ‘libformat.a’ from ‘noinst_LIBRARIES’, remove ‘libformat_a_SOURCES’ and ‘libformat_headers’, remove ‘libformat_a_CPPFLAGS’ from ‘libutil_a_CPPFLAGS’ and ‘guix_daemon_LDADD’, update ‘AM_CXXFLAGS’ to ‘-std=c++20’. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
58 lines
1.1 KiB
C++
58 lines
1.1 KiB
C++
#include "types.hh"
|
|
#include "util.hh"
|
|
#include "affinity.hh"
|
|
|
|
#include <format>
|
|
|
|
#if HAVE_SCHED_H
|
|
#include <sched.h>
|
|
#endif
|
|
|
|
namespace nix {
|
|
|
|
|
|
#if HAVE_SCHED_SETAFFINITY
|
|
static bool didSaveAffinity = false;
|
|
static cpu_set_t savedAffinity;
|
|
#endif
|
|
|
|
|
|
void setAffinityTo(int cpu)
|
|
{
|
|
#if HAVE_SCHED_SETAFFINITY
|
|
if (sched_getaffinity(0, sizeof(cpu_set_t), &savedAffinity) == -1) return;
|
|
didSaveAffinity = true;
|
|
printMsg(lvlDebug, std::format("locking this thread to CPU {}", cpu));
|
|
cpu_set_t newAffinity;
|
|
CPU_ZERO(&newAffinity);
|
|
CPU_SET(cpu, &newAffinity);
|
|
if (sched_setaffinity(0, sizeof(cpu_set_t), &newAffinity) == -1)
|
|
printMsg(lvlError, std::format("failed to lock thread to CPU {}", cpu));
|
|
#endif
|
|
}
|
|
|
|
|
|
int lockToCurrentCPU()
|
|
{
|
|
#if HAVE_SCHED_SETAFFINITY
|
|
int cpu = sched_getcpu();
|
|
if (cpu != -1) setAffinityTo(cpu);
|
|
return cpu;
|
|
#else
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
|
|
void restoreAffinity()
|
|
{
|
|
#if HAVE_SCHED_SETAFFINITY
|
|
if (!didSaveAffinity) return;
|
|
if (sched_setaffinity(0, sizeof(cpu_set_t), &savedAffinity) == -1)
|
|
printMsg(lvlError, "failed to restore affinity %1%");
|
|
#endif
|
|
}
|
|
|
|
|
|
}
|