summaryrefslogtreecommitdiff
path: root/src/main/java/com/it_jaros/jscanner/ProgressBar.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/it_jaros/jscanner/ProgressBar.java')
-rw-r--r--src/main/java/com/it_jaros/jscanner/ProgressBar.java32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/main/java/com/it_jaros/jscanner/ProgressBar.java b/src/main/java/com/it_jaros/jscanner/ProgressBar.java
index 5ce229a..54a729b 100644
--- a/src/main/java/com/it_jaros/jscanner/ProgressBar.java
+++ b/src/main/java/com/it_jaros/jscanner/ProgressBar.java
@@ -141,17 +141,15 @@ public class ProgressBar {
}
private void printStats() {
- long duration = scan.getDurationMillis();
- String durationStr = formatDuration(duration);
-
+ Scan.Statistics stats = scan.getStatistics();
System.err.println("\n--------------------");
System.err.println("Stats:");
- System.err.println("Total hosts: " + scan.getHostTotalCounter().max());
- System.err.println("Total ports: " + scan.portTotal());
- System.err.println("Duration: " + durationStr);
- System.err.println("Peak concurrent hosts: " + scan.getHostCounter().max());
- System.err.println("Peak concurrent sockets: " + scan.getSocketCounter().max());
- System.err.println("Peak concurrent workers: " + scan.getThreadCounter().max());
+ System.err.println("Total hosts: " + stats.hostTotal());
+ System.err.println("Total ports: " + stats.portTotal());
+ System.err.println("Duration: " + formatDuration(stats.durationInMillis()));
+ System.err.println("Peak concurrent hosts: " + stats.hostMaxConcurrent());
+ System.err.println("Peak concurrent sockets: " + stats.socketMaxConcurrent());
+ System.err.println("Peak concurrent workers: " + stats.threadMaxConcurrent());
System.err.println("--------------------\n");
}
@@ -170,9 +168,9 @@ public class ProgressBar {
private void printStatusLine() {
- long duration = scan.getDurationMillis();
- int total = scan.getHostTotalCounter().current();
- int running = scan.getHostCounter().current();
+ Scan.Statistics stats = scan.getStatistics();
+ int total = stats.hostTotal();
+ int running = stats.hostCurrent();
int done = total - running;
long percent = total == 0 ? 100 : done * 100L / total;
@@ -183,17 +181,17 @@ public class ProgressBar {
);
String durationStat = String.format(
" | %s",
- formatDuration(duration)
+ formatDuration(stats.durationInMillis())
);
String socketStat = String.format(
" | sockets: %d active, %d peak",
- scan.getSocketCounter().current(),
- scan.getSocketCounter().max()
+ stats.socketCurrent(),
+ stats.socketMaxConcurrent()
);
String workerStat = String.format(
" | workers: %d active, %d peak",
- scan.getThreadCounter().current(),
- scan.getThreadCounter().max()
+ stats.threadCurrent(),
+ stats.threadMaxConcurrent()
);
int availableWidth = ProgressBar.getColumnWidth();