Skip to content

Stop using deprecate Runtime.exec method #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Jan 5, 2026
Merged

Stop using deprecate Runtime.exec method #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ...xtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofAggregatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
* Copyright (c) 2009, 2026 STMicroelectronics and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -55,11 +55,9 @@ public void testAggregation(String dir) throws IOException, InterruptedException
String gprof2use = "gprof";
File f = Aggregator.aggregate(gprof2use, binary, s, directory);

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

STJunitUtils.compare(p.getInputStream(), p2.getInputStream());
p.waitFor();
Expand Down
193 changes: 65 additions & 128 deletions ...lipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
* Copyright (c) 2009, 2026 STMicroelectronics and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -17,7 +17,6 @@

import java.io.File;
import java.io.IOException;
import java.io.LineNumberReader;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
Expand Down Expand Up @@ -46,145 +45,83 @@
*/
public class GprofTest {

public static Stream<Arguments> testDirs() {
List<Arguments> params = new ArrayList<>();
boolean addr2line2_16 = false;
try {
Process p = Runtime.getRuntime().exec("addr2line --version");
LineNumberReader reader = new LineNumberReader(
p.inputReader());
String line;
while ((line = reader.readLine()) != null) {
if (line.contains("addr2line 2.16.")) {
addr2line2_16 = true;
break;
}
}
} catch (IOException e) {
}
public static Stream<Arguments> testDirs() throws IOException {
List<Arguments> params = new ArrayList<>();

for (File testDir : STJunitUtils.getTestDirs()) {
final File gmonFile = new File(testDir, OUTPUT_FILE);
final File binaryFile = new File(testDir, BINARY_FILE);
for (File testDir : STJunitUtils.getTestDirs()) {
final File gmonFile = new File(testDir, OUTPUT_FILE);
final File binaryFile = new File(testDir, BINARY_FILE);

File view_cg_RefFile_default = new File(testDir,
"testCallgraphView.ref");
File view_cg_RefFile_alternate = new File(testDir,
"testCallgraphView.ref.binutils-2.16");
File view_cg2_RefFile_default = new File(testDir,
"testCallgraphTimeView.ref");
File view_cg2_RefFile_alternate = new File(testDir,
"testCallgraphTimeView.ref.binutils-2.16");
final File view_cg_RefFile;
final File view_cg2_RefFile;
if (addr2line2_16 && view_cg_RefFile_alternate.exists()) {
view_cg_RefFile = view_cg_RefFile_alternate;
} else {
view_cg_RefFile = view_cg_RefFile_default;
}
if (addr2line2_16 && view_cg2_RefFile_alternate.exists()) {
view_cg2_RefFile = view_cg2_RefFile_alternate;
} else {
view_cg2_RefFile = view_cg2_RefFile_default;
}
final File view_cg2_DumpFile = new File(testDir,
"testCallgraphTimeView.dump");
final File view_cg_DumpFile = new File(testDir,
"testCallgraphView.dump");
File view_cg_RefFile_default = new File(testDir, "testCallgraphView.ref");
File view_cg2_RefFile_default = new File(testDir, "testCallgraphTimeView.ref");
final File view_cg2_RefFile = view_cg2_RefFile_default;
final File view_cg_RefFile = view_cg_RefFile_default;
final File view_cg2_DumpFile = new File(testDir, "testCallgraphTimeView.dump");
final File view_cg_DumpFile = new File(testDir, "testCallgraphView.dump");

final File view_samplesFile_RefFile = new File(testDir,
"testSampleView.ref");
final File view_samplesFile_DumpFile = new File(testDir,
"testSampleView.dump");
final File view_samplesFileT_RefFile = new File(testDir,
"testTimeView.ref");
final File view_samplesFileT_DumpFile = new File(testDir,
"testTimeView.dump");
final File view_samplesFile_RefFile = new File(testDir, "testSampleView.ref");
final File view_samplesFile_DumpFile = new File(testDir, "testSampleView.dump");
final File view_samplesFileT_RefFile = new File(testDir, "testTimeView.ref");
final File view_samplesFileT_DumpFile = new File(testDir, "testTimeView.dump");

final File view_samplesFunction_RefFile = new File(testDir,
"testFunctionSampleView.ref");
final File view_samplesFunction_DumpFile = new File(testDir,
"testFunctionSampleView.dump");
final File view_samplesFunctionT_RefFile = new File(testDir,
"testFunctionTimeView.ref");
final File view_samplesFunctionT_DumpFile = new File(testDir,
"testFunctionTimeView.dump");
final File view_samplesFlat_RefFile = new File(testDir,
"testFlatSampleView.ref");
final File view_samplesFlat_DumpFile = new File(testDir,
"testFlatSampleView.dump");
final File view_samplesFlatT_RefFile = new File(testDir,
"testFlatTimeView.ref");
final File view_samplesFlatT_DumpFile = new File(testDir,
"testFlatTimeView.dump");
final File view_samplesFunction_RefFile = new File(testDir, "testFunctionSampleView.ref");
final File view_samplesFunction_DumpFile = new File(testDir, "testFunctionSampleView.dump");
final File view_samplesFunctionT_RefFile = new File(testDir, "testFunctionTimeView.ref");
final File view_samplesFunctionT_DumpFile = new File(testDir, "testFunctionTimeView.dump");
final File view_samplesFlat_RefFile = new File(testDir, "testFlatSampleView.ref");
final File view_samplesFlat_DumpFile = new File(testDir, "testFlatSampleView.dump");
final File view_samplesFlatT_RefFile = new File(testDir, "testFlatTimeView.ref");
final File view_samplesFlatT_DumpFile = new File(testDir, "testFlatTimeView.dump");

IBinaryObject binary = STSymbolManager.sharedInstance
.getBinaryObject(new Path(binaryFile.getAbsolutePath()));
final GmonDecoder gd = new GmonDecoder(binary, null);
try {
gd.read(gmonFile.getAbsolutePath());
} catch (IOException e) {
e.printStackTrace();
}
params.add(Arguments.of(gmonFile, gd, view_cg_RefFile,
view_cg_DumpFile, CallGraphContentProvider.sharedInstance,
false));
params.add(Arguments.of(gmonFile, gd, view_cg2_RefFile,
view_cg2_DumpFile, CallGraphContentProvider.sharedInstance,
true));
params.add(Arguments.of(gmonFile, gd, view_samplesFile_RefFile,
view_samplesFile_DumpFile,
IBinaryObject binary = STSymbolManager.sharedInstance
.getBinaryObject(new Path(binaryFile.getAbsolutePath()));
final GmonDecoder gd = new GmonDecoder(binary, null);
gd.read(gmonFile.getAbsolutePath());
params.add(Arguments.of(gmonFile, gd, view_cg_RefFile, view_cg_DumpFile,
CallGraphContentProvider.sharedInstance, false));
params.add(Arguments.of(gmonFile, gd, view_cg2_RefFile, view_cg2_DumpFile,
CallGraphContentProvider.sharedInstance, true));
params.add(Arguments.of(gmonFile, gd, view_samplesFile_RefFile, view_samplesFile_DumpFile,
FileHistogramContentProvider.sharedInstance, false));
params.add(Arguments.of(gmonFile, gd, view_samplesFileT_RefFile,
view_samplesFileT_DumpFile,
params.add(Arguments.of(gmonFile, gd, view_samplesFileT_RefFile, view_samplesFileT_DumpFile,
FileHistogramContentProvider.sharedInstance, true));
params.add(Arguments.of(gmonFile, gd,
view_samplesFunction_RefFile,
view_samplesFunction_DumpFile,
params.add(Arguments.of(gmonFile, gd, view_samplesFunction_RefFile, view_samplesFunction_DumpFile,
FunctionHistogramContentProvider.sharedInstance, false));
params.add(Arguments.of(gmonFile, gd,
view_samplesFunctionT_RefFile,
view_samplesFunctionT_DumpFile,
params.add(Arguments.of(gmonFile, gd, view_samplesFunctionT_RefFile, view_samplesFunctionT_DumpFile,
FunctionHistogramContentProvider.sharedInstance, true));
params.add(Arguments.of(gmonFile, gd, view_samplesFlat_RefFile,
view_samplesFlat_DumpFile,
params.add(Arguments.of(gmonFile, gd, view_samplesFlat_RefFile, view_samplesFlat_DumpFile,
FlatHistogramContentProvider.sharedInstance, false));
params.add(Arguments.of(gmonFile, gd, view_samplesFlatT_RefFile,
view_samplesFlatT_DumpFile,
params.add(Arguments.of(gmonFile, gd, view_samplesFlatT_RefFile, view_samplesFlatT_DumpFile,
FlatHistogramContentProvider.sharedInstance, true));
}
return params.stream();
}
}
return params.stream();
}

private void changeMode(GmonView view, boolean timeModeRequested) {
AbstractSTTreeViewer gmonViewer = (AbstractSTTreeViewer) view
.getSTViewer();
GmonDecoder decoder = (GmonDecoder) gmonViewer.getInput();
int prof_rate = decoder.getHistogramDecoder().getProfRate();
if (prof_rate == 0) {
return;
}
private void changeMode(GmonView view, boolean timeModeRequested) {
AbstractSTTreeViewer gmonViewer = (AbstractSTTreeViewer) view.getSTViewer();
GmonDecoder decoder = (GmonDecoder) gmonViewer.getInput();
int prof_rate = decoder.getHistogramDecoder().getProfRate();
if (prof_rate == 0) {
return;
}

TreeColumn tc = gmonViewer.getViewer().getTree().getColumn(1);
SampleProfField spf = (SampleProfField) tc.getData();
TreeColumn tc = gmonViewer.getViewer().getTree().getColumn(1);
SampleProfField spf = (SampleProfField) tc.getData();

if (spf.getColumnHeaderText().endsWith("Samples") ^ !timeModeRequested) {
new SwitchSampleTimeAction(view).run();
}
}
if (spf.getColumnHeaderText().endsWith("Samples") ^ !timeModeRequested) {
new SwitchSampleTimeAction(view).run();
}
}

@ParameterizedTest @MethodSource("testDirs")
public void testView(File gmonFile, GmonDecoder gd, File refFile,
File dumpFile, ITreeContentProvider contentProvider,
boolean timeMode) {
GmonView view = GmonView.displayGprofView(gd,
gmonFile.getAbsolutePath());
SwitchContentProviderAction action = new SwitchContentProviderAction(
"testAction", "icons/ch_callees.png" /* to avoid error */, view
.getSTViewer().getViewer(), contentProvider);
action.run();
changeMode(view, timeMode);
STJunitUtils.testCSVExport(view, dumpFile.getAbsolutePath(),
refFile.getAbsolutePath());
}
@ParameterizedTest
@MethodSource("testDirs")
public void testView(File gmonFile, GmonDecoder gd, File refFile, File dumpFile,
ITreeContentProvider contentProvider, boolean timeMode) {
GmonView view = GmonView.displayGprofView(gd, gmonFile.getAbsolutePath());
SwitchContentProviderAction action = new SwitchContentProviderAction("testAction",
"icons/ch_callees.png" /* to avoid error */, view.getSTViewer().getViewer(), contentProvider);
action.run();
changeMode(view, timeMode);
STJunitUtils.testCSVExport(view, dumpFile.getAbsolutePath(), refFile.getAbsolutePath());
}
}
7 changes: 1 addition & 6 deletions ...se.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,7 @@ public static File[] getTestDirs() {
String filename = getAbsolutePath("org.eclipse.linuxtools.gprof.test", ".");
File dir = new File(filename);
File[] testDirs = dir.listFiles(
new FileFilter() {
@Override
public boolean accept(File arg0) {
return (arg0.isDirectory() && arg0.getName().matches(".*" + DIRECTORY_SUFFIX));
}
}
(FileFilter) arg0 -> (arg0.isDirectory() && arg0.getName().matches(".*" + DIRECTORY_SUFFIX))
);

// test if there is any directory samples
Expand Down