max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up temp roots in a more C++ way

Browse source
This commit is contained in:
Eelco Dolstra 2014-11-19 17:07:29 +01:00
parent ed306febb5
commit 1256ab3b44
3 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libstore/gc.cc
View file

@ -145,11 +145,6 @@ Path addPermRoot(StoreAPI & store, const Path & _storePath,
} }
/* The file to which we write our temporary roots. */
static Path fnTempRoots;
static AutoCloseFD fdTempRoots;
void LocalStore::addTempRoot(const Path & path) void LocalStore::addTempRoot(const Path & path)
{ {
/* Create the temporary roots file for this process. */ /* Create the temporary roots file for this process. */
@ -204,27 +199,6 @@ void LocalStore::addTempRoot(const Path & path)
} }
void removeTempRoots()
{
if (fdTempRoots != -1) {
fdTempRoots.close();
unlink(fnTempRoots.c_str());
}
}
/* Automatically clean up the temporary roots file when we exit. */
struct RemoveTempRoots
{
~RemoveTempRoots()
{
removeTempRoots();
}
};
static RemoveTempRoots autoRemoveTempRoots __attribute__((unused));
typedef std::shared_ptr<AutoCloseFD> FDPtr; typedef std::shared_ptr<AutoCloseFD> FDPtr;
typedef list<FDPtr> FDs; typedef list<FDPtr> FDs;

9
src/libstore/local-store.cc
View file

@ -363,6 +363,15 @@ LocalStore::~LocalStore()
} catch (...) { } catch (...) {
ignoreException(); ignoreException();
} }
try {
if (fdTempRoots != -1) {
fdTempRoots.close();
unlink(fnTempRoots.c_str());
}
} catch (...) {
ignoreException();
}
} }

4
src/libstore/local-store.hh
View file

@ -244,6 +244,10 @@ private:
bool didSetSubstituterEnv; bool didSetSubstituterEnv;
/* The file to which we write our temporary roots. */
Path fnTempRoots;
AutoCloseFD fdTempRoots;
int getSchema(); int getSchema();
void openDB(bool create); void openDB(bool create);