Additional logs

Author: lubomarinski

simulator/src/main/java/byzzbench/simulator/config/ByzzBenchConfig.java

@@ -52,7 +52,7 @@ public class ByzzBenchConfig {
      * @return The output path for this run.
      */
     public Path getOutputPathForThisRun() {
-        return this.outputPath.resolve(getRunName() + "-T" + String.valueOf(SimulatorApplication.getStartTime().getEpochSecond()));
+        return this.outputPath.resolve((getRunName() + "-T").replaceAll("- -", "-") + String.valueOf(SimulatorApplication.getStartTime().getEpochSecond()));
     }
 
     public String getRunName() {

simulator/src/main/java/byzzbench/simulator/faults/factories/ByzzFuzzScenarioFaultFactory.java

@@ -62,7 +62,10 @@ public List<Fault> generateFaults(FaultContext input) {
         // Faults
         if(input.getScenario() instanceof EDHotStuffScenario edHotStuffScenario) {
             edHotStuffScenario.log("ByzzFuzzFaults:");
-            faults.forEach(fault -> edHotStuffScenario.log(fault.getId()));
+            faults.forEach(fault -> {
+                edHotStuffScenario.log(fault.getId());
+                edHotStuffScenario.getState().addFault(fault.getId());
+            });
         }
         else {
             System.out.println("ByzzFuzzFaults:");

simulator/src/main/java/byzzbench/simulator/protocols/event_driven_hotstuff/EDHSScenarioState.java

@@ -4,6 +4,9 @@
 import lombok.Getter;
 import lombok.ToString;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 @Data
 public class EDHSScenarioState {
     private boolean livenessViolation;
@@ -12,6 +15,7 @@ public class EDHSScenarioState {
     private long minView;
     private int commitedNodes;
     private boolean validAssumptions;
+    private ArrayList<String> faults;
 
     public EDHSScenarioState() {
         livenessViolation = false;
@@ -20,6 +24,11 @@ public EDHSScenarioState() {
         minView = 0;
         commitedNodes = 0;
         validAssumptions = true;
+        faults = new ArrayList<>();
+    }
+
+    public void addFault(String fault) {
+        faults.add(fault);
     }
 
     @Override
@@ -31,6 +40,7 @@ public String toString() {
                 ", minView=" + minView +
                 ", commitedNodes=" + commitedNodes +
                 ", validAssumptions=" + validAssumptions +
+                ", faults=" + faults +
                 '}';
     }
 }

simulator/src/main/java/byzzbench/simulator/service/SimulatorService.java

@@ -267,6 +267,7 @@ public void start() {
                 System.out.println("failedScenarios: " + String.join(", ", failedScenarios));
                 System.out.println("errorScenarios: " + String.join(", ", errorScenarios));
                 try {
+                    scenarioStates.removeFirst();
                     long validCount =  scenarioStates.stream().filter(s -> s.isValidAssumptions()).count();
                     long validA = scenarioStates.stream().filter(s -> s.isValidAssumptions() && s.isAgreementViolation()).count();
                     long validT = scenarioStates.stream().filter(s -> s.isValidAssumptions() && s.isLivenessViolation()).count();
@@ -301,8 +302,10 @@ public void start() {
                     System.out.println(summary);
 
                     String results = Files.readString(resultsPath);
-                    results += byzzBenchConfig.getRunName().replaceAll("-", " & ") + " & " ;
-                    results += validCount + " & " + validA  + " & " + validT  + " & " + (validA + validT)  + " & " + invalidCount  + " & " + invalidA  + " & " + invalidT  + " & " + (invalidA + invalidT) + " & " + (validA + validT + invalidA + invalidT) + " \\\\\n";
+                    results += (byzzBenchConfig.getRunName().replaceAll("-", " & ") + " & ").replaceAll(" {3}", " - ") ;
+                    results += validCount > 0 ? validCount + " & " + validA  + " & " + validT  + " & " + (validA + validT)  + " & " : "- & - & - & - & ";
+                    results += invalidCount > 0 ? invalidCount  + " & " + invalidA  + " & " + invalidT  + " & " + (invalidA + invalidT) + " & " : "- & - & - & - & ";
+                    results += (validA + validT + invalidA + invalidT) + " \\\\\n";
                     Files.writeString(resultsPath, results);
                 } catch (IOException e) {
                     throw new RuntimeException(e);

simulator/src/main/java/byzzbench/simulator/transport/Transport.java

@@ -316,6 +316,8 @@ public synchronized void dropEvent(long eventId) {
         e.setStatus(Event.Status.DROPPED);
         this.observers.forEach(o -> o.onEventDropped(e));
         log.info("Dropped: " + e);
+        if(scenario instanceof EDHotStuffScenario edHotStuffScenario)
+            edHotStuffScenario.log("DROPPED MESSAGE: " + e);
     }
 
     /**
@@ -347,6 +349,8 @@ public synchronized void applyMutation(long eventId, Fault fault) {
             throw new IllegalArgumentException("Mutator not found");
         }
 
+        if(e.getStatus() == Event.Status.DROPPED) return;
+
         // check if event is not in QUEUED state
         if (e.getStatus() != Event.Status.QUEUED) {
             throw new IllegalArgumentException("Message not found or not in QUEUED state");