Skip to content

Commit 30f06f1

Browse files
akurtakovakurtakov
committed
Stop using deprecate Runtime.exec method
Move to ProcessBuilder.start and do some minor modernizations while at it. Special checks for binutils 2.16(released 2005!) are dropped to reduce noise in the tests.
1 parent 108feb5 commit 30f06f1

File tree

3 files changed

+70
-140
lines changed

3 files changed

+70
-140
lines changed

‎gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofAggregatorTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2009, 2018 STMicroelectronics and others.
2+
* Copyright (c) 2009, 2026 STMicroelectronics and others.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -55,11 +55,9 @@ public void testAggregation(String dir) throws IOException, InterruptedException
5555
String gprof2use = "gprof";
5656
File f = Aggregator.aggregate(gprof2use, binary, s, directory);
5757

58-
Process p = Runtime.getRuntime().exec(
59-
new String[] { gprof2use, binary, f.getAbsolutePath() });
60-
Process p2 = Runtime.getRuntime().exec(
61-
new String[] { gprof2use, binary,
62-
directory + File.separator + "gmon.sum.ref" });
58+
Process p = new ProcessBuilder().command(gprof2use, binary, f.getAbsolutePath()).start();
59+
Process p2 = new ProcessBuilder().command(gprof2use, binary, directory + File.separator + "gmon.sum.ref")
60+
.start();
6361

6462
STJunitUtils.compare(p.getInputStream(), p2.getInputStream());
6563
p.waitFor();

‎gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofTest.java‎

Lines changed: 65 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2009, 2018 STMicroelectronics and others.
2+
* Copyright (c) 2009, 2026 STMicroelectronics and others.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -17,7 +17,6 @@
1717

1818
import java.io.File;
1919
import java.io.IOException;
20-
import java.io.LineNumberReader;
2120
import java.util.ArrayList;
2221
import java.util.List;
2322
import java.util.stream.Stream;
@@ -46,145 +45,83 @@
4645
*/
4746
public class GprofTest {
4847

49-
public static Stream<Arguments> testDirs() {
50-
List<Arguments> params = new ArrayList<>();
51-
boolean addr2line2_16 = false;
52-
try {
53-
Process p = Runtime.getRuntime().exec("addr2line --version");
54-
LineNumberReader reader = new LineNumberReader(
55-
p.inputReader());
56-
String line;
57-
while ((line = reader.readLine()) != null) {
58-
if (line.contains("addr2line 2.16.")) {
59-
addr2line2_16 = true;
60-
break;
61-
}
62-
}
63-
} catch (IOException e) {
64-
}
48+
public static Stream<Arguments> testDirs() throws IOException {
49+
List<Arguments> params = new ArrayList<>();
6550

66-
for (File testDir : STJunitUtils.getTestDirs()) {
67-
final File gmonFile = new File(testDir, OUTPUT_FILE);
68-
final File binaryFile = new File(testDir, BINARY_FILE);
51+
for (File testDir : STJunitUtils.getTestDirs()) {
52+
final File gmonFile = new File(testDir, OUTPUT_FILE);
53+
final File binaryFile = new File(testDir, BINARY_FILE);
6954

70-
File view_cg_RefFile_default = new File(testDir,
71-
"testCallgraphView.ref");
72-
File view_cg_RefFile_alternate = new File(testDir,
73-
"testCallgraphView.ref.binutils-2.16");
74-
File view_cg2_RefFile_default = new File(testDir,
75-
"testCallgraphTimeView.ref");
76-
File view_cg2_RefFile_alternate = new File(testDir,
77-
"testCallgraphTimeView.ref.binutils-2.16");
78-
final File view_cg_RefFile;
79-
final File view_cg2_RefFile;
80-
if (addr2line2_16 && view_cg_RefFile_alternate.exists()) {
81-
view_cg_RefFile = view_cg_RefFile_alternate;
82-
} else {
83-
view_cg_RefFile = view_cg_RefFile_default;
84-
}
85-
if (addr2line2_16 && view_cg2_RefFile_alternate.exists()) {
86-
view_cg2_RefFile = view_cg2_RefFile_alternate;
87-
} else {
88-
view_cg2_RefFile = view_cg2_RefFile_default;
89-
}
90-
final File view_cg2_DumpFile = new File(testDir,
91-
"testCallgraphTimeView.dump");
92-
final File view_cg_DumpFile = new File(testDir,
93-
"testCallgraphView.dump");
55+
File view_cg_RefFile_default = new File(testDir, "testCallgraphView.ref");
56+
File view_cg2_RefFile_default = new File(testDir, "testCallgraphTimeView.ref");
57+
final File view_cg2_RefFile = view_cg2_RefFile_default;
58+
final File view_cg_RefFile = view_cg_RefFile_default;
59+
final File view_cg2_DumpFile = new File(testDir, "testCallgraphTimeView.dump");
60+
final File view_cg_DumpFile = new File(testDir, "testCallgraphView.dump");
9461

95-
final File view_samplesFile_RefFile = new File(testDir,
96-
"testSampleView.ref");
97-
final File view_samplesFile_DumpFile = new File(testDir,
98-
"testSampleView.dump");
99-
final File view_samplesFileT_RefFile = new File(testDir,
100-
"testTimeView.ref");
101-
final File view_samplesFileT_DumpFile = new File(testDir,
102-
"testTimeView.dump");
62+
final File view_samplesFile_RefFile = new File(testDir, "testSampleView.ref");
63+
final File view_samplesFile_DumpFile = new File(testDir, "testSampleView.dump");
64+
final File view_samplesFileT_RefFile = new File(testDir, "testTimeView.ref");
65+
final File view_samplesFileT_DumpFile = new File(testDir, "testTimeView.dump");
10366

104-
final File view_samplesFunction_RefFile = new File(testDir,
105-
"testFunctionSampleView.ref");
106-
final File view_samplesFunction_DumpFile = new File(testDir,
107-
"testFunctionSampleView.dump");
108-
final File view_samplesFunctionT_RefFile = new File(testDir,
109-
"testFunctionTimeView.ref");
110-
final File view_samplesFunctionT_DumpFile = new File(testDir,
111-
"testFunctionTimeView.dump");
112-
final File view_samplesFlat_RefFile = new File(testDir,
113-
"testFlatSampleView.ref");
114-
final File view_samplesFlat_DumpFile = new File(testDir,
115-
"testFlatSampleView.dump");
116-
final File view_samplesFlatT_RefFile = new File(testDir,
117-
"testFlatTimeView.ref");
118-
final File view_samplesFlatT_DumpFile = new File(testDir,
119-
"testFlatTimeView.dump");
67+
final File view_samplesFunction_RefFile = new File(testDir, "testFunctionSampleView.ref");
68+
final File view_samplesFunction_DumpFile = new File(testDir, "testFunctionSampleView.dump");
69+
final File view_samplesFunctionT_RefFile = new File(testDir, "testFunctionTimeView.ref");
70+
final File view_samplesFunctionT_DumpFile = new File(testDir, "testFunctionTimeView.dump");
71+
final File view_samplesFlat_RefFile = new File(testDir, "testFlatSampleView.ref");
72+
final File view_samplesFlat_DumpFile = new File(testDir, "testFlatSampleView.dump");
73+
final File view_samplesFlatT_RefFile = new File(testDir, "testFlatTimeView.ref");
74+
final File view_samplesFlatT_DumpFile = new File(testDir, "testFlatTimeView.dump");
12075

121-
IBinaryObject binary = STSymbolManager.sharedInstance
122-
.getBinaryObject(new Path(binaryFile.getAbsolutePath()));
123-
final GmonDecoder gd = new GmonDecoder(binary, null);
124-
try {
125-
gd.read(gmonFile.getAbsolutePath());
126-
} catch (IOException e) {
127-
e.printStackTrace();
128-
}
129-
params.add(Arguments.of(gmonFile, gd, view_cg_RefFile,
130-
view_cg_DumpFile, CallGraphContentProvider.sharedInstance,
131-
false));
132-
params.add(Arguments.of(gmonFile, gd, view_cg2_RefFile,
133-
view_cg2_DumpFile, CallGraphContentProvider.sharedInstance,
134-
true));
135-
params.add(Arguments.of(gmonFile, gd, view_samplesFile_RefFile,
136-
view_samplesFile_DumpFile,
76+
IBinaryObject binary = STSymbolManager.sharedInstance
77+
.getBinaryObject(new Path(binaryFile.getAbsolutePath()));
78+
final GmonDecoder gd = new GmonDecoder(binary, null);
79+
gd.read(gmonFile.getAbsolutePath());
80+
params.add(Arguments.of(gmonFile, gd, view_cg_RefFile, view_cg_DumpFile,
81+
CallGraphContentProvider.sharedInstance, false));
82+
params.add(Arguments.of(gmonFile, gd, view_cg2_RefFile, view_cg2_DumpFile,
83+
CallGraphContentProvider.sharedInstance, true));
84+
params.add(Arguments.of(gmonFile, gd, view_samplesFile_RefFile, view_samplesFile_DumpFile,
13785
FileHistogramContentProvider.sharedInstance, false));
138-
params.add(Arguments.of(gmonFile, gd, view_samplesFileT_RefFile,
139-
view_samplesFileT_DumpFile,
86+
params.add(Arguments.of(gmonFile, gd, view_samplesFileT_RefFile, view_samplesFileT_DumpFile,
14087
FileHistogramContentProvider.sharedInstance, true));
141-
params.add(Arguments.of(gmonFile, gd,
142-
view_samplesFunction_RefFile,
143-
view_samplesFunction_DumpFile,
88+
params.add(Arguments.of(gmonFile, gd, view_samplesFunction_RefFile, view_samplesFunction_DumpFile,
14489
FunctionHistogramContentProvider.sharedInstance, false));
145-
params.add(Arguments.of(gmonFile, gd,
146-
view_samplesFunctionT_RefFile,
147-
view_samplesFunctionT_DumpFile,
90+
params.add(Arguments.of(gmonFile, gd, view_samplesFunctionT_RefFile, view_samplesFunctionT_DumpFile,
14891
FunctionHistogramContentProvider.sharedInstance, true));
149-
params.add(Arguments.of(gmonFile, gd, view_samplesFlat_RefFile,
150-
view_samplesFlat_DumpFile,
92+
params.add(Arguments.of(gmonFile, gd, view_samplesFlat_RefFile, view_samplesFlat_DumpFile,
15193
FlatHistogramContentProvider.sharedInstance, false));
152-
params.add(Arguments.of(gmonFile, gd, view_samplesFlatT_RefFile,
153-
view_samplesFlatT_DumpFile,
94+
params.add(Arguments.of(gmonFile, gd, view_samplesFlatT_RefFile, view_samplesFlatT_DumpFile,
15495
FlatHistogramContentProvider.sharedInstance, true));
155-
}
156-
return params.stream();
157-
}
96+
}
97+
return params.stream();
98+
}
15899

159-
private void changeMode(GmonView view, boolean timeModeRequested) {
160-
AbstractSTTreeViewer gmonViewer = (AbstractSTTreeViewer) view
161-
.getSTViewer();
162-
GmonDecoder decoder = (GmonDecoder) gmonViewer.getInput();
163-
int prof_rate = decoder.getHistogramDecoder().getProfRate();
164-
if (prof_rate == 0) {
165-
return;
166-
}
100+
private void changeMode(GmonView view, boolean timeModeRequested) {
101+
AbstractSTTreeViewer gmonViewer = (AbstractSTTreeViewer) view.getSTViewer();
102+
GmonDecoder decoder = (GmonDecoder) gmonViewer.getInput();
103+
int prof_rate = decoder.getHistogramDecoder().getProfRate();
104+
if (prof_rate == 0) {
105+
return;
106+
}
167107

168-
TreeColumn tc = gmonViewer.getViewer().getTree().getColumn(1);
169-
SampleProfField spf = (SampleProfField) tc.getData();
108+
TreeColumn tc = gmonViewer.getViewer().getTree().getColumn(1);
109+
SampleProfField spf = (SampleProfField) tc.getData();
170110

171-
if (spf.getColumnHeaderText().endsWith("Samples") ^ !timeModeRequested) {
172-
new SwitchSampleTimeAction(view).run();
173-
}
174-
}
111+
if (spf.getColumnHeaderText().endsWith("Samples") ^ !timeModeRequested) {
112+
new SwitchSampleTimeAction(view).run();
113+
}
114+
}
175115

176-
@ParameterizedTest @MethodSource("testDirs")
177-
public void testView(File gmonFile, GmonDecoder gd, File refFile,
178-
File dumpFile, ITreeContentProvider contentProvider,
179-
boolean timeMode) {
180-
GmonView view = GmonView.displayGprofView(gd,
181-
gmonFile.getAbsolutePath());
182-
SwitchContentProviderAction action = new SwitchContentProviderAction(
183-
"testAction", "icons/ch_callees.png" /* to avoid error */, view
184-
.getSTViewer().getViewer(), contentProvider);
185-
action.run();
186-
changeMode(view, timeMode);
187-
STJunitUtils.testCSVExport(view, dumpFile.getAbsolutePath(),
188-
refFile.getAbsolutePath());
189-
}
116+
@ParameterizedTest
117+
@MethodSource("testDirs")
118+
public void testView(File gmonFile, GmonDecoder gd, File refFile, File dumpFile,
119+
ITreeContentProvider contentProvider, boolean timeMode) {
120+
GmonView view = GmonView.displayGprofView(gd, gmonFile.getAbsolutePath());
121+
SwitchContentProviderAction action = new SwitchContentProviderAction("testAction",
122+
"icons/ch_callees.png" /* to avoid error */, view.getSTViewer().getViewer(), contentProvider);
123+
action.run();
124+
changeMode(view, timeMode);
125+
STJunitUtils.testCSVExport(view, dumpFile.getAbsolutePath(), refFile.getAbsolutePath());
126+
}
190127
}

‎gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,7 @@ public static File[] getTestDirs() {
224224
String filename = getAbsolutePath("org.eclipse.linuxtools.gprof.test", ".");
225225
File dir = new File(filename);
226226
File[] testDirs = dir.listFiles(
227-
new FileFilter() {
228-
@Override
229-
public boolean accept(File arg0) {
230-
return (arg0.isDirectory() && arg0.getName().matches(".*" + DIRECTORY_SUFFIX));
231-
}
232-
}
227+
(FileFilter) arg0 -> (arg0.isDirectory() && arg0.getName().matches(".*" + DIRECTORY_SUFFIX))
233228
);
234229

235230
// test if there is any directory samples

0 commit comments

Comments
 (0)