From 708b092956f10b5c05641f90d55b209e887d52de Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 16:08:45 +0200
Subject: Run phase

---
 libbuild2/operation.cxx | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'libbuild2/operation.cxx')

diff --git a/libbuild2/operation.cxx b/libbuild2/operation.cxx
index 879d416..289b893 100644
--- a/libbuild2/operation.cxx
+++ b/libbuild2/operation.cxx
@@ -101,9 +101,10 @@ namespace build2
   {
     tracer trace ("search");
 
-    phase_lock pl (run_phase::match);
+    context& ctx (bs.ctx);
+    phase_lock pl (ctx, run_phase::match);
 
-    const target* t (bs.ctx.targets.find (tk, trace));
+    const target* t (ctx.targets.find (tk, trace));
 
     // Only do the implied buildfile if we haven't loaded one. Failed that we
     // may try go this route even though we've concluded the implied buildfile
@@ -131,8 +132,13 @@ namespace build2
   {
     tracer trace ("match");
 
+    if (ts.empty ())
+      return;
+
+    context& ctx (ts[0].as_target ().ctx);
+
     {
-      phase_lock l (run_phase::match);
+      phase_lock l (ctx, run_phase::match);
 
       // Setup progress reporting if requested.
       //
@@ -165,7 +171,7 @@ namespace build2
       size_t i (0), n (ts.size ());
       {
         atomic_count task_count (0);
-        wait_guard wg (task_count, true);
+        wait_guard wg (ctx, task_count, true);
 
         for (; i != n; ++i)
         {
@@ -245,7 +251,7 @@ namespace build2
 
     // Phase restored to load.
     //
-    assert (phase == run_phase::load);
+    assert (ctx.phase == run_phase::load);
   }
 
   void
@@ -254,6 +260,11 @@ namespace build2
   {
     tracer trace ("execute");
 
+    if (ts.empty ())
+      return;
+
+    context& ctx (ts[0].as_target ().ctx);
+
     // Reverse the order of targets if the execution mode is 'last'.
     //
     if (current_mode == execution_mode::last)
@@ -268,7 +279,7 @@ namespace build2
     default:                assert (false); // Not yet supported.
     }
 
-    phase_lock pl (run_phase::execute); // Never switched.
+    phase_lock pl (ctx, run_phase::execute); // Never switched.
 
     // Set the dry-run flag.
     //
@@ -318,7 +329,7 @@ namespace build2
     //
     {
       atomic_count task_count (0);
-      wait_guard wg (task_count);
+      wait_guard wg (ctx, task_count);
 
       for (const action_target& at: ts)
       {
-- 
cgit v1.1