[async-loop] Migrate to new APIs
Bug: 31742
Change-Id: Ie02c3727671769a8592d9f0a9101dabd73d783e6
diff --git a/app/term/BUILD.gn b/app/term/BUILD.gn
index 1bdcdd1..0525197 100644
--- a/app/term/BUILD.gn
+++ b/app/term/BUILD.gn
@@ -47,6 +47,7 @@
"//zircon/system/fidl/fuchsia-hardware-pty:fuchsia-hardware-pty_c",
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/fdio",
"//zircon/public/lib/fit",
"//zircon/public/lib/hid",
diff --git a/app/term/main.cc b/app/term/main.cc
index 0419441..f65f012 100644
--- a/app/term/main.cc
+++ b/app/term/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <trace-provider/provider.h>
#include "src/lib/fxl/log_settings_command_line.h"
@@ -19,7 +20,7 @@
return 1;
}
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
term::App app(std::move(params));
diff --git a/bin/ui/skottie_viewer/BUILD.gn b/bin/ui/skottie_viewer/BUILD.gn
index 15bc93d..bdea6ca 100644
--- a/bin/ui/skottie_viewer/BUILD.gn
+++ b/bin/ui/skottie_viewer/BUILD.gn
@@ -38,6 +38,7 @@
"//topaz/examples/ui/lib:skia_view",
"//zircon/system/fidl/fuchsia-mem",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/trace-provider-with-fdio",
]
}
diff --git a/bin/ui/skottie_viewer/main.cc b/bin/ui/skottie_viewer/main.cc
index 47bc63a..543a250 100644
--- a/bin/ui/skottie_viewer/main.cc
+++ b/bin/ui/skottie_viewer/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/ui/base_view/cpp/view_provider_component.h>
#include <trace-provider/provider.h>
@@ -15,7 +16,7 @@
if (!fxl::SetLogSettingsFromCommandLine(command_line))
return 1;
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
scenic::ViewProviderComponent component(
diff --git a/examples/ui/intl_client_demo/BUILD.gn b/examples/ui/intl_client_demo/BUILD.gn
index cafe4e3..fb7f2db 100644
--- a/examples/ui/intl_client_demo/BUILD.gn
+++ b/examples/ui/intl_client_demo/BUILD.gn
@@ -26,6 +26,7 @@
"//topaz/examples/ui/lib:skia_fonts",
"//topaz/examples/ui/lib:skia_view",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/trace-provider-with-fdio",
]
}
diff --git a/examples/ui/intl_client_demo/main.cc b/examples/ui/intl_client_demo/main.cc
index 912e092..bc357e5 100644
--- a/examples/ui/intl_client_demo/main.cc
+++ b/examples/ui/intl_client_demo/main.cc
@@ -3,15 +3,15 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/trace-provider/provider.h>
#include <lib/ui/base_view/cpp/view_provider_component.h>
#include "intl_client_demo_view.h"
#include "src/lib/fxl/command_line.h"
#include "src/lib/fxl/log_settings_command_line.h"
-
int main(int argc, const char** argv) {
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
auto command_line = fxl::CommandLineFromArgcArgv(argc, argv);
diff --git a/examples/ui/jank/BUILD.gn b/examples/ui/jank/BUILD.gn
index 43e6d3e..9f31aa3 100644
--- a/examples/ui/jank/BUILD.gn
+++ b/examples/ui/jank/BUILD.gn
@@ -14,16 +14,17 @@
]
deps = [
- "//src/lib/fxl",
"//garnet/public/lib/ui/base_view/cpp",
"//sdk/fidl/fuchsia.fonts",
"//sdk/fidl/fuchsia.images",
"//sdk/fidl/fuchsia.ui.input",
"//sdk/lib/fidl/cpp",
+ "//src/lib/fxl",
"//third_party/skia",
"//topaz/examples/ui/lib:skia_fonts",
"//topaz/examples/ui/lib:skia_view",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/trace-provider-with-fdio",
]
}
diff --git a/examples/ui/jank/main.cc b/examples/ui/jank/main.cc
index b93bddc..4e60952 100644
--- a/examples/ui/jank/main.cc
+++ b/examples/ui/jank/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/trace-provider/provider.h>
#include <lib/ui/base_view/cpp/view_provider_component.h>
@@ -11,7 +12,7 @@
#include "topaz/examples/ui/jank/jank_view.h"
int main(int argc, const char** argv) {
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
auto command_line = fxl::CommandLineFromArgcArgv(argc, argv);
diff --git a/examples/ui/noodles/BUILD.gn b/examples/ui/noodles/BUILD.gn
index 662ecc5..35614c8 100644
--- a/examples/ui/noodles/BUILD.gn
+++ b/examples/ui/noodles/BUILD.gn
@@ -14,13 +14,14 @@
]
deps = [
- "//src/lib/fxl",
"//garnet/public/lib/ui/base_view/cpp",
"//sdk/fidl/fuchsia.images",
"//sdk/lib/fidl/cpp",
+ "//src/lib/fxl",
"//third_party/skia",
"//topaz/examples/ui/lib:skia_view",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/trace-provider-with-fdio",
]
}
diff --git a/examples/ui/noodles/main.cc b/examples/ui/noodles/main.cc
index 2d12ab5..dd7b14b 100644
--- a/examples/ui/noodles/main.cc
+++ b/examples/ui/noodles/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/trace-provider/provider.h>
#include <lib/ui/base_view/cpp/view_provider_component.h>
@@ -11,7 +12,7 @@
#include "topaz/examples/ui/noodles/noodles_view.h"
int main(int argc, const char** argv) {
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
auto command_line = fxl::CommandLineFromArgcArgv(argc, argv);
diff --git a/examples/ui/paint/BUILD.gn b/examples/ui/paint/BUILD.gn
index bdc8ee9..84de1c0 100644
--- a/examples/ui/paint/BUILD.gn
+++ b/examples/ui/paint/BUILD.gn
@@ -14,14 +14,15 @@
]
deps = [
- "//src/lib/fxl",
"//garnet/public/lib/ui/base_view/cpp",
"//sdk/fidl/fuchsia.images",
"//sdk/fidl/fuchsia.ui.input",
"//sdk/lib/fidl/cpp",
+ "//src/lib/fxl",
"//third_party/skia",
"//topaz/examples/ui/lib:skia_view",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/hid",
"//zircon/public/lib/trace-provider-with-fdio",
]
diff --git a/examples/ui/paint/main.cc b/examples/ui/paint/main.cc
index 4d5b751..210e9b3 100644
--- a/examples/ui/paint/main.cc
+++ b/examples/ui/paint/main.cc
@@ -3,15 +3,15 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/trace-provider/provider.h>
#include <lib/ui/base_view/cpp/view_provider_component.h>
#include "src/lib/fxl/command_line.h"
#include "src/lib/fxl/log_settings_command_line.h"
#include "topaz/examples/ui/paint/paint_view.h"
-
int main(int argc, const char** argv) {
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
trace::TraceProviderWithFdio trace_provider(loop.dispatcher());
auto command_line = fxl::CommandLineFromArgcArgv(argc, argv);
diff --git a/runtime/dart/utils/BUILD.gn b/runtime/dart/utils/BUILD.gn
index 7f6aa08..0ccd763 100644
--- a/runtime/dart/utils/BUILD.gn
+++ b/runtime/dart/utils/BUILD.gn
@@ -36,6 +36,7 @@
"//zircon/system/fidl/fuchsia-io",
"//zircon/system/fidl/fuchsia-mem",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/memfs",
"//zircon/public/lib/syslog",
]
diff --git a/runtime/dart/utils/tempfs.cc b/runtime/dart/utils/tempfs.cc
index 025f370..43595e0 100644
--- a/runtime/dart/utils/tempfs.cc
+++ b/runtime/dart/utils/tempfs.cc
@@ -4,11 +4,8 @@
#include "topaz/runtime/dart/utils/tempfs.h"
-#include <future>
-#include <string>
-#include <thread>
-
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/async/cpp/task.h>
#include <lib/fdio/namespace.h>
#include <lib/memfs/memfs.h>
@@ -17,6 +14,10 @@
#include <zircon/status.h>
#include <zircon/syscalls.h>
+#include <future>
+#include <string>
+#include <thread>
+
#include "topaz/runtime/dart/utils/logging.h"
namespace {
@@ -29,7 +30,8 @@
namespace dart_utils {
RunnerTemp::RunnerTemp()
- : loop_(std::make_unique<async::Loop>(&kAsyncLoopConfigNoAttachToThread)) {
+ : loop_(std::make_unique<async::Loop>(
+ &kAsyncLoopConfigNoAttachToCurrentThread)) {
loop_->StartThread("RunnerTemp");
Start();
}
diff --git a/runtime/dart_runner/BUILD.gn b/runtime/dart_runner/BUILD.gn
index c3438df..48d90ca 100644
--- a/runtime/dart_runner/BUILD.gn
+++ b/runtime/dart_runner/BUILD.gn
@@ -36,9 +36,8 @@
defines = extra_defines
- dart_deps = [
- "//third_party/dart/runtime/bin:dart_io_api${product_suffix}",
- ]
+ dart_deps =
+ [ "//third_party/dart/runtime/bin:dart_io_api${product_suffix}" ]
deps = [
"//garnet/public/lib/syslog/cpp",
@@ -52,6 +51,7 @@
"//zircon/public/lib/async-default",
"//zircon/public/lib/async-loop",
"//zircon/public/lib/async-loop-cpp",
+ "//zircon/public/lib/async-loop-default",
"//zircon/public/lib/syslog",
"//zircon/public/lib/trace",
"//zircon/public/lib/trace-provider-with-fdio",
@@ -130,9 +130,9 @@
if (!invoker.product) {
deps += [
"vmservice:vmservice_snapshot",
- observatory_target,
"//topaz/runtime/dart/profiler_symbols:dart_aot_runner",
"//topaz/runtime/dart/profiler_symbols:libdart_precompiled_runtime",
+ observatory_target,
]
if (dart_aot_sharing_basis != "") {
@@ -186,15 +186,15 @@
path = rebase_path(
get_label_info(
"//topaz/runtime/dart/profiler_symbols:libdart_precompiled_runtime",
- "target_gen_dir") + "/libdart_precompiled_runtime.dartprofilersymbols")
+ "target_gen_dir") +
+ "/libdart_precompiled_runtime.dartprofilersymbols")
dest = "libdart_precompiled_runtime.dartprofilersymbols"
},
{
path = rebase_path(
get_label_info(
"//topaz/runtime/dart/profiler_symbols:dart_aot_runner",
- "target_gen_dir") +
- "/dart_aot_runner.dartprofilersymbols")
+ "target_gen_dir") + "/dart_aot_runner.dartprofilersymbols")
dest = "dart_aot_runner.dartprofilersymbols"
},
]
@@ -215,9 +215,9 @@
]
if (!invoker.product) {
deps += [
- observatory_target,
"//topaz/runtime/dart/profiler_symbols:dart_jit_runner",
"//topaz/runtime/dart/profiler_symbols:libdart_jit",
+ observatory_target,
]
}
@@ -267,8 +267,7 @@
path = rebase_path(
get_label_info(
"//topaz/runtime/dart/profiler_symbols:dart_jit_runner",
- "target_gen_dir") +
- "/dart_jit_runner.dartprofilersymbols")
+ "target_gen_dir") + "/dart_jit_runner.dartprofilersymbols")
dest = "dart_jit_runner.dartprofilersymbols"
},
]
diff --git a/runtime/dart_runner/main.cc b/runtime/dart_runner/main.cc
index 2c6af84..21f51ea 100644
--- a/runtime/dart_runner/main.cc
+++ b/runtime/dart_runner/main.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <lib/async-loop/cpp/loop.h>
+#include <lib/async-loop/default.h>
#include <lib/syslog/cpp/logger.h>
#include <trace-provider/provider.h>
#include <trace/event.h>
@@ -27,7 +28,7 @@
#endif // !defined(DART_PRODUCT)
int main(int argc, const char** argv) {
- async::Loop loop(&kAsyncLoopConfigAttachToThread);
+ async::Loop loop(&kAsyncLoopConfigAttachToCurrentThread);
syslog::InitLogger();
@@ -42,15 +43,14 @@
#if !defined(DART_PRODUCT)
#if defined(AOT_RUNTIME)
- RegisterProfilerSymbols("pkg/data/libdart_precompiled_runtime.dartprofilersymbols",
- "libdart_precompiled_runtime.so");
- RegisterProfilerSymbols("pkg/data/dart_aot_runner.dartprofilersymbols",
- "");
+ RegisterProfilerSymbols(
+ "pkg/data/libdart_precompiled_runtime.dartprofilersymbols",
+ "libdart_precompiled_runtime.so");
+ RegisterProfilerSymbols("pkg/data/dart_aot_runner.dartprofilersymbols", "");
#else
RegisterProfilerSymbols("pkg/data/libdart_jit.dartprofilersymbols",
"libdart_jit.so");
- RegisterProfilerSymbols("pkg/data/dart_jit_runner.dartprofilersymbols",
- "");
+ RegisterProfilerSymbols("pkg/data/dart_jit_runner.dartprofilersymbols", "");
#endif // defined(AOT_RUNTIME)
#endif // !defined(DART_PRODUCT)
