Skip to content

Commit 766ac33

Browse files
[Xamarin.Android.Build.Tasks] parse JDK release file directly (#8663)
Fixes: #8369 During Android project builds, the `<ValidateJavaVersion/>` MSBuild task currently shells out to `java -version` and `javac -version` to determine if we have a *valid* & usable JDK. Unfortunately, some customer logs have reported build times that are completely bananas: Task ValidateJavaVersion 23.469s ... Top 10 most expensive tasks ... ValidateJavaVersion = 3:46.740, 35 calls `java -version` and/or `javac -version` must be quite slow! Reading the source for OpenJDK, it appears that `java -version` actually starts a JVM to call a single method: * https://github.com/openjdk/jdk/blob/df370d725e5ae55a05479e8375bf665233ac3e44/src/java.base/share/native/libjli/java.c#L1895-L1913 * https://github.com/openjdk/jdk/blob/c9cacfb25d1f15c879c961d2965a63c9fe4d9fa7/src/java.base/share/classes/java/lang/VersionProps.java.template#L191-L233 That could explain the slowness? To improve this, let's just parse the file: * C:\Program Files\Microsoft\jdk-11.0.19.7-hotspot\release With contents: IMPLEMENTOR="Microsoft" IMPLEMENTOR_VERSION="Microsoft-7621296" JAVA_VERSION="11.0.19" JAVA_VERSION_DATE="2023-04-18" LIBC="default" MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.crypto.mscapi jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.internal.le jdk.internal.opt jdk.internal.vm.compiler.management jdk.jartool jdk.javadoc jdk.jcmd jdk.management.agent jdk.jconsole jdk.jdeps jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jlink jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.ldap jdk.naming.rmi jdk.net jdk.pack jdk.rmic jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported.desktop jdk.xml.dom jdk.zipfs" OS_ARCH="x86_64" OS_NAME="Windows" SOURCE=".:git:6171c19d2c18" We can just call `StreamReader.ReadLine()` until `JAVA_VERSION="` is found. I kept the existing logic in place, with an escape hatch if it were ever needed. After a few .NET 9 previews, we could consider removing old logic entirely? This logic is considerably faster, because we no longer launch a JVM! * Before: Task ValidateJavaVersion 377ms * After: Task ValidateJavaVersion 2ms Where you can test the "Before" logic by passing `-p:_AndroidUseJavaExeVersion=true`. I assume the customer's log from before (35 calls) would be around 70ms give or take instead of 3 hours and 46 minutes? Even if this estimation was 10x worse, it would still be a huge improvement! :eyes:
1 parent 7b0e102 commit 766ac33

File tree

3 files changed

+107
-2
lines changed

3 files changed

+107
-2
lines changed

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Tooling.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ This file contains .NET 6+ calls to the <ValidateJavaVersion/> and
1616
<UsingTask TaskName="Xamarin.Android.Tasks.ValidateJavaVersion" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
1717

1818
<Target Name="_ResolveAndroidTooling">
19+
<PropertyGroup>
20+
<_AndroidUseJavaExeVersion Condition=" '$(_AndroidUseJavaExeVersion)' == '' ">false</_AndroidUseJavaExeVersion>
21+
</PropertyGroup>
1922
<ValidateJavaVersion
2023
Condition=" '$(DesignTimeBuild)' != 'True' Or '$(AndroidUseManagedDesignTimeResourceGenerator)' != 'True' "
2124
ContinueOnError="$(_AndroidAllowMissingSdkTooling)"
@@ -24,7 +27,8 @@ This file contains .NET 6+ calls to the <ValidateJavaVersion/> and
2427
JavacToolExe="$(JavacToolExe)"
2528
TargetPlatformVersion="$(TargetPlatformVersion)"
2629
LatestSupportedJavaVersion="$(LatestSupportedJavaVersion)"
27-
MinimumSupportedJavaVersion="$(MinimumSupportedJavaVersion)">
30+
MinimumSupportedJavaVersion="$(MinimumSupportedJavaVersion)"
31+
UseJavaExeVersion="$(_AndroidUseJavaExeVersion)">
2832
<Output TaskParameter="JdkVersion" PropertyName="_JdkVersion" />
2933
<Output TaskParameter="MinimumRequiredJdkVersion" PropertyName="_DefaultJdkVersion" />
3034
</ValidateJavaVersion>

src/Xamarin.Android.Build.Tasks/Tasks/ValidateJavaVersion.cs

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ public class ValidateJavaVersion : AndroidTask
2929
[Required]
3030
public string MinimumSupportedJavaVersion { get; set; }
3131

32+
/// <summary>
33+
/// If true use the old method of calling `java -version` and `javac -version`
34+
/// $(_AndroidUseJavaExeVersion) is passed in from MSBuild targets and defaults to false.
35+
/// </summary>
36+
public bool UseJavaExeVersion { get; set; } = true;
37+
3238
[Output]
3339
public string MinimumRequiredJdkVersion { get; set; }
3440

@@ -63,7 +69,7 @@ bool ValidateJava ()
6369
var javac = JavacToolExe ?? (OS.IsWindows ? "javac.exe" : "javac");
6470

6571
return ValidateJava (java, JavaVersionRegex) &&
66-
ValidateJava (javac, JavacVersionRegex);
72+
(!UseJavaExeVersion || ValidateJava (javac, JavacVersionRegex));
6773
}
6874

6975
protected virtual bool ValidateJava (string javaExe, Regex versionRegex)
@@ -97,6 +103,12 @@ protected virtual bool ValidateJava (string javaExe, Regex versionRegex)
97103

98104
protected Version GetVersionFromTool (string javaExe, Regex versionRegex)
99105
{
106+
// New code path, reads directly from `release` text file
107+
if (!UseJavaExeVersion && GetVersionFromFile (javaExe, out var version)) {
108+
JdkVersion = version.ToString ();
109+
return version;
110+
}
111+
100112
// NOTE: this doesn't need to use GetRegisteredTaskObjectAssemblyLocal()
101113
// because the path to java/javac is the key and the value is a System.Version.
102114
var javaTool = Path.Combine (JavaSdkPath, "bin", javaExe);
@@ -128,5 +140,42 @@ protected Version GetVersionFromTool (string javaExe, Regex versionRegex)
128140
return null;
129141
}
130142
}
143+
144+
bool GetVersionFromFile (string javaExe, out Version version)
145+
{
146+
var path = Path.Combine (Path.GetDirectoryName (javaExe), "..", "release");
147+
if (!File.Exists (path)) {
148+
path = Path.Combine (JavaSdkPath, "release");
149+
}
150+
if (!File.Exists (path)) {
151+
Log.LogDebugMessage ($"{path} does not exist, falling back to `java -version`");
152+
version = new ();
153+
return false;
154+
}
155+
156+
using var stream = File.OpenRead (path);
157+
using var reader = new StreamReader (stream);
158+
159+
string line;
160+
while ((line = reader.ReadLine ()) != null) {
161+
const string JAVA_VERSION = "JAVA_VERSION=\"";
162+
int index = line.IndexOf (JAVA_VERSION, StringComparison.OrdinalIgnoreCase);
163+
if (index != -1) {
164+
var versionString = line.Substring (index + JAVA_VERSION.Length);
165+
index = versionString.IndexOf ('"');
166+
if (index != -1) {
167+
versionString = versionString.Substring (0, index);
168+
}
169+
if (Version.TryParse (versionString, out version)) {
170+
Log.LogDebugMessage ($"{path} contains JAVA_VERSION.");
171+
return true;
172+
}
173+
}
174+
}
175+
176+
Log.LogDebugMessage ($"{path} did not contain a valid JAVA_VERSION.");
177+
version = new ();
178+
return false;
179+
}
131180
}
132181
}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/ValidateJavaVersionTests.cs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,57 @@ public void CacheInvalidates ()
148148
Assert.IsTrue (validateJavaVersion.Execute (), "second Execute should succeed!");
149149
Assert.IsFalse (messages.Any (m => m.Message.StartsWith ("Using cached value for", StringComparison.Ordinal)), "`java -version` should *not* be cached!");
150150
}
151+
152+
[Test]
153+
public void ReleaseFile_Valid ()
154+
{
155+
var javaPath = CreateFauxJavaSdkDirectory (Path.Combine (path, "jdk-1"), "11.0.9", out string javaExe, out string javacExe);
156+
var releasePath = Path.Combine (Path.GetDirectoryName (javaExe), "..", "release");
157+
File.WriteAllText (releasePath,
158+
@"IMPLEMENTOR=""Microsoft""
159+
IMPLEMENTOR_VERSION=""Microsoft-7621296""
160+
JAVA_VERSION=""11.0.19""
161+
JAVA_VERSION_DATE=""2023-04-18""
162+
LIBC=""default""
163+
MODULES=""java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.crypto.mscapi jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.internal.le jdk.internal.opt jdk.internal.vm.compiler.management jdk.jartool jdk.javadoc jdk.jcmd jdk.management.agent jdk.jconsole jdk.jdeps jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jlink jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.ldap jdk.naming.rmi jdk.net jdk.pack jdk.rmic jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported.desktop jdk.xml.dom jdk.zipfs""
164+
OS_ARCH=""x86_64""
165+
OS_NAME=""Windows""
166+
SOURCE="".:git:6171c19d2c18""
167+
");
168+
169+
var validateJavaVersion = new Android.Tasks.ValidateJavaVersion {
170+
BuildEngine = engine,
171+
JavaSdkPath = javaPath,
172+
JavaToolExe = javaExe,
173+
JavacToolExe = javacExe,
174+
LatestSupportedJavaVersion = "17.99.0",
175+
MinimumSupportedJavaVersion = "11.0.0",
176+
UseJavaExeVersion = false,
177+
};
178+
Assert.IsTrue (validateJavaVersion.Execute (), "Execute should succeed!");
179+
Assert.IsTrue (messages.Any (m => m.Message.Contains ("contains JAVA_VERSION")), "contains JAVA_VERSION should be found");
180+
}
181+
182+
[Test]
183+
public void ReleaseFile_Invalid ()
184+
{
185+
var javaPath = CreateFauxJavaSdkDirectory (Path.Combine (path, "jdk-1"), "11.0.9", out string javaExe, out string javacExe);
186+
var releasePath = Path.Combine (Path.GetDirectoryName (javaExe), "..", "release");
187+
File.WriteAllText (releasePath, "Just some random text");
188+
189+
var validateJavaVersion = new Android.Tasks.ValidateJavaVersion {
190+
BuildEngine = engine,
191+
JavaSdkPath = javaPath,
192+
JavaToolExe = javaExe,
193+
JavacToolExe = javacExe,
194+
LatestSupportedJavaVersion = "17.99.0",
195+
MinimumSupportedJavaVersion = "11.0.0",
196+
UseJavaExeVersion = false,
197+
};
198+
199+
// Will succeed due to fallback
200+
Assert.IsTrue (validateJavaVersion.Execute (), "Execute should succeed!");
201+
Assert.IsTrue (messages.Any (m => m.Message.Contains ("did not contain a valid JAVA_VERSION")), "valid JAVA_VERSION should *not* be found");
202+
}
151203
}
152204
}

0 commit comments

Comments
 (0)