mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
0c67777396
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
(cherry picked from commit cc24766fa6)
106 lines
3.3 KiB
C++
106 lines
3.3 KiB
C++
#include "nix/store/serve-protocol-connection.hh"
|
|
#include "nix/store/serve-protocol-impl.hh"
|
|
#include "nix/store/build-result.hh"
|
|
#include "nix/store/derivations.hh"
|
|
|
|
namespace nix {
|
|
|
|
ServeProto::Version ServeProto::BasicClientConnection::handshake(
|
|
BufferedSink & to, Source & from, ServeProto::Version localVersion, std::string_view host)
|
|
{
|
|
to << SERVE_MAGIC_1 << localVersion;
|
|
to.flush();
|
|
|
|
unsigned int magic = readInt(from);
|
|
if (magic != SERVE_MAGIC_2)
|
|
throw Error("'nix-store --serve' protocol mismatch from '%s'", host);
|
|
auto remoteVersion = readInt(from);
|
|
if (GET_PROTOCOL_MAJOR(remoteVersion) != 0x200)
|
|
throw Error("unsupported 'nix-store --serve' protocol version on '%s'", host);
|
|
return std::min(remoteVersion, localVersion);
|
|
}
|
|
|
|
ServeProto::Version
|
|
ServeProto::BasicServerConnection::handshake(BufferedSink & to, Source & from, ServeProto::Version localVersion)
|
|
{
|
|
unsigned int magic = readInt(from);
|
|
if (magic != SERVE_MAGIC_1)
|
|
throw Error("protocol mismatch");
|
|
to << SERVE_MAGIC_2 << localVersion;
|
|
to.flush();
|
|
auto remoteVersion = readInt(from);
|
|
return std::min(remoteVersion, localVersion);
|
|
}
|
|
|
|
StorePathSet ServeProto::BasicClientConnection::queryValidPaths(
|
|
const StoreDirConfig & store, bool lock, const StorePathSet & paths, SubstituteFlag maybeSubstitute)
|
|
{
|
|
to << ServeProto::Command::QueryValidPaths << lock << maybeSubstitute;
|
|
write(store, *this, paths);
|
|
to.flush();
|
|
|
|
return Serialise<StorePathSet>::read(store, *this);
|
|
}
|
|
|
|
std::map<StorePath, UnkeyedValidPathInfo>
|
|
ServeProto::BasicClientConnection::queryPathInfos(const StoreDirConfig & store, const StorePathSet & paths)
|
|
{
|
|
std::map<StorePath, UnkeyedValidPathInfo> infos;
|
|
|
|
to << ServeProto::Command::QueryPathInfos;
|
|
ServeProto::write(store, *this, paths);
|
|
to.flush();
|
|
|
|
while (true) {
|
|
auto storePathS = readString(from);
|
|
if (storePathS == "")
|
|
break;
|
|
|
|
auto storePath = store.parseStorePath(storePathS);
|
|
assert(paths.count(storePath) == 1);
|
|
auto info = ServeProto::Serialise<UnkeyedValidPathInfo>::read(store, *this);
|
|
infos.insert_or_assign(std::move(storePath), std::move(info));
|
|
}
|
|
|
|
return infos;
|
|
}
|
|
|
|
void ServeProto::BasicClientConnection::putBuildDerivationRequest(
|
|
const StoreDirConfig & store,
|
|
const StorePath & drvPath,
|
|
const BasicDerivation & drv,
|
|
const ServeProto::BuildOptions & options)
|
|
{
|
|
to << ServeProto::Command::BuildDerivation << store.printStorePath(drvPath);
|
|
writeDerivation(to, store, drv);
|
|
|
|
ServeProto::write(store, *this, options);
|
|
|
|
to.flush();
|
|
}
|
|
|
|
BuildResult ServeProto::BasicClientConnection::getBuildDerivationResponse(const StoreDirConfig & store)
|
|
{
|
|
return ServeProto::Serialise<BuildResult>::read(store, *this);
|
|
}
|
|
|
|
void ServeProto::BasicClientConnection::narFromPath(
|
|
const StoreDirConfig & store, const StorePath & path, std::function<void(Source &)> fun)
|
|
{
|
|
to << ServeProto::Command::DumpStorePath << store.printStorePath(path);
|
|
to.flush();
|
|
|
|
fun(from);
|
|
}
|
|
|
|
void ServeProto::BasicClientConnection::importPaths(const StoreDirConfig & store, std::function<void(Sink &)> fun)
|
|
{
|
|
to << ServeProto::Command::ImportPaths;
|
|
fun(to);
|
|
to.flush();
|
|
|
|
if (readInt(from) != 1)
|
|
throw Error("remote machine failed to import closure");
|
|
}
|
|
|
|
}
|