From c97f14f1ebaa919cb85fb90e95cc86d6b270d0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Basl=C3=A9?= Date: Tue, 8 Nov 2022 11:50:35 +0100 Subject: [PATCH] Adapt Shakespear perf benchmark to 2022.0.0 release The `benchmarks` project is ready to move to the 3.5.x baseline, now that all 2022.0.0 artifacts are released. That said, the Shakespear benchmark still uses deprecated ElasticScheduler, which is removed in 3.5.0. This commit switches the benchmark to use BoundedElasticScheduler in addition to upgrading the perf dependencies to 3.5.0. Fixes #3277. --- .../reactor/core/scheduler/OldBoundedElasticScheduler.java | 1 + .../core/scrabble/ShakespearePlaysScrabbleParallelOpt.java | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/benchmarks/src/main/java/reactor/core/scheduler/OldBoundedElasticScheduler.java b/benchmarks/src/main/java/reactor/core/scheduler/OldBoundedElasticScheduler.java index 7c789c7154..11a71d5056 100644 --- a/benchmarks/src/main/java/reactor/core/scheduler/OldBoundedElasticScheduler.java +++ b/benchmarks/src/main/java/reactor/core/scheduler/OldBoundedElasticScheduler.java @@ -148,6 +148,7 @@ public boolean isDisposed() { return BOUNDED_SERVICES.get(this) == SHUTDOWN; } + @SuppressWarnings("deprecation") @Override public void start() { for (;;) { diff --git a/benchmarks/src/main/java/reactor/core/scrabble/ShakespearePlaysScrabbleParallelOpt.java b/benchmarks/src/main/java/reactor/core/scrabble/ShakespearePlaysScrabbleParallelOpt.java index ffb592ba81..df8dbaddf2 100644 --- a/benchmarks/src/main/java/reactor/core/scrabble/ShakespearePlaysScrabbleParallelOpt.java +++ b/benchmarks/src/main/java/reactor/core/scrabble/ShakespearePlaysScrabbleParallelOpt.java @@ -50,7 +50,7 @@ public static void main(String[] args) throws Exception { @Setup public void localSetup() { - scheduler = Schedulers.newElastic("RcParallel"); + scheduler = Schedulers.newBoundedElastic(Schedulers.DEFAULT_BOUNDED_ELASTIC_SIZE, Schedulers.DEFAULT_BOUNDED_ELASTIC_QUEUESIZE, "RcParallel"); } @TearDown diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41b1e9f8b8..be7a3c7627 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] # Baselines, should be updated on every release baseline-core-api = "3.5.0" -baselinePerfCore = "3.4.24" -baselinePerfExtra = "3.4.8" +baselinePerfCore = "3.5.0" +baselinePerfExtra = "3.5.0" # Other shared versions asciidoctor = "3.3.2"