[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/27: Rename 'initChild' to 'runChild'.
From: |
Ludovic Courtès |
Subject: |
01/27: Rename 'initChild' to 'runChild'. |
Date: |
Wed, 03 Jun 2015 22:00:31 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 909f1260e269e354c86c833ffb4ca27c9fb135f4
Author: Ludovic Courtès <address@hidden>
Date: Wed Jun 3 17:45:32 2015 +0200
Rename 'initChild' to 'runChild'.
This is similar to commit b5ed5b6 in upstream Nix.
---
nix/libstore/build.cc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 009fcb2..ccffd8d 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -764,7 +764,7 @@ private:
typedef void (DerivationGoal::*GoalState)();
GoalState state;
- /* Stuff we need to pass to initChild(). */
+ /* Stuff we need to pass to runChild(). */
typedef map<Path, Path> DirsInChroot; // maps target path to source path
DirsInChroot dirsInChroot;
typedef map<string, string> Environment;
@@ -828,8 +828,8 @@ private:
/* Start building a derivation. */
void startBuilder();
- /* Initialise the builder's process. */
- void initChild();
+ /* Run the builder's process. */
+ void runChild();
friend int childEntry(void *);
@@ -1612,7 +1612,7 @@ void chmod_(const Path & path, mode_t mode)
int childEntry(void * arg)
{
- ((DerivationGoal *) arg)->initChild();
+ ((DerivationGoal *) arg)->runChild();
return 1;
}
@@ -1970,7 +1970,7 @@ void DerivationGoal::startBuilder()
#endif
{
pid = fork();
- if (pid == 0) initChild();
+ if (pid == 0) runChild();
}
if (pid == -1) throw SysError("unable to fork");
@@ -1993,7 +1993,7 @@ void DerivationGoal::startBuilder()
}
-void DerivationGoal::initChild()
+void DerivationGoal::runChild()
{
/* Warning: in the child we should absolutely not make any SQLite
calls! */
- branch nix updated (3bfa70b -> e531520), Ludovic Courtès, 2015/06/03
- 01/27: Rename 'initChild' to 'runChild'.,
Ludovic Courtès <=
- 02/27: Use PR_SET_PDEATHSIG to ensure child cleanup, Ludovic Courtès, 2015/06/03
- 04/27: Get rid of unnecessary "interrupted by the user" message with -vvv, Ludovic Courtès, 2015/06/03
- 03/27: Remove tabs, Ludovic Courtès, 2015/06/03
- 07/27: Shut up a Valgrind warning, Ludovic Courtès, 2015/06/03
- 06/27: Fix some memory leaks, Ludovic Courtès, 2015/06/03
- 08/27: Silence some warnings on GCC 4.9, Ludovic Courtès, 2015/06/03
- 09/27: Better error message, Ludovic Courtès, 2015/06/03
- 10/27: Explicitly include required C headers, Ludovic Courtès, 2015/06/03
- 05/27: Ensure we're writing to stderr in the builder, Ludovic Courtès, 2015/06/03
- 12/27: libutil: Improve errmsg on readLink size mismatch., Ludovic Courtès, 2015/06/03