Skip to content

Commit 09c78d5

Browse files
authored
7903508: JMH: Remove the Unicode dot prefix from secondary results
1 parent 843f641 commit 09c78d5

26 files changed

+191
-221
lines changed

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/ClassloadProfilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void test() throws RunnerException {
9191
RunResult rr = new Runner(opts).runSingle();
9292

9393
Map<String, Result> sr = rr.getSecondaryResults();
94-
double classLoad = ProfilerTestUtils.checkedGet(sr, "·class.load.norm").getScore();
94+
double classLoad = ProfilerTestUtils.checkedGet(sr, "class.load.norm").getScore();
9595

9696
// Allow 5% slack
9797
if (Math.abs(1 - classLoad) > 0.05) {

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/CompilerProfilerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public void test() throws RunnerException {
5858
RunResult rr = new Runner(opts).runSingle();
5959

6060
Map<String, Result> sr = rr.getSecondaryResults();
61-
double timeTotal = ProfilerTestUtils.checkedGet(sr, "·compiler.time.total").getScore();
62-
double timeProfiled = ProfilerTestUtils.checkedGet(sr, "·compiler.time.profiled").getScore();
61+
double timeTotal = ProfilerTestUtils.checkedGet(sr, "compiler.time.total").getScore();
62+
double timeProfiled = ProfilerTestUtils.checkedGet(sr, "compiler.time.profiled").getScore();
6363

6464
if (timeProfiled > timeTotal) {
6565
throw new IllegalStateException("Profiled time is larger than total time. " +

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/DTraceAsmProfilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void test() throws RunnerException {
5656
RunResult rr = new Runner(opts).runSingle();
5757

5858
Map<String, Result> sr = rr.getSecondaryResults();
59-
String out = ProfilerTestUtils.checkedGet(sr, "·asm").extendedInfo();
59+
String out = ProfilerTestUtils.checkedGet(sr, "asm").extendedInfo();
6060
if (!checkDisassembly(out)) {
6161
throw new IllegalStateException("Profile does not contain the required frame: " + out);
6262
}

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/GCProfilerAllocRateTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ private void testWith(String initLine) throws RunnerException {
8484
double opsPerSec = rr.getPrimaryResult().getScore();
8585

8686
Map<String, Result> sr = rr.getSecondaryResults();
87-
double allocRateMB = ProfilerTestUtils.checkedGet(sr, "·gc.alloc.rate").getScore();
88-
double allocRateNormB = ProfilerTestUtils.checkedGet(sr, "·gc.alloc.rate.norm").getScore();
87+
double allocRateMB = ProfilerTestUtils.checkedGet(sr, "gc.alloc.rate").getScore();
88+
double allocRateNormB = ProfilerTestUtils.checkedGet(sr, "gc.alloc.rate.norm").getScore();
8989
double allocRatePrimaryMB = opsPerSec * allocRateNormB / 1024 / 1024;
9090

9191
// Allow 20% slack

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/GCProfilerSeparateThreadTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testDefault() throws RunnerException {
6767
RunResult rr = new Runner(opts).runSingle();
6868

6969
Map<String, Result> sr = rr.getSecondaryResults();
70-
double allocRateNormB = ProfilerTestUtils.checkedGet(sr, "·gc.alloc.rate.norm").getScore();
70+
double allocRateNormB = ProfilerTestUtils.checkedGet(sr, "gc.alloc.rate.norm").getScore();
7171

7272
String msg = "Reported by profiler: " + allocRateNormB + ", target: " + SIZE;
7373

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/LinuxPerfAsmProfilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void test() throws RunnerException {
5656
RunResult rr = new Runner(opts).runSingle();
5757

5858
Map<String, Result> sr = rr.getSecondaryResults();
59-
String out = ProfilerTestUtils.checkedGet(sr, "·asm").extendedInfo();
59+
String out = ProfilerTestUtils.checkedGet(sr, "asm").extendedInfo();
6060
if (!checkDisassembly(out)) {
6161
throw new IllegalStateException("Profile does not contain the required frame: " + out);
6262
}

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/LinuxPerfC2CProfilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void test() throws RunnerException {
7272
RunResult rr = new Runner(opts).runSingle();
7373

7474
Map<String, Result> sr = rr.getSecondaryResults();
75-
String text = ProfilerTestUtils.checkedGet(sr, "·perfc2c").extendedInfo();
75+
String text = ProfilerTestUtils.checkedGet(sr, "perfc2c").extendedInfo();
7676

7777
Assert.assertNotNull(text);
7878
}

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/LinuxPerfProfilerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public void test() throws RunnerException {
7474
RunResult rr = new Runner(opts).runSingle();
7575

7676
Map<String, Result> sr = rr.getSecondaryResults();
77-
String msg = ProfilerTestUtils.checkedGet(sr, "·perf").extendedInfo();
77+
String msg = ProfilerTestUtils.checkedGet(sr, "perf").extendedInfo();
7878

79-
if (sr.containsKey("·ipc")) {
80-
double ipc = ProfilerTestUtils.checkedGet(sr, "·ipc").getScore();
81-
double cpi = ProfilerTestUtils.checkedGet(sr, "·cpi").getScore();
79+
if (sr.containsKey("ipc")) {
80+
double ipc = ProfilerTestUtils.checkedGet(sr, "ipc").getScore();
81+
double cpi = ProfilerTestUtils.checkedGet(sr, "cpi").getScore();
8282
Assert.assertNotEquals(0D, ipc, 0D);
8383
Assert.assertNotEquals(0D, cpi, 0D);
8484
}

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/MemPoolProfilerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public void test() throws RunnerException {
6060

6161
Map<String, Result> sr = rr.getSecondaryResults();
6262

63-
double usedMetaspace = ProfilerTestUtils.checkedGet(sr, "·mempool.Metaspace.used").getScore();
64-
double usedTotal = ProfilerTestUtils.checkedGet(sr, "·mempool.total.used").getScore();
65-
double usedTotalCodeheap = ProfilerTestUtils.checkedGet(sr, "·mempool.total.codeheap.used").getScore();
63+
double usedMetaspace = ProfilerTestUtils.checkedGet(sr, "mempool.Metaspace.used").getScore();
64+
double usedTotal = ProfilerTestUtils.checkedGet(sr, "mempool.total.used").getScore();
65+
double usedTotalCodeheap = ProfilerTestUtils.checkedGet(sr, "mempool.total.codeheap.used").getScore();
6666

6767
if (usedMetaspace == 0) {
6868
throw new IllegalStateException("Metaspace used is zero");

jmh-core-it/src/test/java/org/openjdk/jmh/it/profilers/SafepointsProfilerTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public void test() throws RunnerException {
6161

6262
Map<String, Result> sr = rr.getSecondaryResults();
6363

64-
double interval = ProfilerTestUtils.checkedGet(sr, "·safepoints.interval").getScore();
65-
double pauseTotal = ProfilerTestUtils.checkedGet(sr, "·safepoints.pause").getScore();
66-
double ttspTotal = ProfilerTestUtils.checkedGet(sr, "·safepoints.ttsp").getScore();
64+
double interval = ProfilerTestUtils.checkedGet(sr, "safepoints.interval").getScore();
65+
double pauseTotal = ProfilerTestUtils.checkedGet(sr, "safepoints.pause").getScore();
66+
double ttspTotal = ProfilerTestUtils.checkedGet(sr, "safepoints.ttsp").getScore();
6767

68-
double pauseCount = ProfilerTestUtils.checkedGet(sr, "·safepoints.pause.count").getScore();
69-
double ttspCount = ProfilerTestUtils.checkedGet(sr, "·safepoints.ttsp.count").getScore();
68+
double pauseCount = ProfilerTestUtils.checkedGet(sr, "safepoints.pause.count").getScore();
69+
double ttspCount = ProfilerTestUtils.checkedGet(sr, "safepoints.ttsp.count").getScore();
7070

7171
Assert.assertNotEquals(0D, pauseTotal, 0D);
7272
Assert.assertNotEquals(0D, ttspTotal, 0D);
@@ -98,8 +98,8 @@ public void test() throws RunnerException {
9898
double lastPause = 0;
9999
double lastTTSP = 0;
100100
for (String suff : new String[] {"0.00", "0.50", "0.90", "0.95", "0.99", "0.999", "0.9999", "1.00"}) {
101-
double curPause = ProfilerTestUtils.checkedGet(sr, "·safepoints.pause.p" + suff).getScore();
102-
double curTTSP = ProfilerTestUtils.checkedGet(sr, "·safepoints.ttsp.p" + suff).getScore();
101+
double curPause = ProfilerTestUtils.checkedGet(sr, "safepoints.pause.p" + suff).getScore();
102+
double curTTSP = ProfilerTestUtils.checkedGet(sr, "safepoints.ttsp.p" + suff).getScore();
103103
if (curPause < lastPause) {
104104
throw new IllegalStateException("pause.p" + suff + " is not monotonic");
105105
}

0 commit comments

Comments
 (0)