mirror of
https://github.com/NixOS/nix.git
synced 2025-11-16 23:42:43 +01:00
cc24766fa6
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
148 lines
2.7 KiB
C++
148 lines
2.7 KiB
C++
#include "nix/util/serialise.hh"
|
|
#include "nix/util/util.hh"
|
|
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#ifdef _WIN32
|
|
# include <winnt.h>
|
|
# include <fileapi.h>
|
|
# include "nix/util/windows-error.hh"
|
|
#endif
|
|
|
|
namespace nix {
|
|
|
|
void writeLine(Descriptor fd, std::string s)
|
|
{
|
|
s += '\n';
|
|
writeFull(fd, s);
|
|
}
|
|
|
|
|
|
std::string drainFD(Descriptor fd, bool block, const size_t reserveSize)
|
|
{
|
|
// the parser needs two extra bytes to append terminating characters, other users will
|
|
// not care very much about the extra memory.
|
|
StringSink sink(reserveSize + 2);
|
|
#ifdef _WIN32
|
|
// non-blocking is not supported this way on Windows
|
|
assert(block);
|
|
drainFD(fd, sink);
|
|
#else
|
|
drainFD(fd, sink, block);
|
|
#endif
|
|
return std::move(sink.s);
|
|
}
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
AutoCloseFD::AutoCloseFD() : fd{INVALID_DESCRIPTOR} {}
|
|
|
|
|
|
AutoCloseFD::AutoCloseFD(Descriptor fd) : fd{fd} {}
|
|
|
|
// NOTE: This can be noexcept since we are just copying a value and resetting
|
|
// the file descriptor in the rhs.
|
|
AutoCloseFD::AutoCloseFD(AutoCloseFD && that) noexcept : fd{that.fd}
|
|
{
|
|
that.fd = INVALID_DESCRIPTOR;
|
|
}
|
|
|
|
|
|
AutoCloseFD & AutoCloseFD::operator =(AutoCloseFD && that)
|
|
{
|
|
close();
|
|
fd = that.fd;
|
|
that.fd = INVALID_DESCRIPTOR;
|
|
return *this;
|
|
}
|
|
|
|
|
|
AutoCloseFD::~AutoCloseFD()
|
|
{
|
|
try {
|
|
close();
|
|
} catch (...) {
|
|
ignoreExceptionInDestructor();
|
|
}
|
|
}
|
|
|
|
|
|
Descriptor AutoCloseFD::get() const
|
|
{
|
|
return fd;
|
|
}
|
|
|
|
|
|
void AutoCloseFD::close()
|
|
{
|
|
if (fd != INVALID_DESCRIPTOR) {
|
|
if(
|
|
#ifdef _WIN32
|
|
::CloseHandle(fd)
|
|
#else
|
|
::close(fd)
|
|
#endif
|
|
== -1)
|
|
/* This should never happen. */
|
|
throw NativeSysError("closing file descriptor %1%", fd);
|
|
fd = INVALID_DESCRIPTOR;
|
|
}
|
|
}
|
|
|
|
void AutoCloseFD::fsync() const
|
|
{
|
|
if (fd != INVALID_DESCRIPTOR) {
|
|
int result;
|
|
result =
|
|
#ifdef _WIN32
|
|
::FlushFileBuffers(fd)
|
|
#elif __APPLE__
|
|
::fcntl(fd, F_FULLFSYNC)
|
|
#else
|
|
::fsync(fd)
|
|
#endif
|
|
;
|
|
if (result == -1)
|
|
throw NativeSysError("fsync file descriptor %1%", fd);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void AutoCloseFD::startFsync() const
|
|
{
|
|
#if __linux__
|
|
if (fd != -1) {
|
|
/* Ignore failure, since fsync must be run later anyway. This is just a performance optimization. */
|
|
::sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
|
|
AutoCloseFD::operator bool() const
|
|
{
|
|
return fd != INVALID_DESCRIPTOR;
|
|
}
|
|
|
|
|
|
Descriptor AutoCloseFD::release()
|
|
{
|
|
Descriptor oldFD = fd;
|
|
fd = INVALID_DESCRIPTOR;
|
|
return oldFD;
|
|
}
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
void Pipe::close()
|
|
{
|
|
readSide.close();
|
|
writeSide.close();
|
|
}
|
|
|
|
}
|