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=743d7bedd2536aac19bcf5f7256063276770fa7a;hp=37353f3ed432ea9c7f19d3652099cacf43bee01d;hb=7c97a7b30262cabaa42c67e060e63e624f86a631;hpb=f53fb642df66f87fa641cfff7969d75c7c3fa576 diff --git a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java index 37353f3..743d7be 100644 --- a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java +++ b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java @@ -30,23 +30,14 @@ import gov.nasa.jpf.vm.choice.IntIntervalGenerator; import java.io.FileWriter; import java.io.PrintWriter; +import java.lang.reflect.Field; import java.util.*; import java.util.logging.Logger; import java.io.IOException; -// TODO: Fix for Groovy's model-checking -// TODO: This is a setter to change the values of the ChoiceGenerator to implement POR /** - * Simple tool to log state changes. - * - * This DPOR implementation is augmented by the algorithm presented in this SPIN paper: - * http://spinroot.com/spin/symposia/ws08/spin2008_submission_33.pdf - * - * The algorithm is presented on page 11 of the paper. Basically, we have a graph G - * (i.e., visible operation dependency graph). - * This DPOR implementation actually fixes the algorithm in the SPIN paper that does not - * consider cases where a state could be matched early. In this new algorithm/implementation, - * each run is terminated iff: + * This a DPOR implementation for event-driven applications with loops that create cycles of state matching + * In this new DPOR algorithm/implementation, each run is terminated iff: * - we find a state that matches a state in a previous run, or * - we have a matched state in the current run that consists of cycles that contain all choices/events. */ @@ -69,9 +60,12 @@ public class DPORStateReducer extends ListenerAdapter { private int choiceCounter; private int maxEventChoice; // Data structure to track the events seen by each state to track cycles (containing all events) for termination - private HashSet currVisitedStates; // States being visited in the current execution - private HashSet justVisitedStates; // States just visited in the previous choice/event - private HashSet prevVisitedStates; // States visited in the previous execution + private HashSet currVisitedStates; // States being visited in the current execution + private HashSet justVisitedStates; // States just visited in the previous choice/event + private HashSet prevVisitedStates; // States visited in the previous execution + private HashSet nonRelevantClasses;// Class info objects of non-relevant classes + private HashSet nonRelevantFields; // Field info objects of non-relevant fields + private HashSet relevantFields; // Field info objects of relevant fields private HashMap> stateToEventMap; // Data structure to analyze field Read/Write accesses and conflicts private HashMap> backtrackMap; // Track created backtracking points @@ -79,9 +73,7 @@ public class DPORStateReducer extends ListenerAdapter { private Execution currentExecution; // Holds the information about the current execution private HashSet doneBacktrackSet; // Record state ID and trace already constructed private HashMap restorableStateMap; // Maps state IDs to the restorable state object - private HashMap stateToChoiceCounterMap; // Maps state IDs to the choice counter - //private HashMap> rGraph; // Create a reachability graph - private HashMap> rGraph; // Create a reachability graph for past executions + private RGraph rGraph; // R-Graph for past executions // Boolean states private boolean isBooleanCGFlipped; @@ -109,6 +101,9 @@ public class DPORStateReducer extends ListenerAdapter { isBooleanCGFlipped = false; numOfConflicts = 0; numOfTransitions = 0; + nonRelevantClasses = new HashSet<>(); + nonRelevantFields = new HashSet<>(); + relevantFields = new HashSet<>(); restorableStateMap = new HashMap<>(); initializeStatesVariables(); } @@ -227,7 +222,6 @@ public class DPORStateReducer extends ListenerAdapter { @Override public void choiceGeneratorAdvanced(VM vm, ChoiceGenerator currentCG) { - if (stateReductionMode) { // Check the boolean CG and if it is flipped, we are resetting the analysis if (currentCG instanceof BooleanChoiceGenerator) { @@ -246,8 +240,10 @@ public class DPORStateReducer extends ListenerAdapter { // If this is a new CG then we need to update data structures resetStatesForNewExecution(icsCG, vm); // If we don't see a fair scheduling of events/choices then we have to enforce it - fairSchedulingAndBacktrackPoint(icsCG, vm); - // Explore the next backtrack point: + ensureFairSchedulingAndSetupTransition(icsCG, vm); + // Update backtrack set of an executed event (transition): one transition before this one + updateBacktrackSet(currentExecution, choiceCounter - 1); + // Explore the next backtrack point: // 1) if we have seen this state or this state contains cycles that involve all events, and // 2) after the current CG is advanced at least once if (terminateCurrentExecution() && choiceCounter > 0) { @@ -279,26 +275,14 @@ public class DPORStateReducer extends ListenerAdapter { currentChoice = checkAndAdjustChoice(currentChoice, vm); // Record accesses from executed instructions if (executedInsn instanceof JVMFieldInstruction) { - // Analyze only after being initialized - String fieldClass = ((JVMFieldInstruction) executedInsn).getFieldInfo().getFullName(); // We don't care about libraries - if (!isFieldExcluded(fieldClass)) { - analyzeReadWriteAccesses(executedInsn, fieldClass, currentChoice); + if (!isFieldExcluded(executedInsn)) { + analyzeReadWriteAccesses(executedInsn, currentChoice); } } else if (executedInsn instanceof INVOKEINTERFACE) { // Handle the read/write accesses that occur through iterators analyzeReadWriteAccesses(executedInsn, ti, currentChoice); } - // Analyze conflicts from next instructions - if (nextInsn instanceof JVMFieldInstruction) { - // Skip the constructor because it is called once and does not have shared access with other objects - if (!nextInsn.getMethodInfo().getName().equals("")) { - String fieldClass = ((JVMFieldInstruction) nextInsn).getFieldInfo().getFullName(); - if (!isFieldExcluded(fieldClass)) { - findFirstConflictAndCreateBacktrackPoint(currentChoice, nextInsn, fieldClass); - } - } - } } } } @@ -311,90 +295,152 @@ public class DPORStateReducer extends ListenerAdapter { // This class compactly stores backtrack execution: // 1) backtrack choice list, and - // 2) backtrack execution + // 2) first backtrack point (linking with predecessor execution) private class BacktrackExecution { private Integer[] choiceList; - private Execution execution; + private TransitionEvent firstTransition; - public BacktrackExecution(Integer[] choList, Execution exec) { + public BacktrackExecution(Integer[] choList, TransitionEvent fTransition) { choiceList = choList; - execution = exec; + firstTransition = fTransition; } public Integer[] getChoiceList() { return choiceList; } - public Execution getExecution() { - return execution; - } - } - - // This class compactly stores backtrack points: - // 1) backtrack state ID, and - // 2) backtracking choices - private class BacktrackPoint { - private IntChoiceFromSet backtrackCG; // CG at this backtrack point - private int stateId; // State at this backtrack point - private int choice; // Choice chosen at this backtrack point - - public BacktrackPoint(IntChoiceFromSet cg, int stId, int cho) { - backtrackCG = cg; - stateId = stId; - choice = cho; - } - - public IntChoiceFromSet getBacktrackCG() { return backtrackCG; } - - public int getStateId() { - return stateId; - } - - public int getChoice() { - return choice; + public TransitionEvent getFirstTransition() { + return firstTransition; } } - // This class stores a representation of the execution graph node + // This class stores a representation of an execution + // TODO: We can modify this class to implement some optimization (e.g., clock-vector) + // TODO: We basically need to keep track of: + // TODO: (1) last read/write access to each memory location + // TODO: (2) last state with two or more incoming events/transitions private class Execution { - private ArrayList executionTrace; // The BacktrackPoint objects of this execution - private int parentChoice; // The parent's choice that leads to this execution - private Execution parent; // Store the parent for backward DFS to find conflicts + private HashMap cgToChoiceMap; // Map between CG to choice numbers for O(1) access + private ArrayList executionTrace; // The BacktrackPoint objects of this execution + private boolean isNew; // Track if this is the first time it is accessed private HashMap readWriteFieldsMap; // Record fields that are accessed public Execution() { + cgToChoiceMap = new HashMap<>(); executionTrace = new ArrayList<>(); - parentChoice = -1; - parent = null; + isNew = true; readWriteFieldsMap = new HashMap<>(); } - public void addBacktrackPoint(BacktrackPoint newBacktrackPoint) { + public void addTransition(TransitionEvent newBacktrackPoint) { executionTrace.add(newBacktrackPoint); } - public ArrayList getExecutionTrace() { + public void clearCGToChoiceMap() { + cgToChoiceMap = null; + } + + public int getChoiceFromCG(IntChoiceFromSet icsCG) { + return cgToChoiceMap.get(icsCG); + } + + public ArrayList getExecutionTrace() { return executionTrace; } - public int getParentChoice() { - return parentChoice; + public TransitionEvent getFirstTransition() { + return executionTrace.get(0); } - public Execution getParent() { - return parent; + public TransitionEvent getLastTransition() { + return executionTrace.get(executionTrace.size() - 1); } public HashMap getReadWriteFieldsMap() { return readWriteFieldsMap; } - public void setParentChoice(int parChoice) { - parentChoice = parChoice; + public boolean isNew() { + if (isNew) { + // Right after this is accessed, it is no longer new + isNew = false; + return true; + } + return false; + } + + public void mapCGToChoice(IntChoiceFromSet icsCG, int choice) { + cgToChoiceMap.put(icsCG, choice); + } + } + + // This class compactly stores a predecessor + // 1) a predecessor execution + // 2) the predecessor choice in that predecessor execution + private class Predecessor { + private int choice; // Predecessor choice + private Execution execution; // Predecessor execution + + public Predecessor(int predChoice, Execution predExec) { + choice = predChoice; + execution = predExec; + } + + public int getChoice() { + return choice; + } + + public Execution getExecution() { + return execution; + } + } + + // This class represents a R-Graph (in the paper it is a state transition graph R) + // This implementation stores reachable transitions from and connects with past executions + private class RGraph { + private int hiStateId; // Maximum state Id + private HashMap> graph; // Reachable transitions from past executions + + public RGraph() { + hiStateId = 0; + graph = new HashMap<>(); + } + + public void addReachableTransition(int stateId, TransitionEvent transition) { + HashSet transitionSet; + if (graph.containsKey(stateId)) { + transitionSet = graph.get(stateId); + } else { + transitionSet = new HashSet<>(); + graph.put(stateId, transitionSet); + } + // Insert into the set if it does not contain it yet + if (!transitionSet.contains(transition)) { + transitionSet.add(transition); + } + // Update highest state ID + if (hiStateId < stateId) { + hiStateId = stateId; + } + } + + public HashSet getReachableTransitionsAtState(int stateId) { + if (!graph.containsKey(stateId)) { + // This is a loop from a transition to itself, so just return the current transition + HashSet transitionSet = new HashSet<>(); + transitionSet.add(currentExecution.getLastTransition()); + return transitionSet; + } + return graph.get(stateId); } - public void setParent(Execution par) { - parent = par; + public HashSet getReachableTransitions(int stateId) { + 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)); + } + return reachableTransitions; } } @@ -402,66 +448,155 @@ public class DPORStateReducer extends ListenerAdapter { // We store the field name and its object ID // Sharing the same field means the same field name and object ID private class ReadWriteSet { - private HashMap readSet; - private HashMap writeSet; + private HashMap readMap; + private HashMap writeMap; public ReadWriteSet() { - readSet = new HashMap<>(); - writeSet = new HashMap<>(); + readMap = new HashMap<>(); + writeMap = new HashMap<>(); } public void addReadField(String field, int objectId) { - readSet.put(field, objectId); + readMap.put(field, objectId); } public void addWriteField(String field, int objectId) { - writeSet.put(field, objectId); + writeMap.put(field, objectId); + } + + public void removeReadField(String field) { + readMap.remove(field); + } + + public void removeWriteField(String field) { + writeMap.remove(field); + } + + public boolean isEmpty() { + return readMap.isEmpty() && writeMap.isEmpty(); + } + + public ReadWriteSet getCopy() { + ReadWriteSet copyRWSet = new ReadWriteSet(); + // Copy the maps in the set into the new object copy + copyRWSet.setReadMap(new HashMap<>(this.getReadMap())); + copyRWSet.setWriteMap(new HashMap<>(this.getWriteMap())); + return copyRWSet; } public Set getReadSet() { - return readSet.keySet(); + return readMap.keySet(); } public Set getWriteSet() { - return writeSet.keySet(); + return writeMap.keySet(); } public boolean readFieldExists(String field) { - return readSet.containsKey(field); + return readMap.containsKey(field); } public boolean writeFieldExists(String field) { - return writeSet.containsKey(field); + return writeMap.containsKey(field); } public int readFieldObjectId(String field) { - return readSet.get(field); + return readMap.get(field); } public int writeFieldObjectId(String field) { - return writeSet.get(field); + return writeMap.get(field); + } + + private HashMap getReadMap() { + return readMap; + } + + private HashMap getWriteMap() { + return writeMap; + } + + private void setReadMap(HashMap rMap) { + readMap = rMap; + } + + private void setWriteMap(HashMap wMap) { + writeMap = wMap; } } - // This class stores a compact representation of a reachability graph for past executions -// private class ReachableTrace { -// private ArrayList pastBacktrackPointList; -// private HashMap pastReadWriteFieldsMap; -// -// public ReachableTrace(ArrayList btrackPointList, -// HashMap rwFieldsMap) { -// pastBacktrackPointList = btrackPointList; -// pastReadWriteFieldsMap = rwFieldsMap; -// } -// -// public ArrayList getPastBacktrackPointList() { -// return pastBacktrackPointList; -// } -// -// public HashMap getPastReadWriteFieldsMap() { -// return pastReadWriteFieldsMap; -// } -// } + // This class compactly stores transitions: + // 1) CG, + // 2) state ID, + // 3) choice, + // 4) predecessors (for backward DFS). + private class TransitionEvent { + private int choice; // Choice chosen at this transition + 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 int stateId; // State at this transition + private IntChoiceFromSet transitionCG; // CG at this transition + + public TransitionEvent() { + choice = 0; + choiceCounter = 0; + execution = null; + predecessors = new HashSet<>(); + stateId = 0; + transitionCG = null; + } + + public int getChoice() { + return choice; + } + + public int getChoiceCounter() { + return choiceCounter; + } + + public Execution getExecution() { + return execution; + } + + public HashSet getPredecessors() { + return predecessors; + } + + public int getStateId() { + return stateId; + } + + public IntChoiceFromSet getTransitionCG() { return transitionCG; } + + public void recordPredecessor(Execution execution, int choice) { + predecessors.add(new Predecessor(choice, execution)); + } + + public void setChoice(int cho) { + choice = cho; + } + + public void setChoiceCounter(int choCounter) { + choiceCounter = choCounter; + } + + public void setExecution(Execution exec) { + execution = exec; + } + + public void setPredecessors(HashSet preds) { + predecessors = new HashSet<>(preds); + } + + public void setStateId(int stId) { + stateId = stId; + } + + public void setTransitionCG(IntChoiceFromSet cg) { + transitionCG = cg; + } + } // -- CONSTANTS private final static String DO_CALL_METHOD = "doCall"; @@ -484,7 +619,14 @@ public class DPORStateReducer extends ListenerAdapter { private final static String JAVA_STRING_LIB = "java.lang.String"; // -- FUNCTIONS - private void fairSchedulingAndBacktrackPoint(IntChoiceFromSet icsCG, VM vm) { + private Integer[] copyChoices(Integer[] choicesToCopy) { + + Integer[] copyOfChoices = new Integer[choicesToCopy.length]; + System.arraycopy(choicesToCopy, 0, copyOfChoices, 0, choicesToCopy.length); + return copyOfChoices; + } + + private void ensureFairSchedulingAndSetupTransition(IntChoiceFromSet icsCG, VM vm) { // Check the next choice and if the value is not the same as the expected then force the expected value int choiceIndex = choiceCounter % refChoices.length; int nextChoice = icsCG.getNextChoice(); @@ -495,19 +637,37 @@ public class DPORStateReducer extends ListenerAdapter { icsCG.setChoice(currCGIndex, expectedChoice); } } - // Record state ID and choice/event as backtrack point + // Get state ID and associate it with this transition int stateId = vm.getStateId(); - currentExecution.addBacktrackPoint(new BacktrackPoint(icsCG, stateId, refChoices[choiceIndex])); + TransitionEvent transition = setupTransition(icsCG, stateId, choiceIndex); + // Add new transition to the current execution and map it in R-Graph + for (Integer stId : justVisitedStates) { // Map this transition to all the previously passed states + rGraph.addReachableTransition(stId, transition); + } + currentExecution.mapCGToChoice(icsCG, choiceCounter); // Store restorable state object for this state (always store the latest) RestorableVMState restorableState = vm.getRestorableState(); restorableStateMap.put(stateId, restorableState); } - private Integer[] copyChoices(Integer[] choicesToCopy) { + private TransitionEvent setupTransition(IntChoiceFromSet icsCG, int stateId, int choiceIndex) { + // Get a new transition + TransitionEvent transition; + if (currentExecution.isNew()) { + // We need to handle the first transition differently because this has a predecessor execution + transition = currentExecution.getFirstTransition(); + } else { + transition = new TransitionEvent(); + currentExecution.addTransition(transition); + transition.recordPredecessor(currentExecution, choiceCounter - 1); + } + transition.setExecution(currentExecution); + transition.setTransitionCG(icsCG); + transition.setStateId(stateId); + transition.setChoice(refChoices[choiceIndex]); + transition.setChoiceCounter(choiceCounter); - Integer[] copyOfChoices = new Integer[choicesToCopy.length]; - System.arraycopy(choicesToCopy, 0, copyOfChoices, 0, choicesToCopy.length); - return copyOfChoices; + return transition; } // --- Functions related to cycle detection and reachability graph @@ -518,8 +678,7 @@ public class DPORStateReducer extends ListenerAdapter { // (2) the state has one or more cycles that involve all the events // With simple approach we only need to check for a re-visited state. // Basically, we have to check that we have executed all events between two occurrences of such state. - private boolean containsCyclesWithAllEvents(int stId) { - + private boolean completeFullCycle(int stId) { // False if the state ID hasn't been recorded if (!stateToEventMap.containsKey(stId)) { return false; @@ -550,9 +709,9 @@ public class DPORStateReducer extends ListenerAdapter { backtrackMap = new HashMap<>(); backtrackStateQ = new PriorityQueue<>(Collections.reverseOrder()); currentExecution = new Execution(); + currentExecution.addTransition(new TransitionEvent()); // Always start with 1 backtrack point doneBacktrackSet = new HashSet<>(); - stateToChoiceCounterMap = new HashMap<>(); - rGraph = new HashMap<>(); + rGraph = new RGraph(); // Booleans isEndOfExecution = false; } @@ -567,28 +726,11 @@ public class DPORStateReducer extends ListenerAdapter { } } - private void saveExecutionToRGraph(int stateId) { - // Save execution state into the reachability graph only if - // (1) It is not a revisited state from a past execution, or - // (2) It is just a new backtracking point - if (!prevVisitedStates.contains(stateId) || - choiceCounter <= 1) { - ArrayList reachableExecutions; - if (!prevVisitedStates.contains(stateId)) { - reachableExecutions = new ArrayList<>(); - rGraph.put(stateId, reachableExecutions); - } else { - reachableExecutions = rGraph.get(stateId); - } - reachableExecutions.add(currentExecution); - } - } - private boolean terminateCurrentExecution() { // We need to check all the states that have just been visited // Often a transition (choice/event) can result into forwarding/backtracking to a number of states for(Integer stateId : justVisitedStates) { - if (prevVisitedStates.contains(stateId) || containsCyclesWithAllEvents(stateId)) { + if (prevVisitedStates.contains(stateId) || completeFullCycle(stateId)) { return true; } } @@ -597,23 +739,23 @@ public class DPORStateReducer extends ListenerAdapter { private void updateStateInfo(Search search) { // Update the state variables - // Line 19 in the paper page 11 (see the heading note above) int stateId = search.getStateId(); // Insert state ID into the map if it is new if (!stateToEventMap.containsKey(stateId)) { HashSet eventSet = new HashSet<>(); stateToEventMap.put(stateId, eventSet); } - saveExecutionToRGraph(stateId); analyzeReachabilityAndCreateBacktrackPoints(search.getVM(), stateId); - stateToChoiceCounterMap.put(stateId, choiceCounter); justVisitedStates.add(stateId); - currVisitedStates.add(stateId); + if (!prevVisitedStates.contains(stateId)) { + // It is a currently visited states if the state has not been seen in previous executions + currVisitedStates.add(stateId); + } } // --- Functions related to Read/Write access analysis on shared fields - private void addNewBacktrackPoint(int stateId, Integer[] newChoiceList, Execution parentExecution, int parentChoice) { + private void addNewBacktrackPoint(int stateId, Integer[] newChoiceList, TransitionEvent conflictTransition) { // Insert backtrack point to the right state ID LinkedList backtrackExecList; if (backtrackMap.containsKey(stateId)) { @@ -623,10 +765,9 @@ public class DPORStateReducer extends ListenerAdapter { backtrackMap.put(stateId, backtrackExecList); } // Add the new backtrack execution object - Execution newExecution = new Execution(); - newExecution.setParent(parentExecution); - newExecution.setParentChoice(parentChoice); - backtrackExecList.addFirst(new BacktrackExecution(newChoiceList, newExecution)); + TransitionEvent backtrackTransition = new TransitionEvent(); + backtrackTransition.setPredecessors(conflictTransition.getPredecessors()); + backtrackExecList.addFirst(new BacktrackExecution(newChoiceList, backtrackTransition)); // Add to priority queue if (!backtrackStateQ.contains(stateId)) { backtrackStateQ.add(stateId); @@ -634,17 +775,28 @@ public class DPORStateReducer extends ListenerAdapter { } // Analyze Read/Write accesses that are directly invoked on fields - private void analyzeReadWriteAccesses(Instruction executedInsn, String fieldClass, int currentChoice) { + private void analyzeReadWriteAccesses(Instruction executedInsn, int currentChoice) { + // Get the field info + FieldInfo fieldInfo = ((JVMFieldInstruction) executedInsn).getFieldInfo(); + // Analyze only after being initialized + String fieldClass = fieldInfo.getFullName(); // Do the analysis to get Read and Write accesses to fields ReadWriteSet rwSet = getReadWriteSet(currentChoice); - int objectId = ((JVMFieldInstruction) executedInsn).getFieldInfo().getClassInfo().getClassObjectRef(); + int objectId = fieldInfo.getClassInfo().getClassObjectRef(); // Record the field in the map if (executedInsn instanceof WriteInstruction) { - // Exclude certain field writes because of infrastructure needs, e.g., Event class field writes - for (String str : EXCLUDED_FIELDS_READ_WRITE_INSTRUCTIONS_STARTS_WITH_LIST) { - if (fieldClass.startsWith(str)) { - return; + // We first check the non-relevant fields set + if (!nonRelevantFields.contains(fieldInfo)) { + // Exclude certain field writes because of infrastructure needs, e.g., Event class field writes + for (String str : EXCLUDED_FIELDS_READ_WRITE_INSTRUCTIONS_STARTS_WITH_LIST) { + if (fieldClass.startsWith(str)) { + nonRelevantFields.add(fieldInfo); + return; + } } + } else { + // If we have this field in the non-relevant fields set then we return right away + return; } rwSet.addWriteField(fieldClass, objectId); } else if (executedInsn instanceof ReadInstruction) { @@ -673,9 +825,17 @@ public class DPORStateReducer extends ListenerAdapter { return; } // We exclude library classes (they start with java, org, etc.) and some more - String objClassName = eiAccessObj.getClassInfo().getName(); - if (excludeThisForItStartsWith(EXCLUDED_FIELDS_STARTS_WITH_LIST, objClassName) || - excludeThisForItStartsWith(EXCLUDED_FIELDS_READ_WRITE_INSTRUCTIONS_STARTS_WITH_LIST, objClassName)) { + ClassInfo classInfo = eiAccessObj.getClassInfo(); + String objClassName = classInfo.getName(); + // Check if this class info is part of the non-relevant classes set already + if (!nonRelevantClasses.contains(classInfo)) { + if (excludeThisForItStartsWith(EXCLUDED_FIELDS_READ_WRITE_INSTRUCTIONS_STARTS_WITH_LIST, objClassName) || + excludeThisForItStartsWith(EXCLUDED_FIELDS_STARTS_WITH_LIST, objClassName)) { + nonRelevantClasses.add(classInfo); + return; + } + } else { + // If it is part of the non-relevant classes set then return immediately return; } // Extract fields from this object and put them into the read write @@ -696,8 +856,6 @@ public class DPORStateReducer extends ListenerAdapter { private int checkAndAdjustChoice(int currentChoice, VM vm) { // If current choice is not the same, then this is caused by the firing of IntIntervalGenerator // for certain method calls in the infrastructure, e.g., eventSince() - int currChoiceInd = currentChoice % refChoices.length; - int currChoiceFromCG = currChoiceInd; ChoiceGenerator currentCG = vm.getChoiceGenerator(); // This is the main event CG if (currentCG instanceof IntIntervalGenerator) { @@ -707,48 +865,37 @@ public class DPORStateReducer extends ListenerAdapter { while (!(parentCG instanceof IntChoiceFromSet)) { parentCG = ((IntIntervalGenerator) parentCG).getPreviousChoiceGenerator(); } - int actualEvtNum = ((IntChoiceFromSet) parentCG).getNextChoice(); - // Find the index of the event/choice in refChoices - for (int i = 0; i pastTrace = execution.getExecutionTrace(); - ArrayList currTrace = currentExecution.getExecutionTrace(); - int btrackChoice = currTrace.get(backtrackChoice).getChoice(); - int stateId = pastTrace.get(conflictChoice).getStateId(); + ArrayList currentTrace = execution.getExecutionTrace(); + ArrayList conflictTrace = conflictExecution.getExecutionTrace(); + int currChoice = currentTrace.get(currentChoice).getChoice(); + int stateId = conflictTrace.get(conflictChoice).getStateId(); // Check if this trace has been done from this state - if (isTraceAlreadyConstructed(btrackChoice, stateId)) { + if (isTraceAlreadyConstructed(currChoice, stateId)) { return; } // Put the conflicting event numbers first and reverse the order - newChoiceList[0] = btrackChoice; - newChoiceList[1] = pastTrace.get(conflictChoice).getChoice(); + newChoiceList[0] = currChoice; // Put the rest of the event numbers into the array starting from the minimum to the upper bound - for (int i = 0, j = 2; i < refChoices.length; i++) { - if (refChoices[i] != newChoiceList[0] && refChoices[i] != newChoiceList[1]) { + for (int i = 0, j = 1; i < refChoices.length; i++) { + if (refChoices[i] != newChoiceList[0]) { newChoiceList[j] = refChoices[i]; j++; } } - // Parent choice is conflict choice - 1 - addNewBacktrackPoint(stateId, newChoiceList, execution, conflictChoice - 1); + // Predecessor of the new backtrack point is the same as the conflict point's + addNewBacktrackPoint(stateId, newChoiceList, conflictTrace.get(conflictChoice)); } private boolean excludeThisForItContains(String[] excludedStrings, String className) { @@ -779,13 +926,12 @@ public class DPORStateReducer extends ListenerAdapter { } private void exploreNextBacktrackPoints(VM vm, IntChoiceFromSet icsCG) { - // Check if we are reaching the end of our execution: no more backtracking points to explore // cgMap, backtrackMap, backtrackStateQ are updated simultaneously (checking backtrackStateQ is enough) if (!backtrackStateQ.isEmpty()) { // Set done all the other backtrack points - for (BacktrackPoint backtrackPoint : currentExecution.getExecutionTrace()) { - backtrackPoint.getBacktrackCG().setDone(); + for (TransitionEvent backtrackTransition : currentExecution.getExecutionTrace()) { + backtrackTransition.getTransitionCG().setDone(); } // Reset the next backtrack point with the latest state int hiStateId = backtrackStateQ.peek(); @@ -807,83 +953,26 @@ public class DPORStateReducer extends ListenerAdapter { isEndOfExecution = true; } - private void findFirstConflictAndCreateBacktrackPoint(int currentChoice, Instruction nextInsn, String fieldClass) { - // Check for conflict (go backward from current choice and get the first conflict) - Execution execution = currentExecution; - // Actual choice of the current execution trace - //int actualChoice = currentChoice % refChoices.length; - // Choice/event we want to check for conflict against (start from actual choice) - int pastChoice = currentChoice; - // Perform backward DFS through the execution graph - while (true) { - // Get the next conflict choice - if (pastChoice > 0) { - // Case #1: check against a previous choice in the same execution for conflict - pastChoice = pastChoice - 1; - } else { // pastChoice == 0 means we are at the first BacktrackPoint of this execution path - // Case #2: check against a previous choice in a parent execution - int parentChoice = execution.getParentChoice(); - if (parentChoice > -1) { - // Get the parent execution - execution = execution.getParent(); - pastChoice = execution.getParentChoice(); - } else { - // If parent is -1 then this is the first execution (it has no parent) and we stop here - break; - } - } - // Check if a conflict is found - if (isConflictFound(nextInsn, fieldClass, currentChoice, pastChoice, execution)) { - createBacktrackingPoint(currentChoice, pastChoice, execution); - break; // Stop at the first found conflict - } - } - } - - private boolean isConflictFound(Instruction nextInsn, String fieldClass, int currentChoice, - int pastChoice, Execution pastExecution) { - - HashMap pastRWFieldsMap = pastExecution.getReadWriteFieldsMap(); - ArrayList pastTrace = pastExecution.getExecutionTrace(); - ArrayList currTrace = currentExecution.getExecutionTrace(); + private boolean isConflictFound(Execution execution, int reachableChoice, Execution conflictExecution, int conflictChoice, + ReadWriteSet currRWSet) { + ArrayList executionTrace = execution.getExecutionTrace(); + ArrayList conflictTrace = conflictExecution.getExecutionTrace(); + HashMap confRWFieldsMap = conflictExecution.getReadWriteFieldsMap(); // Skip if this event does not have any Read/Write set or the two events are basically the same event (number) - if (!pastRWFieldsMap.containsKey(pastChoice) || - //choices[actualChoice] == pastTrace.get(pastChoice).getChoice()) { - currTrace.get(currentChoice).getChoice() == pastTrace.get(pastChoice).getChoice()) { + if (!confRWFieldsMap.containsKey(conflictChoice) || + executionTrace.get(reachableChoice).getChoice() == conflictTrace.get(conflictChoice).getChoice()) { return false; } - HashMap currRWFieldsMap = pastExecution.getReadWriteFieldsMap(); - ReadWriteSet rwSet = currRWFieldsMap.get(pastChoice); - int currObjId = ((JVMFieldInstruction) nextInsn).getFieldInfo().getClassInfo().getClassObjectRef(); - // Check for conflicts with Write fields for both Read and Write instructions - if (((nextInsn instanceof WriteInstruction || nextInsn instanceof ReadInstruction) && - rwSet.writeFieldExists(fieldClass) && rwSet.writeFieldObjectId(fieldClass) == currObjId) || - (nextInsn instanceof WriteInstruction && rwSet.readFieldExists(fieldClass) && - rwSet.readFieldObjectId(fieldClass) == currObjId)) { - return true; - } - return false; - } - - private boolean isConflictFound(int reachableChoice, int conflictChoice, Execution execution) { - - ArrayList executionTrace = execution.getExecutionTrace(); - HashMap execRWFieldsMap = execution.getReadWriteFieldsMap(); - // Skip if this event does not have any Read/Write set or the two events are basically the same event (number) - if (!execRWFieldsMap.containsKey(conflictChoice) || - executionTrace.get(reachableChoice).getChoice() == executionTrace.get(conflictChoice).getChoice()) { - return false; - } - // Current R/W set - ReadWriteSet currRWSet = execRWFieldsMap.get(reachableChoice); // R/W set of choice/event that may have a potential conflict - ReadWriteSet evtRWSet = execRWFieldsMap.get(conflictChoice); + ReadWriteSet confRWSet = confRWFieldsMap.get(conflictChoice); // Check for conflicts with Read and Write fields for Write instructions Set currWriteSet = currRWSet.getWriteSet(); for(String writeField : currWriteSet) { int currObjId = currRWSet.writeFieldObjectId(writeField); - if ((evtRWSet.readFieldExists(writeField) && evtRWSet.readFieldObjectId(writeField) == currObjId) || - (evtRWSet.writeFieldExists(writeField) && evtRWSet.writeFieldObjectId(writeField) == currObjId)) { + if ((confRWSet.readFieldExists(writeField) && confRWSet.readFieldObjectId(writeField) == currObjId) || + (confRWSet.writeFieldExists(writeField) && confRWSet.writeFieldObjectId(writeField) == currObjId)) { + // Remove this from the write set as we are tracking per memory location + currRWSet.removeWriteField(writeField); return true; } } @@ -891,7 +980,9 @@ public class DPORStateReducer extends ListenerAdapter { Set currReadSet = currRWSet.getReadSet(); for(String readField : currReadSet) { int currObjId = currRWSet.readFieldObjectId(readField); - if (evtRWSet.writeFieldExists(readField) && evtRWSet.writeFieldObjectId(readField) == currObjId) { + if (confRWSet.writeFieldExists(readField) && confRWSet.writeFieldObjectId(readField) == currObjId) { + // Remove this from the read set as we are tracking per memory location + currRWSet.removeReadField(readField); return true; } } @@ -913,17 +1004,31 @@ public class DPORStateReducer extends ListenerAdapter { return rwSet; } - private boolean isFieldExcluded(String field) { + private boolean isFieldExcluded(Instruction executedInsn) { + // Get the field info + FieldInfo fieldInfo = ((JVMFieldInstruction) executedInsn).getFieldInfo(); + // Check if the non-relevant fields set already has it + if (nonRelevantFields.contains(fieldInfo)) { + return true; + } + // Check if the relevant fields set already has it + if (relevantFields.contains(fieldInfo)) { + return false; + } + // Analyze only after being initialized + String field = fieldInfo.getFullName(); // Check against "starts-with", "ends-with", and "contains" list if (excludeThisForItStartsWith(EXCLUDED_FIELDS_STARTS_WITH_LIST, field) || excludeThisForItEndsWith(EXCLUDED_FIELDS_ENDS_WITH_LIST, field) || excludeThisForItContains(EXCLUDED_FIELDS_CONTAINS_LIST, field)) { + nonRelevantFields.add(fieldInfo); return true; } - + relevantFields.add(fieldInfo); return false; } + // 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! @@ -942,6 +1047,7 @@ public class DPORStateReducer extends ListenerAdapter { return false; } + // Reset data structure for each new execution private void resetStatesForNewExecution(IntChoiceFromSet icsCG, VM vm) { if (choices == null || choices != icsCG.getAllChoices()) { // Reset state variables @@ -950,12 +1056,12 @@ public class DPORStateReducer extends ListenerAdapter { refChoices = copyChoices(choices); // Clear data structures currVisitedStates = new HashSet<>(); - stateToChoiceCounterMap = new HashMap<>(); stateToEventMap = new HashMap<>(); isEndOfExecution = false; } } + // Set a backtrack point for a particular state private void setBacktrackCG(int stateId, IntChoiceFromSet backtrackCG) { // Set a backtrack CG based on a state ID LinkedList backtrackExecutions = backtrackMap.get(stateId); @@ -964,12 +1070,11 @@ public class DPORStateReducer extends ListenerAdapter { backtrackCG.setStateId(stateId); backtrackCG.reset(); // Update current execution with this new execution - Execution newExecution = backtrackExecution.getExecution(); - if (newExecution.getParentChoice() == -1) { - // If it is -1 then that means we should start from the end of the parent trace for backward DFS - ArrayList parentTrace = newExecution.getParent().getExecutionTrace(); - newExecution.setParentChoice(parentTrace.size() - 1); - } + Execution newExecution = new Execution(); + TransitionEvent firstTransition = backtrackExecution.getFirstTransition(); + newExecution.addTransition(firstTransition); + // Try to free some memory since this map is only used for the current execution + currentExecution.clearCGToChoiceMap(); currentExecution = newExecution; // Remove from the queue if we don't have more backtrack points for that state if (backtrackExecutions.isEmpty()) { @@ -978,141 +1083,119 @@ public class DPORStateReducer extends ListenerAdapter { } } - // --- Functions related to the reachability analysis when there is a state match - - // We use backtrackPointsList to analyze the reachable states/events when there is a state match: - // 1) Whenever there is state match, there is a cycle of events - // 2) We need to analyze and find conflicts for the reachable choices/events in the cycle - // 3) Then we create a new backtrack point for every new conflict - private void analyzeReachabilityAndCreateBacktrackPoints(VM vm, int stateId) { - // Perform this analysis only when: - // 1) there is a state match, - // 2) this is not during a switch to a new execution, - // 3) at least 2 choices/events have been explored (choiceCounter > 1), - // 4) the matched state has been encountered in the current execution, and - // 5) state > 0 (state 0 is for boolean CG) - if (!vm.isNewState() && !isEndOfExecution && choiceCounter > 1 && (stateId > 0)) { - if (currVisitedStates.contains(stateId)) { - // Update the backtrack sets in the cycle - updateBacktrackSetsInCycle(stateId); - } /* else if (prevVisitedStates.contains(stateId)) { // We visit a state in a previous execution - // Update the backtrack sets in a previous execution - updateBacktrackSetsInPreviousExecution(stateId); - }*/ + // Update backtrack sets + // 1) recursively, and + // 2) track accesses per memory location (per shared variable/field) + private void updateBacktrackSet(Execution execution, int currentChoice) { + // Copy ReadWriteSet object + HashMap currRWFieldsMap = execution.getReadWriteFieldsMap(); + ReadWriteSet currRWSet = currRWFieldsMap.get(currentChoice); + if (currRWSet == null) { + return; } + currRWSet = currRWSet.getCopy(); + // 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); } - // Get the start event for the past execution trace when there is a state matched from a past execution - private int getPastConflictChoice(int stateId, ArrayList pastBacktrackPointList) { - // Iterate and find the first occurrence of the state ID - // It is guaranteed that a choice should be found because the state ID is in the list - int pastConfChoice = 0; - for(int i = 0; i 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); +// } +// } - // Get a sorted list of reachable state IDs starting from the input stateId - private ArrayList getReachableStateIds(Set stateIds, int stateId) { - // Only include state IDs equal or greater than the input stateId: these are reachable states - ArrayList sortedStateIds = new ArrayList<>(); - for(Integer stId : stateIds) { - if (stId >= stateId) { - sortedStateIds.add(stId); - } + // 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; } - Collections.sort(sortedStateIds); - return sortedStateIds; - } - - // Update the backtrack sets in the cycle - private void updateBacktrackSetsInCycle(int stateId) { - // Find the choice/event that marks the start of this cycle: first choice we explore for conflicts - int reachableChoice = stateToChoiceCounterMap.get(stateId); - int cycleEndChoice = choiceCounter - 1; - // Find conflicts between choices/events in this cycle (we scan forward in the cycle, not backward) - while (reachableChoice < cycleEndChoice) { - for (int conflictChoice = reachableChoice + 1; conflictChoice <= cycleEndChoice; conflictChoice++) { - if (isConflictFound(reachableChoice, conflictChoice, currentExecution)) { - createBacktrackingPoint(reachableChoice, conflictChoice, currentExecution); - } + 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(); + // Push up one happens-before transition + int pushedChoice = hbChoice; + Execution pushedExecution = hbExecution; + // Check if a conflict is found + if (isConflictFound(execution, currentChoice, conflictExecution, conflictChoice, currRWSet)) { + createBacktrackingPoint(pushedExecution, pushedChoice, conflictExecution, conflictChoice); + pushedChoice = conflictChoice; + pushedExecution = conflictExecution; } - reachableChoice++; + // Continue performing DFS if conflict is not found + updateBacktrackSetRecursive(execution, currentChoice, conflictExecution, conflictChoice, + pushedExecution, pushedChoice, currRWSet, visited); } + // Remove the transition after being explored + // TODO: Seems to cause a lot of loops---commented out for now + //visited.remove(confTrans); } - // TODO: OPTIMIZATION! - // Check and make sure that state ID and choice haven't been explored for this trace - private boolean isNotChecked(HashMap> checkedStateIdAndChoice, - BacktrackPoint backtrackPoint) { - int stateId = backtrackPoint.getStateId(); - int choice = backtrackPoint.getChoice(); - HashSet choiceSet; - if (checkedStateIdAndChoice.containsKey(stateId)) { - choiceSet = checkedStateIdAndChoice.get(stateId); - if (choiceSet.contains(choice)) { - // State ID and choice found. It has been checked! - return false; + // --- Functions related to the reachability analysis when there is a state match + + private void analyzeReachabilityAndCreateBacktrackPoints(VM vm, int stateId) { + // Perform this analysis only when: + // 1) this is not during a switch to a new execution, + // 2) at least 2 choices/events have been explored (choiceCounter > 1), + // 3) state > 0 (state 0 is for boolean CG) + if (!isEndOfExecution && choiceCounter > 1 && stateId > 0) { + if (currVisitedStates.contains(stateId) || prevVisitedStates.contains(stateId)) { + // Update reachable transitions in the graph with a predecessor + HashSet reachableTransitions = rGraph.getReachableTransitionsAtState(stateId); + for(TransitionEvent transition : reachableTransitions) { + transition.recordPredecessor(currentExecution, choiceCounter - 1); + } + updateBacktrackSetsFromPreviousExecution(stateId); } - } else { - choiceSet = new HashSet<>(); - checkedStateIdAndChoice.put(stateId, choiceSet); } - choiceSet.add(choice); - - return true; } - // Update the backtrack sets in a previous execution - private void updateBacktrackSetsInPreviousExecution(int stateId) { - // Don't check a past trace twice! - HashSet checkedTrace = new HashSet<>(); - // Don't check the same event twice for a revisited state - HashMap> checkedStateIdAndChoice = new HashMap<>(); - // Get sorted reachable state IDs - ArrayList reachableStateIds = getReachableStateIds(rGraph.keySet(), stateId); - // Iterate from this state ID until the biggest state ID - for(Integer stId : reachableStateIds) { - // Find the right reachability graph object that contains the stateId - ArrayList rExecutions = rGraph.get(stId); - for (Execution rExecution : rExecutions) { - if (!checkedTrace.contains(rExecution)) { - // Find the choice/event that marks the start of the subtrace from the previous execution - ArrayList pastExecutionTrace = rExecution.getExecutionTrace(); - HashMap pastReadWriteFieldsMap = rExecution.getReadWriteFieldsMap(); - int pastConfChoice = getPastConflictChoice(stId, pastExecutionTrace); - int conflictChoice = choiceCounter; - // Iterate from the starting point until the end of the past execution trace - while (pastConfChoice < pastExecutionTrace.size() - 1) { // BacktrackPoint list always has a surplus of 1 - // Get the info of the event from the past execution trace - BacktrackPoint confBtrackPoint = pastExecutionTrace.get(pastConfChoice); - if (isNotChecked(checkedStateIdAndChoice, confBtrackPoint)) { - ReadWriteSet rwSet = pastReadWriteFieldsMap.get(pastConfChoice); - // Append this event to the current list and map - ArrayList currentTrace = currentExecution.getExecutionTrace(); - HashMap currRWFieldsMap = currentExecution.getReadWriteFieldsMap(); - currentTrace.add(confBtrackPoint); - currRWFieldsMap.put(choiceCounter, rwSet); - for (int pastChoice = conflictChoice - 1; pastChoice >= 0; pastChoice--) { - if (isConflictFound(conflictChoice, pastChoice, rExecution)) { - createBacktrackingPoint(conflictChoice, pastChoice, rExecution); - } - } - // Remove this event to replace it with a new one - currentTrace.remove(currentTrace.size() - 1); - currRWFieldsMap.remove(choiceCounter); - } - pastConfChoice++; - } - checkedTrace.add(rExecution); - } - } + // Update the backtrack sets from previous executions + private void updateBacktrackSetsFromPreviousExecution(int stateId) { + // Collect all the reachable transitions from R-Graph + HashSet reachableTransitions = rGraph.getReachableTransitions(stateId); + for(TransitionEvent transition : reachableTransitions) { + Execution execution = transition.getExecution(); + int currentChoice = transition.getChoiceCounter(); + updateBacktrackSet(execution, currentChoice); } } }