X-Git-Url: http://plrg.eecs.uci.edu/git/?p=jpf-core.git;a=blobdiff_plain;f=src%2Fmain%2Fgov%2Fnasa%2Fjpf%2Flistener%2FDPORStateReducer.java;h=9ce2c3dea6bffb7bdd0501604478e3b48ff12549;hp=743d7bedd2536aac19bcf5f7256063276770fa7a;hb=5d4e110b75a38751b0e2a49188f298389ab025e1;hpb=7c97a7b30262cabaa42c67e060e63e624f86a631 diff --git a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java old mode 100644 new mode 100755 index 743d7be..9ce2c3d --- a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java +++ b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java @@ -20,8 +20,9 @@ package gov.nasa.jpf.listener; import gov.nasa.jpf.Config; import gov.nasa.jpf.JPF; import gov.nasa.jpf.ListenerAdapter; +import gov.nasa.jpf.jvm.bytecode.INVOKEINTERFACE; +import gov.nasa.jpf.jvm.bytecode.JVMFieldInstruction; import gov.nasa.jpf.search.Search; -import gov.nasa.jpf.jvm.bytecode.*; import gov.nasa.jpf.vm.*; import gov.nasa.jpf.vm.bytecode.ReadInstruction; import gov.nasa.jpf.vm.bytecode.WriteInstruction; @@ -29,11 +30,10 @@ import gov.nasa.jpf.vm.choice.IntChoiceFromSet; import gov.nasa.jpf.vm.choice.IntIntervalGenerator; import java.io.FileWriter; +import java.io.IOException; import java.io.PrintWriter; -import java.lang.reflect.Field; import java.util.*; import java.util.logging.Logger; -import java.io.IOException; /** * This a DPOR implementation for event-driven applications with loops that create cycles of state matching @@ -71,7 +71,7 @@ public class DPORStateReducer extends ListenerAdapter { private HashMap> backtrackMap; // Track created backtracking points private PriorityQueue backtrackStateQ; // Heap that returns the latest state private Execution currentExecution; // Holds the information about the current execution - private HashSet doneBacktrackSet; // Record state ID and trace already constructed + private HashMap> doneBacktrackMap; // Record state ID and trace already constructed private HashMap restorableStateMap; // Maps state IDs to the restorable state object private RGraph rGraph; // R-Graph for past executions @@ -80,9 +80,8 @@ public class DPORStateReducer extends ListenerAdapter { private boolean isEndOfExecution; // Statistics - private int numOfConflicts; private int numOfTransitions; - + public DPORStateReducer(Config config, JPF jpf) { verboseMode = config.getBoolean("printout_state_transition", false); stateReductionMode = config.getBoolean("activate_state_reduction", true); @@ -99,7 +98,6 @@ public class DPORStateReducer extends ListenerAdapter { } } isBooleanCGFlipped = false; - numOfConflicts = 0; numOfTransitions = 0; nonRelevantClasses = new HashSet<>(); nonRelevantFields = new HashSet<>(); @@ -171,19 +169,13 @@ public class DPORStateReducer extends ListenerAdapter { @Override public void searchFinished(Search search) { - if (stateReductionMode) { - // Number of conflicts = first trace + subsequent backtrack points - numOfConflicts += 1 + doneBacktrackSet.size(); - } if (verboseMode) { out.println("\n==> DEBUG: ----------------------------------- search finished"); out.println("\n==> DEBUG: State reduction mode : " + stateReductionMode); - out.println("\n==> DEBUG: Number of conflicts : " + numOfConflicts); out.println("\n==> DEBUG: Number of transitions : " + numOfTransitions); out.println("\n==> DEBUG: ----------------------------------- search finished" + "\n"); fileWriter.println("==> DEBUG: State reduction mode : " + stateReductionMode); - fileWriter.println("==> DEBUG: Number of conflicts : " + numOfConflicts); fileWriter.println("==> DEBUG: Number of transitions : " + numOfTransitions); fileWriter.println(); fileWriter.close(); @@ -196,6 +188,8 @@ public class DPORStateReducer extends ListenerAdapter { // Initialize with necessary information from the CG if (nextCG instanceof IntChoiceFromSet) { IntChoiceFromSet icsCG = (IntChoiceFromSet) nextCG; + // Tell JPF that we are performing DPOR + icsCG.setDpor(); if (!isEndOfExecution) { // Check if CG has been initialized, otherwise initialize it Integer[] cgChoices = icsCG.getAllChoices(); @@ -228,8 +222,6 @@ public class DPORStateReducer extends ListenerAdapter { if (!isBooleanCGFlipped) { isBooleanCGFlipped = true; } else { - // Number of conflicts = first trace + subsequent backtrack points - numOfConflicts = 1 + doneBacktrackSet.size(); // Allocate new objects for data structure when the boolean is flipped from "false" to "true" initializeStatesVariables(); } @@ -438,7 +430,11 @@ public class DPORStateReducer extends ListenerAdapter { HashSet reachableTransitions = new HashSet<>(); // All transitions from states higher than the given state ID (until the highest state ID) are reachable for(int stId = stateId; stId <= hiStateId; stId++) { - reachableTransitions.addAll(graph.get(stId)); + // We might encounter state IDs from the first round of Boolean CG + // The second round of Boolean CG should consider these new states + if (graph.containsKey(stId)) { + reachableTransitions.addAll(graph.get(stId)); + } } return reachableTransitions; } @@ -535,6 +531,8 @@ public class DPORStateReducer extends ListenerAdapter { private int choiceCounter; // Choice counter at this transition private Execution execution; // The execution where this transition belongs private HashSet predecessors; // Maps incoming events/transitions (execution and choice) + private HashMap> recordedPredecessors; + // Memorize event and choice number to not record them twice private int stateId; // State at this transition private IntChoiceFromSet transitionCG; // CG at this transition @@ -543,6 +541,7 @@ public class DPORStateReducer extends ListenerAdapter { choiceCounter = 0; execution = null; predecessors = new HashSet<>(); + recordedPredecessors = new HashMap<>(); stateId = 0; transitionCG = null; } @@ -569,8 +568,28 @@ public class DPORStateReducer extends ListenerAdapter { public IntChoiceFromSet getTransitionCG() { return transitionCG; } + private boolean isRecordedPredecessor(Execution execution, int choice) { + // See if we have recorded this predecessor earlier + HashSet recordedChoices; + if (recordedPredecessors.containsKey(execution)) { + recordedChoices = recordedPredecessors.get(execution); + if (recordedChoices.contains(choice)) { + return true; + } + } else { + recordedChoices = new HashSet<>(); + recordedPredecessors.put(execution, recordedChoices); + } + // Record the choice if we haven't seen it + recordedChoices.add(choice); + + return false; + } + public void recordPredecessor(Execution execution, int choice) { - predecessors.add(new Predecessor(choice, execution)); + if (!isRecordedPredecessor(execution, choice)) { + predecessors.add(new Predecessor(choice, execution)); + } } public void setChoice(int cho) { @@ -646,8 +665,10 @@ public class DPORStateReducer extends ListenerAdapter { } currentExecution.mapCGToChoice(icsCG, choiceCounter); // Store restorable state object for this state (always store the latest) - RestorableVMState restorableState = vm.getRestorableState(); - restorableStateMap.put(stateId, restorableState); + if (!restorableStateMap.containsKey(stateId)) { + RestorableVMState restorableState = vm.getRestorableState(); + restorableStateMap.put(stateId, restorableState); + } } private TransitionEvent setupTransition(IntChoiceFromSet icsCG, int stateId, int choiceIndex) { @@ -710,7 +731,7 @@ public class DPORStateReducer extends ListenerAdapter { backtrackStateQ = new PriorityQueue<>(Collections.reverseOrder()); currentExecution = new Execution(); currentExecution.addTransition(new TransitionEvent()); // Always start with 1 backtrack point - doneBacktrackSet = new HashSet<>(); + doneBacktrackMap = new HashMap<>(); rGraph = new RGraph(); // Booleans isEndOfExecution = false; @@ -876,6 +897,9 @@ public class DPORStateReducer extends ListenerAdapter { // Create a new list of choices for backtrack based on the current choice and conflicting event number // E.g. if we have a conflict between 1 and 3, then we create the list {3, 1, 0, 2} // for the original set {0, 1, 2, 3} + + // execution/currentChoice represent the event/transaction that will be put into the backtracking set of + // conflictExecution/conflictChoice Integer[] newChoiceList = new Integer[refChoices.length]; ArrayList currentTrace = execution.getExecutionTrace(); ArrayList conflictTrace = conflictExecution.getExecutionTrace(); @@ -955,6 +979,7 @@ public class DPORStateReducer extends ListenerAdapter { private boolean isConflictFound(Execution execution, int reachableChoice, Execution conflictExecution, int conflictChoice, ReadWriteSet currRWSet) { + // conflictExecution/conflictChoice represent a predecessor event/transaction that can potentially have a conflict ArrayList executionTrace = execution.getExecutionTrace(); ArrayList conflictTrace = conflictExecution.getExecutionTrace(); HashMap confRWFieldsMap = conflictExecution.getReadWriteFieldsMap(); @@ -1031,19 +1056,20 @@ public class DPORStateReducer extends ListenerAdapter { // Check if this trace is already constructed private boolean isTraceAlreadyConstructed(int firstChoice, int stateId) { // Concatenate state ID and only the first event in the string, e.g., "1:1 for the trace 10234 at state 1" - // TODO: THIS IS AN OPTIMIZATION! - // This is the optimized version because after we execute, e.g., the trace 1:10234, we don't need to try - // another trace that starts with event 1 at state 1, e.g., the trace 1:13024 - // The second time this event 1 is explored, it will generate the same state as the first one - StringBuilder sb = new StringBuilder(); - sb.append(stateId); - sb.append(':'); - sb.append(firstChoice); // Check if the trace has been constructed as a backtrack point for this state - if (doneBacktrackSet.contains(sb.toString())) { - return true; + // TODO: THIS IS AN OPTIMIZATION! + HashSet choiceSet; + if (doneBacktrackMap.containsKey(stateId)) { + choiceSet = doneBacktrackMap.get(stateId); + if (choiceSet.contains(firstChoice)) { + return true; + } + } else { + choiceSet = new HashSet<>(); + doneBacktrackMap.put(stateId, choiceSet); } - doneBacktrackSet.add(sb.toString()); + choiceSet.add(firstChoice); + return false; } @@ -1097,76 +1123,40 @@ public class DPORStateReducer extends ListenerAdapter { // Memorize visited TransitionEvent object while performing backward DFS to avoid getting caught up in a cycle HashSet visited = new HashSet<>(); // Update backtrack set recursively - // TODO: The following is the call to the original version of the method -// updateBacktrackSetRecursive(execution, currentChoice, execution, currentChoice, currRWSet, visited); - // TODO: The following is the call to the version of the method with pushing up happens-before transitions - updateBacktrackSetRecursive(execution, currentChoice, execution, currentChoice, execution, currentChoice, currRWSet, visited); + updateBacktrackSetRecursive(execution, currentChoice, execution, currentChoice, currRWSet, visited); } -// TODO: This is the original version of the recursive method -// private void updateBacktrackSetRecursive(Execution execution, int currentChoice, -// Execution conflictExecution, int conflictChoice, -// ReadWriteSet currRWSet, HashSet visited) { -// // Halt when we have found the first read/write conflicts for all memory locations -// if (currRWSet.isEmpty()) { -// return; -// } -// TransitionEvent confTrans = conflictExecution.getExecutionTrace().get(conflictChoice); -// // Halt when we have visited this transition (in a cycle) -// if (visited.contains(confTrans)) { -// return; -// } -// visited.add(confTrans); -// // Explore all predecessors -// for (Predecessor predecessor : confTrans.getPredecessors()) { -// // Get the predecessor (previous conflict choice) -// conflictChoice = predecessor.getChoice(); -// conflictExecution = predecessor.getExecution(); -// // Check if a conflict is found -// if (isConflictFound(execution, currentChoice, conflictExecution, conflictChoice, currRWSet)) { -// createBacktrackingPoint(execution, currentChoice, conflictExecution, conflictChoice); -// } -// // Continue performing DFS if conflict is not found -// updateBacktrackSetRecursive(execution, currentChoice, conflictExecution, conflictChoice, currRWSet, visited); -// } -// } - - // TODO: This is the version of the method with pushing up happens-before transitions private void updateBacktrackSetRecursive(Execution execution, int currentChoice, Execution conflictExecution, int conflictChoice, - Execution hbExecution, int hbChoice, ReadWriteSet currRWSet, HashSet visited) { // Halt when we have found the first read/write conflicts for all memory locations if (currRWSet.isEmpty()) { return; } - TransitionEvent confTrans = conflictExecution.getExecutionTrace().get(conflictChoice); + TransitionEvent currTrans = execution.getExecutionTrace().get(currentChoice); // Halt when we have visited this transition (in a cycle) - if (visited.contains(confTrans)) { + if (visited.contains(currTrans)) { return; } - visited.add(confTrans); + visited.add(currTrans); // Explore all predecessors - for (Predecessor predecessor : confTrans.getPredecessors()) { + for (Predecessor predecessor : currTrans.getPredecessors()) { // Get the predecessor (previous conflict choice) - conflictChoice = predecessor.getChoice(); - conflictExecution = predecessor.getExecution(); + int predecessorChoice = predecessor.getChoice(); + Execution predecessorExecution = predecessor.getExecution(); // Push up one happens-before transition - int pushedChoice = hbChoice; - Execution pushedExecution = hbExecution; + int newConflictChoice = conflictChoice; + Execution newConflictExecution = conflictExecution; // Check if a conflict is found - if (isConflictFound(execution, currentChoice, conflictExecution, conflictChoice, currRWSet)) { - createBacktrackingPoint(pushedExecution, pushedChoice, conflictExecution, conflictChoice); - pushedChoice = conflictChoice; - pushedExecution = conflictExecution; + if (isConflictFound(conflictExecution, conflictChoice, predecessorExecution, predecessorChoice, currRWSet)) { + createBacktrackingPoint(conflictExecution, conflictChoice, predecessorExecution, predecessorChoice); + newConflictChoice = predecessorChoice; + newConflictExecution = predecessorExecution; } // Continue performing DFS if conflict is not found - updateBacktrackSetRecursive(execution, currentChoice, conflictExecution, conflictChoice, - pushedExecution, pushedChoice, currRWSet, visited); + updateBacktrackSetRecursive(predecessorExecution, predecessorChoice, newConflictExecution, newConflictChoice, + currRWSet, visited); } - // Remove the transition after being explored - // TODO: Seems to cause a lot of loops---commented out for now - //visited.remove(confTrans); } // --- Functions related to the reachability analysis when there is a state match @@ -1183,13 +1173,13 @@ public class DPORStateReducer extends ListenerAdapter { for(TransitionEvent transition : reachableTransitions) { transition.recordPredecessor(currentExecution, choiceCounter - 1); } - updateBacktrackSetsFromPreviousExecution(stateId); + updateBacktrackSetsFromGraph(stateId); } } } // Update the backtrack sets from previous executions - private void updateBacktrackSetsFromPreviousExecution(int stateId) { + private void updateBacktrackSetsFromGraph(int stateId) { // Collect all the reachable transitions from R-Graph HashSet reachableTransitions = rGraph.getReachableTransitions(stateId); for(TransitionEvent transition : reachableTransitions) {