Skip to content

Improve the Main class #26

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
mrigger merged 3 commits into from
Jun 8, 2020
Merged

Improve the Main class #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bb9957
Shut down the threads rather than calling System.exit
mrigger Jun 8, 2020
51655d5
Prevent using a deprecate method for reflection
mrigger Jun 8, 2020
c77d2f5
Add an option to specify the exit code for when a bug is encountered
mrigger Jun 8, 2020
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: 5 additions & 5 deletions src/sqlancer/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

public final class Main {

private static final int THREADS_SHUTDOWN_EXIT_CODE = -1;
public static final File LOG_DIRECTORY = new File("logs");
public static volatile AtomicLong nrQueries = new AtomicLong();
public static volatile AtomicLong nrDatabases = new AtomicLong();
Expand Down Expand Up @@ -305,7 +304,7 @@ public static int executeMain(String[] args) throws AssertionError {
jc.parse(args);
if (jc.getParsedCommand() == null) {
jc.usage();
return THREADS_SHUTDOWN_EXIT_CODE;
return options.getErrorExitCode();
}

if (options.printProgressInformation()) {
Expand All @@ -332,7 +331,8 @@ private void runThread(final String databaseName) {
while (true) {
// create a new instance of the provider in case it has a global state
try {
provider = nameToProvider.get(jc.getParsedCommand()).getClass().newInstance();
provider = nameToProvider.get(jc.getParsedCommand()).getClass().getDeclaredConstructor()
.newInstance();
} catch (Exception e) {
throw new AssertionError(e);
}
Expand Down Expand Up @@ -392,7 +392,7 @@ private void runThread(final String databaseName) {
e.printStackTrace();
}
if (threadsShutdown == options.getTotalNumberTries()) {
System.exit(THREADS_SHUTDOWN_EXIT_CODE);
executor.shutdown();
}
}
}
Expand All @@ -406,7 +406,7 @@ private void runThread(final String databaseName) {
e.printStackTrace();
}
}
return threadsShutdown == 0 ? 0 : THREADS_SHUTDOWN_EXIT_CODE;
return threadsShutdown == 0 ? 0 : options.getErrorExitCode();
}

private static void startProgressMonitor() {
Expand Down
7 changes: 7 additions & 0 deletions src/sqlancer/MainOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public class MainOptions {
@Parameter(names = "--timeout-seconds", description = "The timeout in seconds")
private int timeoutSeconds = -1;

@Parameter(names = "--exit-code-error", description = "The exit code that should be returned when an error is encountered (or a bug is found)")
private int errorExitCode = -1;

public int getMaxExpressionDepth() {
return maxExpressionDepth;
}
Expand Down Expand Up @@ -103,4 +106,8 @@ public int getTimeoutSeconds() {
return timeoutSeconds;
}

public int getErrorExitCode() {
return errorExitCode;
}

}