Skip to content

Commit b848b3a

Browse files
vyazelenkovyazelenko
committed
[Java] Add JVM opts to generator tasks.
1 parent 6b37857 commit b848b3a

File tree

2 files changed

+40
-9
lines changed

2 files changed

+40
-9
lines changed

‎build.gradle‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ project(':sbe-tool') {
319319
dependsOn 'compileJava'
320320
mainClass.set('uk.co.real_logic.sbe.SbeTool')
321321
classpath = sourceSets.main.runtimeClasspath
322+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
322323
systemProperties(
323324
'sbe.output.dir': generatedDir,
324325
'sbe.target.language': 'Java',
@@ -335,6 +336,7 @@ project(':sbe-tool') {
335336
dependsOn 'compileJava'
336337
mainClass.set('uk.co.real_logic.sbe.SbeTool')
337338
classpath = sourceSets.main.runtimeClasspath
339+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
338340
systemProperties(
339341
'sbe.output.dir': generatedDir,
340342
'sbe.target.language': 'java',
@@ -480,7 +482,7 @@ project(':sbe-samples') {
480482
sourceSets {
481483
generated {
482484
java.srcDir generatedDir
483-
compileClasspath += project(':sbe-all').sourceSets.main.runtimeClasspath
485+
compileClasspath += project(':sbe-tool').sourceSets.main.runtimeClasspath
484486
}
485487
}
486488

@@ -489,7 +491,8 @@ project(':sbe-samples') {
489491

490492
tasks.register('generateCodecs', JavaExec) {
491493
mainClass.set('uk.co.real_logic.sbe.SbeTool')
492-
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
494+
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
495+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
493496
systemProperties(
494497
'sbe.output.dir': generatedDir,
495498
'sbe.target.language': 'Java',
@@ -505,20 +508,23 @@ project(':sbe-samples') {
505508
dependsOn 'compileJava'
506509
mainClass.set('uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub')
507510
classpath = sourceSets.main.runtimeClasspath
511+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
508512
systemProperties System.getProperties()
509513
}
510514

511515
tasks.register('runExampleUsingGeneratedStubExtension', JavaExec) {
512516
dependsOn 'compileJava'
513517
mainClass.set('uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension')
514518
classpath = sourceSets.main.runtimeClasspath
519+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
515520
systemProperties System.getProperties()
516521
}
517522

518523
tasks.register('runOtfExample', JavaExec) {
519524
dependsOn 'compileJava'
520525
mainClass.set('uk.co.real_logic.sbe.examples.OtfExample')
521526
classpath = sourceSets.main.runtimeClasspath
527+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
522528
workingDir = 'src/main/resources'
523529
}
524530

@@ -596,7 +602,7 @@ project(':sbe-benchmarks') {
596602
sourceSets {
597603
generated {
598604
java.srcDir 'build/generated-src'
599-
compileClasspath += project(':sbe-all').sourceSets.main.runtimeClasspath
605+
compileClasspath += project(':sbe-tool').sourceSets.main.runtimeClasspath
600606
}
601607
}
602608

@@ -605,7 +611,8 @@ project(':sbe-benchmarks') {
605611

606612
tasks.register('generateCodecs', JavaExec) {
607613
mainClass.set('uk.co.real_logic.sbe.SbeTool')
608-
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
614+
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
615+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
609616
systemProperties(
610617
'sbe.output.dir': 'build/generated-src',
611618
'sbe.target.language': 'Java',
@@ -629,7 +636,8 @@ project(':sbe-benchmarks') {
629636

630637
tasks.register('generateRustExamples', JavaExec) {
631638
mainClass.set('uk.co.real_logic.sbe.SbeTool')
632-
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
639+
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
640+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
633641
systemProperties(
634642
'sbe.output.dir': 'generated/rust',
635643
'sbe.xinclude.aware': 'true',
@@ -644,7 +652,8 @@ tasks.register('generateRustExamples', JavaExec) {
644652

645653
tasks.register('generateRustTestCodecs', JavaExec) {
646654
mainClass.set('uk.co.real_logic.sbe.SbeTool')
647-
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
655+
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
656+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
648657
systemProperties(
649658
'sbe.output.dir': 'generated/rust',
650659
'sbe.xinclude.aware': 'true',
@@ -664,6 +673,7 @@ tasks.register('generateRustTestCodecs', JavaExec) {
664673
tasks.register('generateCarExampleDataFile', JavaExec) {
665674
mainClass.set('uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub')
666675
classpath = project(':sbe-samples').sourceSets.main.runtimeClasspath
676+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
667677
systemProperties('sbe.encoding.filename': 'rust/car_example_baseline_data.sbe')
668678
args = []
669679
standardOutput = new ByteArrayOutputStream()
@@ -672,6 +682,7 @@ tasks.register('generateCarExampleDataFile', JavaExec) {
672682
tasks.register('generateCarExampleExtensionDataFile', JavaExec) {
673683
mainClass.set('uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension')
674684
classpath = project(':sbe-samples').sourceSets.main.runtimeClasspath
685+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
675686
systemProperties('sbe.encoding.filename': 'rust/car_example_extension_data.sbe')
676687
args = []
677688
standardOutput = new ByteArrayOutputStream()
@@ -702,6 +713,7 @@ tasks.register('runRustTests', Exec) {
702713
tasks.register('generateGolangCodecTestComposite', JavaExec) {
703714
mainClass.set('uk.co.real_logic.sbe.SbeTool')
704715
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
716+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
705717
systemProperties(
706718
'sbe.output.dir': 'gocode/struct/src',
707719
'sbe.target.language': 'golang')
@@ -711,6 +723,7 @@ tasks.register('generateGolangCodecTestComposite', JavaExec) {
711723
tasks.register('generateGolangCodecTestBasic', JavaExec) {
712724
mainClass.set('uk.co.real_logic.sbe.SbeTool')
713725
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
726+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
714727
systemProperties(
715728
'sbe.output.dir': 'gocode/struct/src/basic',
716729
'sbe.target.language': 'golang')
@@ -720,6 +733,7 @@ tasks.register('generateGolangCodecTestBasic', JavaExec) {
720733
tasks.register('generateGolangCodecTestGroup', JavaExec) {
721734
mainClass.set('uk.co.real_logic.sbe.SbeTool')
722735
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
736+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
723737
systemProperties(
724738
'sbe.output.dir': 'gocode/struct/src/group',
725739
'sbe.target.language': 'golang')
@@ -728,6 +742,7 @@ tasks.register('generateGolangCodecTestGroup', JavaExec) {
728742

729743
tasks.register('generateGolangCodecTestVarData', JavaExec) {
730744
mainClass.set('uk.co.real_logic.sbe.SbeTool')
745+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
731746
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
732747
systemProperties(
733748
'sbe.output.dir': 'gocode/struct/src/vardata',
@@ -738,6 +753,7 @@ tasks.register('generateGolangCodecTestVarData', JavaExec) {
738753
tasks.register('generateGolangCodecsWithXIncludes', JavaExec) {
739754
mainClass.set('uk.co.real_logic.sbe.SbeTool')
740755
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
756+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
741757
systemProperties(
742758
'sbe.output.dir': 'gocode/struct/src',
743759
'sbe.target.language': 'golang',
@@ -750,6 +766,7 @@ tasks.register('generateGolangCodecsWithXIncludes', JavaExec) {
750766
tasks.register('generateGolangCodecsWithXSD', JavaExec) {
751767
mainClass.set('uk.co.real_logic.sbe.SbeTool')
752768
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
769+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
753770
systemProperties(
754771
'sbe.output.dir': 'gocode/struct/src',
755772
'sbe.target.language': 'golang',
@@ -776,6 +793,7 @@ tasks.register('generateGolangCodecsWithXSD', JavaExec) {
776793
tasks.register('generateGolangFlyweightCodecTestComposite', JavaExec) {
777794
mainClass.set('uk.co.real_logic.sbe.SbeTool')
778795
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
796+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
779797
systemProperties(
780798
'sbe.output.dir': 'gocode/flyweight/src',
781799
'sbe.go.generate.generate.flyweights': 'true',
@@ -786,6 +804,7 @@ tasks.register('generateGolangFlyweightCodecTestComposite', JavaExec) {
786804
tasks.register('generateGolangFlyweightCodecTestBasic', JavaExec) {
787805
mainClass.set('uk.co.real_logic.sbe.SbeTool')
788806
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
807+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
789808
systemProperties(
790809
'sbe.output.dir': 'gocode/flyweight/src/basic',
791810
'sbe.go.generate.generate.flyweights': 'true',
@@ -796,6 +815,7 @@ tasks.register('generateGolangFlyweightCodecTestBasic', JavaExec) {
796815
tasks.register('generateGolangFlyweightCodecTestGroup', JavaExec) {
797816
mainClass.set('uk.co.real_logic.sbe.SbeTool')
798817
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
818+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
799819
systemProperties(
800820
'sbe.output.dir': 'gocode/flyweight/src/group',
801821
'sbe.go.generate.generate.flyweights': 'true',
@@ -806,6 +826,7 @@ tasks.register('generateGolangFlyweightCodecTestGroup', JavaExec) {
806826
tasks.register('generateGolangFlyweightCodecTestVarData', JavaExec) {
807827
mainClass.set('uk.co.real_logic.sbe.SbeTool')
808828
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
829+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
809830
systemProperties(
810831
'sbe.output.dir': 'gocode/flyweight/src/vardata',
811832
'sbe.go.generate.generate.flyweights': 'true',
@@ -816,6 +837,7 @@ tasks.register('generateGolangFlyweightCodecTestVarData', JavaExec) {
816837
tasks.register('generateGolangFlyweightCodecsWithXIncludes', JavaExec) {
817838
mainClass.set('uk.co.real_logic.sbe.SbeTool')
818839
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
840+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
819841
systemProperties(
820842
'sbe.output.dir': 'gocode/flyweight/src',
821843
'sbe.go.generate.generate.flyweights': 'true',
@@ -829,6 +851,7 @@ tasks.register('generateGolangFlyweightCodecsWithXIncludes', JavaExec) {
829851
tasks.register('generateGolangFlyweightCodecsWithXSD', JavaExec) {
830852
mainClass.set('uk.co.real_logic.sbe.SbeTool')
831853
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
854+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
832855
systemProperties(
833856
'sbe.output.dir': 'gocode/flyweight/src',
834857
'sbe.go.generate.generate.flyweights': 'true',
@@ -880,6 +903,7 @@ tasks.register('generateGolangCodecs') {
880903
tasks.register('generateCSharpCodecsWithXIncludes', JavaExec) {
881904
mainClass.set('uk.co.real_logic.sbe.SbeTool')
882905
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
906+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
883907
systemProperties(
884908
'sbe.output.dir': 'csharp/sbe-generated',
885909
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
@@ -892,6 +916,7 @@ tasks.register('generateCSharpCodecsWithXIncludes', JavaExec) {
892916
tasks.register('generateCSharpTestCodecs', JavaExec) {
893917
mainClass.set('uk.co.real_logic.sbe.SbeTool')
894918
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
919+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
895920
systemProperties(
896921
'sbe.output.dir': 'csharp/sbe-generated',
897922
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
@@ -912,6 +937,7 @@ tasks.register('generateCSharpTestCodecs', JavaExec) {
912937
tasks.register('generateCSharpTestDtos', JavaExec) {
913938
mainClass.set('uk.co.real_logic.sbe.SbeTool')
914939
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
940+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
915941
systemProperties(
916942
'sbe.output.dir': 'csharp/sbe-generated',
917943
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharpDtos',
@@ -924,6 +950,7 @@ tasks.register('generateCSharpTestDtos', JavaExec) {
924950
tasks.register('generateCSharpExplicitPackageOverrideCodecs', JavaExec) {
925951
mainClass.set('uk.co.real_logic.sbe.SbeTool')
926952
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
953+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
927954
systemProperties(
928955
'sbe.output.dir': 'csharp/sbe-generated',
929956
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharp',
@@ -936,6 +963,7 @@ tasks.register('generateCSharpExplicitPackageOverrideCodecs', JavaExec) {
936963
tasks.register('generateCSharpExplicitPackageOverrideDtos', JavaExec) {
937964
mainClass.set('uk.co.real_logic.sbe.SbeTool')
938965
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
966+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
939967
systemProperties(
940968
'sbe.output.dir': 'csharp/sbe-generated',
941969
'sbe.target.language': 'uk.co.real_logic.sbe.generation.csharp.CSharpDtos',
@@ -956,7 +984,8 @@ tasks.register('generateCSharpCodecs') {
956984
tasks.register('generateJavaIrCodecs', JavaExec) {
957985
dependsOn 'computeOriginalIrHash'
958986
mainClass.set('uk.co.real_logic.sbe.SbeTool')
959-
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
987+
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
988+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
960989
systemProperties(
961990
'sbe.output.dir': 'sbe-tool/src/main/java',
962991
'sbe.target.language': 'Java',
@@ -970,6 +999,7 @@ tasks.register('generateJavaIrCodecs', JavaExec) {
970999
tasks.register('generateCppIrCodecs', JavaExec) {
9711000
mainClass.set('uk.co.real_logic.sbe.SbeTool')
9721001
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
1002+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
9731003
systemProperties(
9741004
'sbe.output.dir': 'sbe-tool/src/main/cpp',
9751005
'sbe.target.language': 'cpp',
@@ -982,6 +1012,7 @@ tasks.register('generateCppIrCodecs', JavaExec) {
9821012
tasks.register('generateGolangIrCodecs', JavaExec) {
9831013
mainClass.set('uk.co.real_logic.sbe.SbeTool')
9841014
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
1015+
jvmArgs('--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED')
9851016
systemProperties(
9861017
'sbe.output.dir': 'sbe-tool/src/main/golang',
9871018
'sbe.target.language': 'golang',
@@ -999,7 +1030,7 @@ tasks.register('runJavaBenchmarks', Exec) {
9991030
dependsOn 'sbe-benchmarks:jar'
10001031
commandLine toolchainLauncher.get().executablePath,
10011032
'-jar', 'sbe-benchmarks/build/libs/sbe-benchmarks.jar',
1002-
'-jvmArgs', '-Dagrona.disable.bounds.checks=true -XX:+UseParallelGC',
1033+
'-jvmArgs', '-Dagrona.disable.bounds.checks=true -XX:+UseParallelGC --add-opens java.base/jdk.internal.misc=ALL-UNNAMED',
10031034
'-w', '1s', '-r', '1s', '-wi', '3', '-i', '5', '-tu', 'ns', '-f', '5'
10041035
}
10051036

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.35.0-SNAPSHOT
1+
1.34.0-SNAPSHOT

0 commit comments

Comments
 (0)