From 92dd62e0e565f177ab5861a9511bc0e303f61a79 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 23 Aug 2019 14:54:53 +0200
Subject: scheduler

---
 libbuild2/test/rule.cxx               | 32 ++++++++++++++++----------------
 libbuild2/test/script/builtin.cxx     |  4 ++--
 libbuild2/test/script/parser.cxx      | 26 +++++++++++++-------------
 libbuild2/test/script/parser.test.cxx |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'libbuild2/test')

diff --git a/libbuild2/test/rule.cxx b/libbuild2/test/rule.cxx
index c0ece26..c216e66 100644
--- a/libbuild2/test/rule.cxx
+++ b/libbuild2/test/rule.cxx
@@ -542,22 +542,22 @@ namespace build2
           {
             scope_state& r (res.back ());
 
-            if (!sched.async (ctx.count_busy (),
-                              t[a].task_count,
-                              [this] (const diag_frame* ds,
-                                      scope_state& r,
-                                      const target& t,
-                                      const testscript& ts,
-                                      const dir_path& wd)
-                              {
-                                diag_frame::stack_guard dsg (ds);
-                                r = perform_script_impl (t, ts, wd, *this);
-                              },
-                              diag_frame::stack (),
-                              ref (r),
-                              cref (t),
-                              cref (ts),
-                              cref (wd)))
+            if (!ctx.sched.async (ctx.count_busy (),
+                                  t[a].task_count,
+                                  [this] (const diag_frame* ds,
+                                          scope_state& r,
+                                          const target& t,
+                                          const testscript& ts,
+                                          const dir_path& wd)
+                                  {
+                                    diag_frame::stack_guard dsg (ds);
+                                    r = perform_script_impl (t, ts, wd, *this);
+                                  },
+                                  diag_frame::stack (),
+                                  ref (r),
+                                  cref (t),
+                                  cref (ts),
+                                  cref (wd)))
             {
               // Executed synchronously. If failed and we were not asked to
               // keep going, bail out.
diff --git a/libbuild2/test/script/builtin.cxx b/libbuild2/test/script/builtin.cxx
index a725e17..06b0cec 100644
--- a/libbuild2/test/script/builtin.cxx
+++ b/libbuild2/test/script/builtin.cxx
@@ -1583,7 +1583,7 @@ namespace build2
       // Note: can be executed synchronously.
       //
       static uint8_t
-      sleep (scope&,
+      sleep (scope& s,
              const strings& args,
              auto_fd in, auto_fd out, auto_fd err) noexcept
       try
@@ -1637,7 +1637,7 @@ namespace build2
           // If/when required we could probably support the precise sleep mode
           // (e.g., via an option).
           //
-          sched.sleep (chrono::seconds (n));
+          s.root.test_target.ctx.sched.sleep (chrono::seconds (n));
 
           r = 0;
         }
diff --git a/libbuild2/test/script/parser.cxx b/libbuild2/test/script/parser.cxx
index 582237a..8b8f705 100644
--- a/libbuild2/test/script/parser.cxx
+++ b/libbuild2/test/script/parser.cxx
@@ -3016,19 +3016,19 @@ namespace build2
                 // UBSan workaround.
                 //
                 const diag_frame* df (diag_frame::stack ());
-                if (!sched.async (task_count,
-                                  [] (const diag_frame* ds,
-                                      scope& s,
-                                      script& scr,
-                                      runner& r)
-                                  {
-                                    diag_frame::stack_guard dsg (ds);
-                                    execute_impl (s, scr, r);
-                                  },
-                                  df,
-                                  ref (*chain),
-                                  ref (*script_),
-                                  ref (*runner_)))
+                if (!ctx.sched.async (task_count,
+                                      [] (const diag_frame* ds,
+                                          scope& s,
+                                          script& scr,
+                                          runner& r)
+                                      {
+                                        diag_frame::stack_guard dsg (ds);
+                                        execute_impl (s, scr, r);
+                                      },
+                                      df,
+                                      ref (*chain),
+                                      ref (*script_),
+                                      ref (*runner_)))
                 {
                   // Bail out if the scope has failed and we weren't instructed
                   // to keep going.
diff --git a/libbuild2/test/script/parser.test.cxx b/libbuild2/test/script/parser.test.cxx
index e45674b..56630fe 100644
--- a/libbuild2/test/script/parser.test.cxx
+++ b/libbuild2/test/script/parser.test.cxx
@@ -155,7 +155,7 @@ namespace build2
         //
         init_diag (1);
         init (nullptr, argv[0]);
-        sched.startup (1);  // Serial execution.
+        scheduler sched (1); // Serial execution.
         context ctx (sched);
 
         bool scope (false);
-- 
cgit v1.1