[vm/shared] Add 'dart:concurrent' core library.

This brings Mutex and ConditionVariable classes to guard access to shared variables. TEST=shared_test, shared_primitives_test BUG=dart-lang#55991 CoreLibraryReviewExempt: dart:concurrent library is experimental, restricted to main/dev channels, vm-only at this point. Change-Id: I64ca7a0434cbe0079976133ccbf9de2dd4c0d7b1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372181 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Slava Egorov <[email protected]>
jakemac53 · Jul 10, 2024 · d2bc055 · d2bc055
1 parent 98ebbcd
commit d2bc055
Show file tree

Hide file tree

Showing 60 changed files with 1,276 additions and 563 deletions.
diff --git a/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.1.expect b/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.1.expect
@@ -7,13 +7,14 @@ library from "org-dartlang-test:///main.dart" as main {
   static method foo() → dynamic {}
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.2.expect b/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.2.expect
@@ -14,13 +14,14 @@ library from "org-dartlang-test:///main.dart" as main {
   static method foo() → dynamic {}
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.3.expect b/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.3.expect
@@ -26,13 +26,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 17 platform libraries:
+And 18 platform libraries:
  - dart:_builtin
  - dart:_internal
  - dart:_vmservice
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/issue_55357.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_55357.yaml.world.1.expect
@@ -8,13 +8,14 @@ library from "org-dartlang-test:///main.dart" as main {
     return 42;
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/issue_55357.yaml.world.3.expect b/pkg/front_end/testcases/incremental/issue_55357.yaml.world.3.expect
@@ -8,13 +8,14 @@ library from "org-dartlang-test:///main.dart" as main {
     return 42;
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/...testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.1.expect b/...testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.1.expect
@@ -16,13 +16,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/...testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.2.expect b/...testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.2.expect
@@ -16,13 +16,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.1.expect
@@ -6,13 +6,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.4.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.4.expect
@@ -14,13 +14,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.5.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.5.expect
@@ -14,13 +14,14 @@ library from "org-dartlang-test:///main.dart" as main {
   }
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/patterns.yaml.world.1.expect b/pkg/front_end/testcases/incremental/patterns.yaml.world.1.expect
@@ -26,13 +26,14 @@ constants  {
   #C1 = 0
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/patterns.yaml.world.2.expect b/pkg/front_end/testcases/incremental/patterns.yaml.world.2.expect
@@ -28,13 +28,14 @@ constants  {
   #C1 = 0
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/incremental/patterns.yaml.world.3.expect b/pkg/front_end/testcases/incremental/patterns.yaml.world.3.expect
@@ -26,13 +26,14 @@ constants  {
   #C1 = 0
 }
 
-And 18 platform libraries:
+And 19 platform libraries:
  - dart:_http
  - dart:_builtin
  - dart:vmservice_io
  - dart:async
  - dart:cli
  - dart:collection
+ - dart:concurrent
  - dart:convert
  - dart:core
  - dart:developer

diff --git a/pkg/front_end/testcases/null_aware_elements/simple_positive.dart.weak.expect b/pkg/front_end/testcases/null_aware_elements/simple_positive.dart.weak.expect
@@ -7,6 +7,8 @@
 //
 // sdk/lib/collection/collection.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
 //
+// sdk/lib/concurrent/concurrent.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
+//
 // sdk/lib/convert/convert.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
 //
 // sdk/lib/developer/developer.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.

diff --git a/pkg/front_end/testcases/null_aware_elements/simple_positive.dart.weak.transformed.expect b/pkg/front_end/testcases/null_aware_elements/simple_positive.dart.weak.transformed.expect
@@ -7,6 +7,8 @@
 //
 // sdk/lib/collection/collection.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
 //
+// sdk/lib/concurrent/concurrent.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
+//
 // sdk/lib/convert/convert.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.
 //
 // sdk/lib/developer/developer.dart: Error: Loaded library is compiled with sound null safety and cannot be used in compilation for unsound null safety.

diff --git a/pkg/vm/lib/modular/target/flutter.dart b/pkg/vm/lib/modular/target/flutter.dart
@@ -23,6 +23,7 @@ class FlutterTarget extends VmTarget {
   List<String> get extraRequiredLibraries => const <String>[
         'dart:async',
         'dart:collection',
+        'dart:concurrent',
         'dart:convert',
         'dart:developer',
         'dart:ffi',

diff --git a/pkg/vm/lib/modular/target/vm.dart b/pkg/vm/lib/modular/target/vm.dart
@@ -75,6 +75,7 @@ class VmTarget extends Target {
   List<String> get extraRequiredLibraries => const <String>[
         'dart:async',
         'dart:collection',
+        'dart:concurrent',
         'dart:convert',
         'dart:developer',
         'dart:ffi',

diff --git a/pkg/vm/testcases/transformations/deferred_loading/main.dart.expect b/pkg/vm/testcases/transformations/deferred_loading/main.dart.expect
@@ -18,6 +18,7 @@ LoadingUnit(id=1, parent=0,
   dart:ffi
   dart:developer
   dart:convert
+  dart:concurrent
   dart:collection
   dart:async
   #pkg/vm/testcases/transformations/deferred_loading/c.dart

diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
@@ -14,6 +14,7 @@ import("../vm/vm_sources.gni")
 import("builtin_impl_sources.gni")
 import("builtin_sources.gni")
 import("cli_sources.gni")
+import("concurrent_impl_sources.gni")
 import("io_impl_sources.gni")
 import("io_sources.gni")
 import("native_assets_impl_sources.gni")
@@ -138,6 +139,39 @@ build_native_assets_api("native_assets_api_product") {
   ]
 }
 
+template("build_concurrent_api") {
+  extra_configs = []
+  if (defined(invoker.extra_configs)) {
+    extra_configs += invoker.extra_configs
+  }
+  source_set(target_name) {
+    configs += [ "..:dart_config" ] + extra_configs
+    deps = []
+    include_dirs = [ ".." ]
+    sources = concurrent_api_sources
+    sources += [
+      "concurrent_natives.cc",
+      "concurrent_natives.h",
+    ]
+  }
+}
+
+build_concurrent_api("concurrent_api") {
+  extra_configs = [
+    "..:dart_maybe_product_config",
+    "..:dart_os_config",
+    "..:dart_arch_config",
+  ]
+}
+
+build_concurrent_api("concurrent_api_product") {
+  extra_configs = [
+    "..:dart_product_config",
+    "..:dart_os_config",
+    "..:dart_arch_config",
+  ]
+}
+
 static_library("crashpad") {
   configs += [
     "..:dart_arch_config",
@@ -827,6 +861,12 @@ template("dart_executable") {
       deps += [ ":standalone_dart_io" ]
     }
 
+    if (use_product_mode) {
+      deps += [ ":concurrent_api_product" ]
+    } else {
+      deps += [ ":concurrent_api" ]
+    }
+
     configs += [ ":export_api_symbols" ]
 
     ldflags = extra_ldflags
@@ -1072,6 +1112,7 @@ executable("run_vm_tests") {
   }
 
   deps = [
+    ":concurrent_api",
     ":crashpad",
     ":dart_kernel_platform_cc",
     ":dart_snapshot_cc",

diff --git a/runtime/bin/builtin.cc b/runtime/bin/builtin.cc
@@ -18,6 +18,7 @@ Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {
     {DartUtils::kIOLibURL, true},
     {DartUtils::kHttpLibURL, false},
     {DartUtils::kCLILibURL, true},
+    {DartUtils::kConcurrentLibURL, true},
 
     // End marker.
     {nullptr, false}};

diff --git a/runtime/bin/builtin.h b/runtime/bin/builtin.h
@@ -24,13 +24,14 @@ namespace bin {
 class Builtin {
  public:
   // Note: Changes to this enum should be accompanied with changes to
-  // the builtin_libraries_ array in builtin.cc and builtin_nolib.cc.
+  // the builtin_libraries_ array in builtin.cc.
   enum BuiltinLibraryId {
     kInvalidLibrary = -1,
     kBuiltinLibrary = 0,
     kIOLibrary,
     kHttpLibrary,
     kCLILibrary,
+    kConcurrentLibrary,
   };
 
   // Setup native resolver method built in library specified in 'id'.

diff --git a/runtime/bin/builtin_natives.cc b/runtime/bin/builtin_natives.cc
@@ -13,6 +13,7 @@
 #include "platform/assert.h"
 
 #include "bin/builtin.h"
+#include "bin/concurrent_natives.h"
 #include "bin/dartutils.h"
 #include "bin/file.h"
 #include "bin/io_natives.h"
@@ -24,7 +25,8 @@ namespace bin {
 // Lists the native functions implementing basic functionality in
 // standalone dart, such as printing, file I/O, and platform information.
 // Advanced I/O classes like sockets and process management are implemented
-// using functions listed in io_natives.cc.
+// using functions listed in io_natives.cc and synchronization primitives -
+// in concurrent_natives.cc.
 #define BUILTIN_NATIVE_LIST(V) V(Builtin_PrintString, 1)
 
 BUILTIN_NATIVE_LIST(DECLARE_FUNCTION);
@@ -63,6 +65,10 @@ Dart_NativeFunction Builtin::NativeLookup(Dart_Handle name,
   }
   Dart_NativeFunction result =
       IONativeLookup(name, argument_count, auto_setup_scope);
+  if (result != nullptr) {
+    return result;
+  }
+  result = ConcurrentNativeLookup(name, argument_count, auto_setup_scope);
   if (result == nullptr) {
     result = Builtin_DummyNative;
   }