*/
package gov.nasa.jpf.listener;
-import com.sun.org.apache.xpath.internal.operations.Bool;
import gov.nasa.jpf.Config;
import gov.nasa.jpf.JPF;
import gov.nasa.jpf.ListenerAdapter;
Transition transition;
// State reduction fields
+ private Integer[] choices;
private int choiceCounter;
private Integer choiceUpperBound;
private boolean isInitialized;
// e.g., event number 1 can have two backtrack sequences: {3,1,2,4,...} and {2,1,3,4,...}
private HashMap<Integer,LinkedList<Integer[]>> backtrackMap;
private HashMap<Integer,HashSet<Integer>> conflictPairMap;
+ // Map choicelist with start index
+ private HashMap<Integer[],Integer> choiceListStartIndexMap;
public StateReducer (Config config, JPF jpf) {
debugMode = config.getBoolean("debug_state_transition", false);
private void initializeStateReduction() {
if (stateReductionMode) {
+ choices = null;
choiceCounter = 0;
choiceUpperBound = 0;
isInitialized = false;
readWriteFieldsMap = new HashMap<>();
backtrackMap = new HashMap<>();
conflictPairMap = new HashMap<>();
+ choiceListStartIndexMap = new HashMap<>();
}
}
if (nextCG instanceof IntChoiceFromSet) {
IntChoiceFromSet icsCG = (IntChoiceFromSet) nextCG;
// Check if CG has been initialized, otherwise initialize it
- Object[] choices = icsCG.getAllChoices();
+ Integer[] cgChoices = icsCG.getAllChoices();
if (!isInitialized) {
// Get the upper bound from the last element of the choices
- choiceUpperBound = (Integer) choices[choices.length - 1];
+ choiceUpperBound = (Integer) cgChoices[cgChoices.length - 1];
isInitialized = true;
}
// Record the subsequent Integer CGs only until we hit the upper bound
- if (choiceCounter < choiceUpperBound && !cgMap.containsValue(choiceCounter)) {
+ if (!isResetAfterAnalysis && choiceCounter <= choiceUpperBound && !cgMap.containsValue(choiceCounter)) {
// Update the choices of the first CG and add '-1'
- Integer[] newChoices = new Integer[choices.length + 1];
- System.arraycopy(choices, 0, newChoices, 0, choices.length);
- newChoices[newChoices.length - 1] = -1;
- icsCG.setNewValues(newChoices);
+ if (choices == null) {
+ // All the choices are always the same so we only need to update it once
+ choices = new Integer[cgChoices.length + 1];
+ System.arraycopy(cgChoices, 0, choices, 0, cgChoices.length);
+ choices[choices.length - 1] = -1;
+ }
+ icsCG.setNewValues(choices);
icsCG.reset();
// Advance the current Integer CG
// This way we explore all the event numbers in the first pass
- icsCG.advance(choiceCounter);
- cgMap.put(icsCG, choiceCounter);
+ icsCG.advance(choices[choiceCounter]);
+ cgMap.put(icsCG, choices[choiceCounter]);
choiceCounter++;
} else {
// Set done the subsequent CGs
// Deploy the new choice list for this CG
cg.setNewValues(choiceList);
cg.reset();
+ } else {
+ cg.setDone();
}
}
}
@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) {
// are chosen first before repeating the same choice of value twice!
if (currentCG instanceof IntChoiceFromSet) {
IntChoiceFromSet icsCG = (IntChoiceFromSet) currentCG;
+ // Update the current pointer to the current set of choices
+ if (choices == null || choices != icsCG.getAllChoices()) {
+ choiceListStartIndexMap.remove(choices);
+ choices = icsCG.getAllChoices();
+ // Reset a few things for the sub-graph
+ conflictPairMap = new HashMap<>();
+ readWriteFieldsMap = new HashMap<>();
+ choiceCounter = 0;
+ }
+ // Traverse the sub-graphs
+ if (isResetAfterAnalysis) {
+ // Advance choice counter for sub-graphs
+ choiceCounter++;
+ // Do this for every CG after finishing each backtrack list
+ if (icsCG.getNextChoice() == -1) {
+ int event = cgMap.get(icsCG);
+ LinkedList<Integer[]> choiceLists = backtrackMap.get(event);
+ if (choiceLists != null && choiceLists.peekFirst() != null) {
+ Integer[] choiceList = choiceLists.removeFirst();
+ // Deploy the new choice list for this CG
+ icsCG.setNewValues(choiceList);
+ icsCG.reset();
+ } else {
+ // Set done if this was the last backtrack list
+ icsCG.setDone();
+ }
+ }
+ }
// Update and reset the CG if needed (do this for the first time after the analysis)
if (!isResetAfterAnalysis && icsCG.getNextChoice() == -1) {
resetAllCGs();
isResetAfterAnalysis = true;
}
- // Do this for every CG after finishing each backtrack list
- if (isResetAfterAnalysis && icsCG.getNextChoice() == -1) {
- int event = cgMap.get(icsCG);
- LinkedList<Integer[]> choiceLists = backtrackMap.get(event);
- if (choiceLists.peekFirst() != null) {
- Integer[] choiceList = choiceLists.removeFirst();
- // Deploy the new choice list for this CG
- icsCG.setNewValues(choiceList);
- icsCG.reset();
- } else {
- // Set done if this was the last backtrack list
- icsCG.setDone();
- }
- }
}
}
}
}
// This class compactly stores Read and Write field sets
+ // 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 HashSet<String> readSet;
- private HashSet<String> writeSet;
+ private HashMap<String,Integer> readSet;
+ private HashMap<String,Integer> writeSet;
public ReadWriteSet() {
- readSet = new HashSet<>();
- writeSet = new HashSet<>();
+ readSet = new HashMap<>();
+ writeSet = new HashMap<>();
}
- public void addReadField(String field) {
- readSet.add(field);
+ public void addReadField(String field, int objectId) {
+ readSet.put(field, objectId);
}
- public void addWriteField(String field) {
- writeSet.add(field);
+ public void addWriteField(String field, int objectId) {
+ writeSet.put(field, objectId);
}
public boolean readFieldExists(String field) {
- return readSet.contains(field);
+ return readSet.containsKey(field);
}
public boolean writeFieldExists(String field) {
- return writeSet.contains(field);
+ return writeSet.containsKey(field);
+ }
+
+ public int readFieldObjectId(String field) {
+ return readSet.get(field);
+ }
+
+ public int writeFieldObjectId(String field) {
+ return writeSet.get(field);
}
}
- private void analyzeReadWriteAccesses(Instruction executedInsn, String fieldClass) {
+ private void analyzeReadWriteAccesses(Instruction executedInsn, String fieldClass, int currentChoice) {
// Do the analysis to get Read and Write accesses to fields
ReadWriteSet rwSet;
// We already have an entry
- if (readWriteFieldsMap.containsKey(choiceCounter)) {
- rwSet = readWriteFieldsMap.get(choiceCounter);
+ if (readWriteFieldsMap.containsKey(choices[currentChoice])) {
+ rwSet = readWriteFieldsMap.get(choices[currentChoice]);
} else { // We need to create a new entry
rwSet = new ReadWriteSet();
- readWriteFieldsMap.put(choiceCounter, rwSet);
+ readWriteFieldsMap.put(choices[currentChoice], rwSet);
}
+ int objectId = ((JVMFieldInstruction) executedInsn).getFieldInfo().getClassInfo().getClassObjectRef();
// Record the field in the map
if (executedInsn instanceof WriteInstruction) {
- rwSet.addWriteField(fieldClass);
- }
- if (executedInsn instanceof ReadInstruction) {
- rwSet.addReadField(fieldClass);
+ // Exclude certain field writes because of infrastructure needs, e.g., Event class field writes
+ for(String str : EXCLUDED_FIELDS_WRITE_INSTRUCTIONS_STARTS_WITH_LIST) {
+ if (fieldClass.startsWith(str)) {
+ return;
+ }
+ }
+ rwSet.addWriteField(fieldClass, objectId);
+ } else if (executedInsn instanceof ReadInstruction) {
+ rwSet.addReadField(fieldClass, objectId);
}
}
private void createBacktrackChoiceList(int currentChoice, int conflictEventNumber) {
- int minChoice = Math.min(currentChoice, conflictEventNumber);
- int maxChoice = Math.max(currentChoice, conflictEventNumber);
LinkedList<Integer[]> backtrackChoiceLists;
// Check if we have a list for this choice number
// If not we create a new one for it
- if (!backtrackMap.containsKey(minChoice)) {
+ if (!backtrackMap.containsKey(conflictEventNumber)) {
backtrackChoiceLists = new LinkedList<>();
- backtrackMap.put(minChoice, backtrackChoiceLists);
+ backtrackMap.put(conflictEventNumber, backtrackChoiceLists);
} else {
- backtrackChoiceLists = backtrackMap.get(minChoice);
+ backtrackChoiceLists = backtrackMap.get(conflictEventNumber);
}
- // TODO: The following might change depending on the POR implementation detail
// Create a new list of choices for backtrack based on the current choice and conflicting event number
// If we have a conflict between 1 and 3, then we create the list {3, 1, 2, 4, 5} for backtrack
// The backtrack point is the CG for event number 1 and the list length is one less than the original list
// (originally of length 6) since we don't start from event number 0
- int maxListLength = choiceUpperBound + 1;
- int listLength = maxListLength - minChoice;
- Integer[] choiceList = new Integer[listLength+1];
- // Put the conflicting event numbers first and reverse the order
- choiceList[0] = maxChoice;
- choiceList[1] = minChoice;
- // Put the rest of the event numbers into the array starting from the minimum to the upper bound
- for(int i = minChoice + 1, j = 2; j < listLength; i++) {
- if (i != maxChoice) {
- choiceList[j] = i;
- j++;
+ if (!isResetAfterAnalysis) {
+ int maxListLength = choiceUpperBound + 1;
+ int listLength = maxListLength - conflictEventNumber;
+ Integer[] newChoiceList = new Integer[listLength + 1];
+ // Put the conflicting event numbers first and reverse the order
+ newChoiceList[0] = choices[currentChoice];
+ newChoiceList[1] = choices[conflictEventNumber];
+ // Put the rest of the event numbers into the array starting from the minimum to the upper bound
+ for (int i = conflictEventNumber + 1, j = 2; j < listLength; i++) {
+ if (choices[i] != choices[currentChoice]) {
+ newChoiceList[j] = choices[i];
+ j++;
+ }
+ }
+ // Set the last element to '-1' as the end of the sequence
+ newChoiceList[newChoiceList.length - 1] = -1;
+ backtrackChoiceLists.addLast(newChoiceList);
+ // The start index for the recursion is always 1 (from the main branch)
+ choiceListStartIndexMap.put(newChoiceList, 1);
+ } else { // This is a sub-graph
+ int listLength = choices.length;
+ Integer[] newChoiceList = new Integer[listLength];
+ // Copy everything before the conflict number
+ for(int i = 0; i < conflictEventNumber; i++) {
+ newChoiceList[i] = choices[i];
}
+ // Put the conflicting events
+ newChoiceList[conflictEventNumber] = choices[currentChoice];
+ newChoiceList[conflictEventNumber + 1] = choices[conflictEventNumber];
+ // Copy the rest
+ for(int i = conflictEventNumber + 1, j = conflictEventNumber + 2; j < listLength - 1; i++) {
+ if (choices[i] != choices[currentChoice]) {
+ newChoiceList[j] = choices[i];
+ j++;
+ }
+ }
+ // Set the last element to '-1' as the end of the sequence
+ newChoiceList[newChoiceList.length - 1] = -1;
+ backtrackChoiceLists.addLast(newChoiceList);
+ // For the sub-graph the start index depends on the conflicting event number
+ choiceListStartIndexMap.put(newChoiceList, conflictEventNumber + 1);
}
- // Set the last element to '-1' as the end of the sequence
- choiceList[choiceList.length - 1] = -1;
- backtrackChoiceLists.addLast(choiceList);
+ }
+
+ // We exclude fields that come from libraries (Java and Groovy), and also the infrastructure
+ private final static String[] EXCLUDED_FIELDS_STARTS_WITH_LIST =
+ // Java and Groovy libraries
+ { "java", "org", "sun", "com", "gov", "groovy"};
+ private final static String[] EXCLUDED_FIELDS_ENDS_WITH_LIST =
+ // Groovy library created fields
+ {"stMC", "callSiteArray", "metaClass", "staticClassInfo", "__constructor__",
+ // Infrastructure
+ "sendEvent", "Object", "reference", "location", "app", "state", "log", "functionList", "objectList",
+ "eventList", "valueList", "settings", "printToConsole", "app1", "app2"};
+ private final static String[] EXCLUDED_FIELDS_CONTAINS_LIST = {"_closure"};
+ private final static String[] EXCLUDED_FIELDS_WRITE_INSTRUCTIONS_STARTS_WITH_LIST = {"Event"};
+
+ private boolean isFieldExcluded(String field) {
+ // Check against "starts-with" list
+ for(String str : EXCLUDED_FIELDS_STARTS_WITH_LIST) {
+ if (field.startsWith(str)) {
+ return true;
+ }
+ }
+ // Check against "ends-with" list
+ for(String str : EXCLUDED_FIELDS_ENDS_WITH_LIST) {
+ if (field.endsWith(str)) {
+ return true;
+ }
+ }
+ // Check against "contains" list
+ for(String str : EXCLUDED_FIELDS_CONTAINS_LIST) {
+ if (field.contains(str)) {
+ return true;
+ }
+ }
+
+ return false;
}
@Override
public void instructionExecuted(VM vm, ThreadInfo ti, Instruction nextInsn, Instruction executedInsn) {
if (stateReductionMode) {
- // Record accesses from executed instructions
- if (executedInsn instanceof JVMFieldInstruction) {
- String fieldClass = ((JVMFieldInstruction) executedInsn).getFieldInfo().getFullName();
- // We don't care about libraries
- if (!fieldClass.startsWith("java") &&
- !fieldClass.startsWith("org") &&
- !fieldClass.startsWith("sun") &&
- !fieldClass.startsWith("com") &&
- !fieldClass.startsWith("gov") &&
- !fieldClass.startsWith("groovy") &&
- // and fields generated for the Groovy library
- !fieldClass.endsWith("stMC") &&
- !fieldClass.endsWith("callSiteArray") &&
- !fieldClass.endsWith("metaClass") &&
- !fieldClass.endsWith("staticClassInfo") &&
- !fieldClass.endsWith("__constructor__")) {
+ if (isInitialized) {
+ if (choiceCounter > choices.length - 1) {
+ // We do not compute the conflicts for the choice '-1'
+ return;
+ }
+ int currentChoice = choiceCounter - 1;
+ // Record accesses from executed instructions
+ if (executedInsn instanceof JVMFieldInstruction) {
// Analyze only after being initialized
- if (isInitialized) {
- analyzeReadWriteAccesses(executedInsn, fieldClass);
+ String fieldClass = ((JVMFieldInstruction) executedInsn).getFieldInfo().getFullName();
+ // We don't care about libraries
+ if (!isFieldExcluded(fieldClass)) {
+ analyzeReadWriteAccesses(executedInsn, fieldClass, currentChoice);
}
}
- }
- // Analyze conflicts from next instructions
- if (nextInsn instanceof JVMFieldInstruction) {
- String fieldClass = ((JVMFieldInstruction) nextInsn).getFieldInfo().getFullName();
- // We don't care about libraries
- if (!fieldClass.startsWith("java") &&
- !fieldClass.startsWith("org") &&
- !fieldClass.startsWith("sun") &&
- !fieldClass.startsWith("com") &&
- !fieldClass.startsWith("gov") &&
- !fieldClass.startsWith("groovy") &&
- // and fields generated for the Groovy library
- !fieldClass.endsWith("stMC") &&
- !fieldClass.endsWith("callSiteArray") &&
- !fieldClass.endsWith("metaClass") &&
- !fieldClass.endsWith("staticClassInfo") &&
- !fieldClass.endsWith("__constructor__")) {
- // Check for conflict (go backward from currentChoice and get the first conflict)
- // If the current event has conflicts with multiple events, then these will be detected
- // one by one as this recursively checks backward when backtrack set is revisited and executed.
- for(int eventNumber=choiceCounter-1; eventNumber>=0; eventNumber--) {
- // Skip if this event number does not have any Read/Write set
- if (!readWriteFieldsMap.containsKey(eventNumber)) {
- continue;
- }
- ReadWriteSet rwSet = readWriteFieldsMap.get(eventNumber);
- // 1) Check for conflicts with Write fields for both Read and Write instructions
- // 2) Check for conflicts with Read fields for Write instructions
- if (((nextInsn instanceof WriteInstruction || nextInsn instanceof ReadInstruction) &&
- rwSet.writeFieldExists(fieldClass)) ||
- (nextInsn instanceof WriteInstruction && rwSet.readFieldExists(fieldClass))) {
- // We do not record and service the same backtrack pair/point twice!
- // If it has been serviced before, we just skip this
- if (recordConflictPair(choiceCounter, eventNumber)) {
- createBacktrackChoiceList(choiceCounter, eventNumber);
- // Break if a conflict is found!
- break;
+ // Analyze conflicts from next instructions
+ if (nextInsn instanceof JVMFieldInstruction) {
+ // The constructor is only called once when the object is initialized
+ // It does not have shared access with other objects
+ MethodInfo mi = nextInsn.getMethodInfo();
+ if (!mi.getName().equals("<init>")) {
+ String fieldClass = ((JVMFieldInstruction) nextInsn).getFieldInfo().getFullName();
+ // We don't care about libraries
+ if (!isFieldExcluded(fieldClass)) {
+ // For the main graph we go down to 0, but for subgraph, we only go down to 1 since 0 contains
+ // the reversed event
+ int end = !isResetAfterAnalysis ? 0 : choiceListStartIndexMap.get(choices);
+ // Check for conflict (go backward from currentChoice and get the first conflict)
+ // If the current event has conflicts with multiple events, then these will be detected
+ // one by one as this recursively checks backward when backtrack set is revisited and executed.
+ for (int eventNumber = currentChoice - 1; eventNumber >= end; eventNumber--) {
+ // Skip if this event number does not have any Read/Write set
+ if (!readWriteFieldsMap.containsKey(choices[eventNumber])) {
+ continue;
+ }
+ ReadWriteSet rwSet = readWriteFieldsMap.get(choices[eventNumber]);
+ int currObjId = ((JVMFieldInstruction) nextInsn).getFieldInfo().getClassInfo().getClassObjectRef();
+ // 1) 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)) {
+ // We do not record and service the same backtrack pair/point twice!
+ // If it has been serviced before, we just skip this
+ if (recordConflictPair(currentChoice, eventNumber)) {
+ createBacktrackChoiceList(currentChoice, eventNumber);
+ // Break if a conflict is found!
+ break;
+ }
+ }
}
}
}
projects / jpf-core.git / blobdiff