More work on child process diagnostics buffering

2 files changed, 13 insertions, 8 deletions

diff --git a/libbuild2/version/snapshot-git.cxx b/libbuild2/version/snapshot-git.cxx
index 2ae3f5b..c4168bf 100644
--- a/libbuild2/version/snapshot-git.cxx
+++ b/libbuild2/version/snapshot-git.cxx
@@ -21,7 +21,7 @@ namespace build2
     static global_cache<snapshot, dir_path> cache;
 
     snapshot
-    extract_snapshot_git (dir_path rep_root)
+    extract_snapshot_git (context& ctx, dir_path rep_root)
     {
       if (const snapshot* r = cache.find (rep_root))
         return *r;
@@ -82,7 +82,11 @@ namespace build2
       args[args_i + 1] = "--porcelain";
       args[args_i + 2] = nullptr;
 
+      // @@ PERF: redo with custom stream reading code (then could also
+      //    get rid of context).
+      //
       r.committed = run<string> (
+        ctx,
         3 /* verbosity */,
         pp,
         args,
@@ -108,7 +112,8 @@ namespace build2
       // (reluctantly) assume that the only reason git cat-file fails is if
       // there is no HEAD (that we equal with the "new repository" condition
       // which is, strictly speaking, might not be the case either). So we
-      // suppress any diagnostics, and handle non-zero exit code.
+      // suppress any diagnostics, and handle non-zero exit code (and so no
+      // diagnostics buffering is needed, plus we are in the load phase).
       //
       string data;
 
@@ -117,12 +122,12 @@ namespace build2
       args[args_i + 2] = "HEAD";
       args[args_i + 3] = nullptr;
 
-      process pr (run_start (3     /* verbosity */,
+      process pr (run_start (3       /* verbosity */,
                              pp,
                              args,
-                             0     /* stdin  */,
-                             -1    /* stdout */,
-                             false /* error  */));
+                             0       /* stdin  */,
+                             -1      /* stdout */,
+                             {-1, 1} /* stderr (to stdout) */));
 
       string l;
       try
diff --git a/libbuild2/version/snapshot.cxx b/libbuild2/version/snapshot.cxx
index d20e633..000bcba 100644
--- a/libbuild2/version/snapshot.cxx
+++ b/libbuild2/version/snapshot.cxx
@@ -12,7 +12,7 @@ namespace build2
   namespace version
   {
     snapshot
-    extract_snapshot_git (dir_path);
+    extract_snapshot_git (context&, dir_path);
 
     static const path git (".git");
 
@@ -46,7 +46,7 @@ namespace build2
         if (butl::entry_exists (d / git,
                                 true /* follow_symlinks */,
                                 true /* ignore_errors */))
-          return extract_snapshot_git (move (d));
+          return extract_snapshot_git (rs.ctx, move (d));
       }
 
       return snapshot ();