Skip to content

7904059: Enable alternative Runner instantiation and Main reuse #161

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

Open
galderz wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −51
Open

7904059: Enable alternative Runner instantiation and Main reuse #161

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
113 changes: 62 additions & 51 deletions jmh-core/src/main/java/org/openjdk/jmh/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,67 +37,78 @@
public class Main {

public static void main(String[] argv) throws IOException {
try {
CommandLineOptions cmdOptions = new CommandLineOptions(argv);
Main main = new Main();

Runner runner = new Runner(cmdOptions);
CommandLineOptions cmdOptions = main.createCommandLineOptions(argv);

if (cmdOptions.shouldHelp()) {
cmdOptions.showHelp();
return;
}
Runner runner = new Runner(cmdOptions);

if (cmdOptions.shouldList()) {
runner.list();
return;
}
main.run(cmdOptions, runner);
}

if (cmdOptions.shouldListWithParams()) {
runner.listWithParams(cmdOptions);
return;
}
protected CommandLineOptions createCommandLineOptions(String[] argv)
{
try {
return new CommandLineOptions(argv);
} catch (CommandLineOptionException e) {
System.err.println("Error parsing command line:");
System.err.println(" " + e.getMessage());
System.exit(1);
return null;
}
}

if (cmdOptions.shouldListProfilers()) {
cmdOptions.listProfilers();
return;
}
protected void run(CommandLineOptions cmdOptions, Runner runner) throws IOException {
if (cmdOptions.shouldHelp()) {
cmdOptions.showHelp();
return;
}

if (cmdOptions.shouldListResultFormats()) {
cmdOptions.listResultFormats();
return;
}
if (cmdOptions.shouldList()) {
runner.list();
return;
}

try {
runner.run();
} catch (NoBenchmarksException e) {
System.err.println("No matching benchmarks. Miss-spelled regexp?");
if (cmdOptions.shouldListWithParams()) {
runner.listWithParams(cmdOptions);
return;
}

if (cmdOptions.verbosity().orElse(Defaults.VERBOSITY) != VerboseMode.EXTRA) {
System.err.println("Use " + VerboseMode.EXTRA + " verbose mode to debug the pattern matching.");
} else {
runner.list();
}
System.exit(1);
} catch (ProfilersFailedException e) {
// This is not exactly an error, print all messages and set the non-zero exit code.
Throwable ex = e;
while (ex != null) {
System.err.println(ex.getMessage());
for (Throwable supp : ex.getSuppressed()) {
System.err.println(supp.getMessage());
}
ex = ex.getCause();
if (cmdOptions.shouldListProfilers()) {
cmdOptions.listProfilers();
return;
}

if (cmdOptions.shouldListResultFormats()) {
cmdOptions.listResultFormats();
return;
}

try {
runner.run();
} catch (NoBenchmarksException e) {
System.err.println("No matching benchmarks. Miss-spelled regexp?");

if (cmdOptions.verbosity().orElse(Defaults.VERBOSITY) != VerboseMode.EXTRA) {
System.err.println("Use " + VerboseMode.EXTRA + " verbose mode to debug the pattern matching.");
} else {
runner.list();
}
System.exit(1);
} catch (ProfilersFailedException e) {
// This is not exactly an error, print all messages and set the non-zero exit code.
Throwable ex = e;
while (ex != null) {
System.err.println(ex.getMessage());
for (Throwable supp : ex.getSuppressed()) {
System.err.println(supp.getMessage());
}
System.exit(1);
} catch (RunnerException e) {
System.err.print("ERROR: ");
e.printStackTrace(System.err);
System.exit(1);
ex = ex.getCause();
}

} catch (CommandLineOptionException e) {
System.err.println("Error parsing command line:");
System.err.println(" " + e.getMessage());
System.exit(1);
} catch (RunnerException e) {
System.err.print("ERROR: ");
e.printStackTrace(System.err);
System.exit(1);
}
}
Expand Down