Add an option for printing the progress information

mrigger · mrigger · commit cc3240d02184 · 2020-04-27T14:23:37.000+02:00
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -297,39 +297,9 @@ public static void main(String[] args) {
 			System.exit(-1);
 		}
 
-		final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-		scheduler.scheduleAtFixedRate(new Runnable() {
-
-			private long timeMillis = System.currentTimeMillis();
-			private long lastNrQueries = 0;
-			private long lastNrDbs;
-
-			{
-				timeMillis = System.currentTimeMillis();
-			}
-
-			@Override
-			public void run() {
-				long elapsedTimeMillis = System.currentTimeMillis() - timeMillis;
-				long currentNrQueries = nrQueries.get();
-				long nrCurrentQueries = currentNrQueries - lastNrQueries;
-				double throughput = nrCurrentQueries / (elapsedTimeMillis / 1000d);
-				long currentNrDbs = nrDatabases.get();
-				long nrCurrentDbs = currentNrDbs - lastNrDbs;
-				double throughputDbs = nrCurrentDbs / (elapsedTimeMillis / 1000d);
-				long successfulStatementsRatio = (long) (100.0 * nrSuccessfulActions.get()
-						/ (nrSuccessfulActions.get() + nrUnsuccessfulActions.get()));
-				DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-				Date date = new Date();
-				System.out.println(String.format(
-						"[%s] Executed %d queries (%d queries/s; %.2f/s dbs, successful statements: %2d%%). Threads shut down: %d.",
-						dateFormat.format(date), currentNrQueries, (int) throughput, throughputDbs,
-						successfulStatementsRatio, threadsShutdown));
-				timeMillis = System.currentTimeMillis();
-				lastNrQueries = currentNrQueries;
-				lastNrDbs = currentNrDbs;
-			}
-		}, 5, 5, TimeUnit.SECONDS);
+		if (options.printProgressInformation()) {
+			startProgressMonitor();
+		}
 
 		ExecutorService executor = Executors.newFixedThreadPool(options.getNumberConcurrentThreads());
 
@@ -422,4 +392,40 @@ private void runThread(final String databaseName) {
 
 	}
 
+	private static void startProgressMonitor() {
+		final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+		scheduler.scheduleAtFixedRate(new Runnable() {
+
+			private long timeMillis = System.currentTimeMillis();
+			private long lastNrQueries = 0;
+			private long lastNrDbs;
+
+			{
+				timeMillis = System.currentTimeMillis();
+			}
+
+			@Override
+			public void run() {
+				long elapsedTimeMillis = System.currentTimeMillis() - timeMillis;
+				long currentNrQueries = nrQueries.get();
+				long nrCurrentQueries = currentNrQueries - lastNrQueries;
+				double throughput = nrCurrentQueries / (elapsedTimeMillis / 1000d);
+				long currentNrDbs = nrDatabases.get();
+				long nrCurrentDbs = currentNrDbs - lastNrDbs;
+				double throughputDbs = nrCurrentDbs / (elapsedTimeMillis / 1000d);
+				long successfulStatementsRatio = (long) (100.0 * nrSuccessfulActions.get()
+						/ (nrSuccessfulActions.get() + nrUnsuccessfulActions.get()));
+				DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+				Date date = new Date();
+				System.out.println(String.format(
+						"[%s] Executed %d queries (%d queries/s; %.2f/s dbs, successful statements: %2d%%). Threads shut down: %d.",
+						dateFormat.format(date), currentNrQueries, (int) throughput, throughputDbs,
+						successfulStatementsRatio, threadsShutdown));
+				timeMillis = System.currentTimeMillis();
+				lastNrQueries = currentNrQueries;
+				lastNrDbs = currentNrDbs;
+			}
+		}, 5, 5, TimeUnit.SECONDS);
+	}
+
 }
diff --git a/src/sqlancer/MainOptions.java b/src/sqlancer/MainOptions.java
@@ -38,6 +38,9 @@ public class MainOptions {
 	@Parameter(names="--password", description = "The password used to log into the DBMS")
 	private String password = "sqlancer";
 	
+	@Parameter(names="--print-progress-information", description = "Whether to print progress information such as the number of databases generated or queries issued", arity = 1)
+	private boolean printProgressInformation = true;
+	
 	public int getMaxExpressionDepth() {
 		return maxExpressionDepth;
 	}
@@ -88,5 +91,9 @@ public DBMS convert(String value) {
 			return DBMS.valueOf(value);
 		}
 	}
+	
+	public boolean printProgressInformation() {
+		return printProgressInformation;
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public class MainOptions {`
`38`	`38`	`@Parameter(names="--password", description = "The password used to log into the DBMS")`
`39`	`39`	`private String password = "sqlancer";`
`40`	`40`
	`41`	`+ @Parameter(names="--print-progress-information", description = "Whether to print progress information such as the number of databases generated or queries issued", arity = 1)`
	`42`	`+ private boolean printProgressInformation = true;`
	`43`	`+`
`41`	`44`	`public int getMaxExpressionDepth() {`
`42`	`45`	`return maxExpressionDepth;`
`43`	`46`	`}`
`@@ -88,5 +91,9 @@ public DBMS convert(String value) {`
`88`	`91`	`return DBMS.valueOf(value);`
`89`	`92`	`}`
`90`	`93`	`}`
	`94`	`+`
	`95`	`+ public boolean printProgressInformation() {`
	`96`	`+ return printProgressInformation;`
	`97`	`+ }`
`91`	`98`
`92`	`99`	`}`