[7.4.0] Use worker threads for module extension eval (#23504)

Cherry-picks of: * c5c5db4 * d24f947 * 23e5ec1 * bf27b7d
bazelbuild · Sep 4, 2024 · 4ff8340 · 4ff8340
1 parent 7a18311
commit 4ff8340
Show file tree

Hide file tree

Showing 25 changed files with 1,280 additions and 1,078 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -89,8 +89,8 @@ maven.install(
         "com.google.auto:auto-common:1.2.1",
         "com.google.auto.service:auto-service:1.0",
         "com.google.auto.service:auto-service-annotations:1.0.1",
-        "com.google.auto.value:auto-value:1.8.2",
-        "com.google.auto.value:auto-value-annotations:1.9",
+        "com.google.auto.value:auto-value:1.11.0",
+        "com.google.auto.value:auto-value-annotations:1.11.0",
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.9.0",
         "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/maven_install.json b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -217313117,
-  "__RESOLVED_ARTIFACTS_HASH": 1427942467,
+  "__INPUT_ARTIFACTS_HASH": -2030624926,
+  "__RESOLVED_ARTIFACTS_HASH": 1927415688,
   "conflict_resolution": {
     "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.9.0",
     "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.22.0",
@@ -92,15 +92,15 @@
     },
     "com.google.auto.value:auto-value": {
       "shasums": {
-        "jar": "2067b788d4c1c96fd621ad861053a5c4d8a801cfafc77fec20d49a6e9340a745"
+        "jar": "aaf8d637bfed3c420436b9facf1b7a88d12c8785374e4202382783005319c2c3"
       },
-      "version": "1.8.2"
+      "version": "1.11.0"
     },
     "com.google.auto.value:auto-value-annotations": {
       "shasums": {
-        "jar": "fa5469f4c44ee598a2d8f033ab0a9dcbc6498a0c5e0c998dfa0c2adf51358044"
+        "jar": "5a055ce4255333b3346e1a8703da5bf8ff049532286fdcd31712d624abe111dd"
       },
-      "version": "1.9"
+      "version": "1.11.0"
     },
     "com.google.auto:auto-common": {
       "shasums": {
@@ -1277,23 +1277,33 @@
       "com.google.auto.service"
     ],
     "com.google.auto.value:auto-value": [
-      "autovalue.shaded.com.google$.auto.common",
-      "autovalue.shaded.com.google$.auto.service",
-      "autovalue.shaded.com.google$.common.annotations",
-      "autovalue.shaded.com.google$.common.base",
-      "autovalue.shaded.com.google$.common.collect",
-      "autovalue.shaded.com.google$.common.hash",
-      "autovalue.shaded.com.google$.common.math",
-      "autovalue.shaded.com.google$.common.primitives",
-      "autovalue.shaded.com.google$.common.reflect",
-      "autovalue.shaded.com.google$.errorprone.annotations",
-      "autovalue.shaded.com.google$.errorprone.annotations.concurrent",
-      "autovalue.shaded.com.google$.escapevelocity",
-      "autovalue.shaded.com.google$.j2objc.annotations",
-      "autovalue.shaded.com.squareup.javapoet$",
-      "autovalue.shaded.net.ltgt.gradle.incap$",
-      "autovalue.shaded.org.checkerframework$.checker.nullness.qual",
-      "autovalue.shaded.org.checkerframework$.framework.qual",
+      "autovalue.shaded.com.google.auto.common",
+      "autovalue.shaded.com.google.auto.service",
+      "autovalue.shaded.com.google.common.annotations",
+      "autovalue.shaded.com.google.common.base",
+      "autovalue.shaded.com.google.common.cache",
+      "autovalue.shaded.com.google.common.collect",
+      "autovalue.shaded.com.google.common.escape",
+      "autovalue.shaded.com.google.common.eventbus",
+      "autovalue.shaded.com.google.common.graph",
+      "autovalue.shaded.com.google.common.hash",
+      "autovalue.shaded.com.google.common.html",
+      "autovalue.shaded.com.google.common.io",
+      "autovalue.shaded.com.google.common.math",
+      "autovalue.shaded.com.google.common.net",
+      "autovalue.shaded.com.google.common.primitives",
+      "autovalue.shaded.com.google.common.reflect",
+      "autovalue.shaded.com.google.common.util.concurrent",
+      "autovalue.shaded.com.google.common.xml",
+      "autovalue.shaded.com.google.errorprone.annotations",
+      "autovalue.shaded.com.google.errorprone.annotations.concurrent",
+      "autovalue.shaded.com.google.escapevelocity",
+      "autovalue.shaded.com.google.j2objc.annotations",
+      "autovalue.shaded.com.squareup.javapoet",
+      "autovalue.shaded.net.ltgt.gradle.incap",
+      "autovalue.shaded.org.checkerframework.checker.nullness.qual",
+      "autovalue.shaded.org.checkerframework.framework.qual",
+      "autovalue.shaded.org.objectweb.asm",
       "com.google.auto.value.extension",
       "com.google.auto.value.extension.memoized.processor",
       "com.google.auto.value.extension.serializable.processor",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
@@ -29,6 +29,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/authandtls",
         "//src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper",
         "//src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper:credential_module",
+        "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:extension_eval_impl",
         "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:inspection_impl",
         "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:registry",
         "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:resolution",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BUILD
@@ -218,7 +218,6 @@ java_library(
         "RegistryFunction.java",
         "RepoSpecFunction.java",
         "Selection.java",
-        "SingleExtensionEvalFunction.java",
         "SingleExtensionFunction.java",
         "SingleExtensionUsagesFunction.java",
         "StarlarkBazelModule.java",
@@ -234,9 +233,7 @@ java_library(
         ":module_extension",
         ":module_extension_metadata",
         ":registry",
-        ":repo_rule_creator",
         ":resolution",
-        ":root_module_file_fixup",
         "//src/main/java/com/google/devtools/build/docgen/annot",
         "//src/main/java/com/google/devtools/build/lib:runtime",
         "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
@@ -256,27 +253,70 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules:repository/repo_recorded_input",
         "//src/main/java/com/google/devtools/build/lib/rules:repository/repository_directory_value",
         "//src/main/java/com/google/devtools/build/lib/rules:repository/repository_function",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:bzl_load_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:client_environment_function",
         "//src/main/java/com/google/devtools/build/lib/skyframe:client_environment_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_function",
         "//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
+        "//src/main/java/com/google/devtools/build/lib/vfs",
+        "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+        "//src/main/java/com/google/devtools/build/skyframe",
+        "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
+        "//src/main/java/net/starlark/java/annot",
+        "//src/main/java/net/starlark/java/eval",
+        "//src/main/java/net/starlark/java/spelling",
+        "//src/main/java/net/starlark/java/syntax",
+        "//src/main/protobuf:failure_details_java_proto",
+        "//third_party:auto_value",
+        "//third_party:gson",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
+    name = "extension_eval_impl",
+    srcs = [
+        "InnateRunnableExtension.java",
+        "RegularRunnableExtension.java",
+        "RunnableExtension.java",
+        "SingleExtensionEvalFunction.java",
+    ],
+    deps = [
+        ":common",
+        ":exception",
+        ":module_extension",
+        ":module_extension_metadata",
+        ":repo_rule_creator",
+        ":resolution",
+        ":resolution_impl",
+        ":root_module_file_fixup",
+        "//src/main/java/com/google/devtools/build/lib:runtime",
+        "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
+        "//src/main/java/com/google/devtools/build/lib/bazel/repository:repository_options",
+        "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
+        "//src/main/java/com/google/devtools/build/lib/bazel/repository/starlark",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
+        "//src/main/java/com/google/devtools/build/lib/events",
+        "//src/main/java/com/google/devtools/build/lib/packages",
+        "//src/main/java/com/google/devtools/build/lib/packages/semantics",
+        "//src/main/java/com/google/devtools/build/lib/profiler",
+        "//src/main/java/com/google/devtools/build/lib/rules:repository/repo_recorded_input",
+        "//src/main/java/com/google/devtools/build/lib/rules:repository/repository_function",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:bzl_load_value",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:precomputed_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:repository_mapping_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:os",
         "//src/main/java/com/google/devtools/build/lib/vfs",
-        "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
-        "//src/main/java/net/starlark/java/annot",
         "//src/main/java/net/starlark/java/eval",
         "//src/main/java/net/starlark/java/spelling",
         "//src/main/java/net/starlark/java/syntax",
         "//src/main/protobuf:failure_details_java_proto",
         "//third_party:auto_value",
-        "//third_party:gson",
         "//third_party:guava",
         "//third_party:jsr305",
     ],