litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3559 Deadlock in DeltaComputer (non-invasive improvements for 1.4.1)

Browse source
This commit is contained in:
stellamit 2012-01-23 22:55:49 +00:00
parent 6edf15eeaf
commit 191d579065
1 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

85
webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
View file

@ -62,7 +62,8 @@ public class SimpleReasoner extends StatementListener {
private CumulativeDeltaModeler aBoxDeltaModeler1 = null; private CumulativeDeltaModeler aBoxDeltaModeler1 = null;
private CumulativeDeltaModeler aBoxDeltaModeler2 = null; private CumulativeDeltaModeler aBoxDeltaModeler2 = null;
private boolean batchMode1 = false, batchMode2 = false; private volatile boolean batchMode1 = false;
private volatile boolean batchMode2 = false;
private boolean stopRequested = false; private boolean stopRequested = false;
private List<ReasonerPlugin> pluginList = new ArrayList<ReasonerPlugin>(); private List<ReasonerPlugin> pluginList = new ArrayList<ReasonerPlugin>();
@ -564,9 +565,10 @@ public class SimpleReasoner extends StatementListener {
*/ */
public void setMostSpecificTypes(Resource individual, Model inferenceModel, HashSet<String> unknownTypes) { public void setMostSpecificTypes(Resource individual, Model inferenceModel, HashSet<String> unknownTypes) {
inferenceModel.enterCriticalSection(Lock.WRITE);
aboxModel.enterCriticalSection(Lock.READ);
tboxModel.enterCriticalSection(Lock.READ); tboxModel.enterCriticalSection(Lock.READ);
aboxModel.enterCriticalSection(Lock.READ);
inferenceModel.enterCriticalSection(Lock.READ);
HashSet<String> typeURIs = new HashSet<String>();
try { try {
OntModel unionModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); OntModel unionModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
@ -611,7 +613,6 @@ public class SimpleReasoner extends StatementListener {
types.add(ontClass); types.add(ontClass);
} }
HashSet<String> typeURIs = new HashSet<String>();
List<OntClass> types2 = new ArrayList<OntClass>(); List<OntClass> types2 = new ArrayList<OntClass>();
types2.addAll(types); types2.addAll(types);
@ -648,14 +649,15 @@ public class SimpleReasoner extends StatementListener {
} }
} }
setMostSpecificTypes(individual, typeURIs, inferenceModel);
} finally { } finally {
inferenceModel.leaveCriticalSection();
aboxModel.leaveCriticalSection(); aboxModel.leaveCriticalSection();
tboxModel.leaveCriticalSection(); tboxModel.leaveCriticalSection();
inferenceModel.leaveCriticalSection();
} }
setMostSpecificTypes(individual, typeURIs, inferenceModel);
return; return;
} }
@ -967,7 +969,7 @@ public class SimpleReasoner extends StatementListener {
log.info("Finished computing mostSpecificType annotations"); log.info("Finished computing mostSpecificType annotations");
} }
public boolean isABoxReasoningAsynchronous() { public synchronized boolean isABoxReasoningAsynchronous() {
if (batchMode1 || batchMode2) { if (batchMode1 || batchMode2) {
return true; return true;
} else { } else {
@ -975,27 +977,6 @@ public class SimpleReasoner extends StatementListener {
} }
} }
protected void startBatchMode() {
if (batchMode1 || batchMode2) {
return;
} else {
batchMode1 = true;
batchMode2 = false;
aBoxDeltaModeler1.getRetractions().removeAll();
log.info("started processing retractions in batch mode");
}
}
protected void endBatchMode() {
if (!batchMode1 && !batchMode2) {
log.warn("SimpleReasoner received an end batch mode request when not currently in batch mode. No action was taken");
return;
}
new Thread(new DeltaComputer(),"DeltaComputer").start();
}
@Override @Override
public synchronized void notifyEvent(Model model, Object event) { public synchronized void notifyEvent(Model model, Object event) {
@ -1003,14 +984,33 @@ public class SimpleReasoner extends StatementListener {
if (((BulkUpdateEvent) event).getBegin()) { if (((BulkUpdateEvent) event).getBegin()) {
log.info("received BulkUpdateEvent(begin)"); log.info("received BulkUpdateEvent(begin)");
startBatchMode();
if (batchMode1 || batchMode2) {
log.info("received a BulkUpdateEvent(begin) while already in batch update mode; this event will be ignored.");
return;
} else {
batchMode1 = true;
batchMode2 = false;
aBoxDeltaModeler1.getRetractions().removeAll();
log.info("started processing retractions in batch mode");
}
} else { } else {
if (!batchMode1 && !batchMode2) {
log.warn("SimpleReasoner received an end batch mode request when not currently in batch mode. No action was taken");
return;
}
log.info("received BulkUpdateEvent(end)"); log.info("received BulkUpdateEvent(end)");
endBatchMode();
if (!deltaComputerProcessing) {
deltaComputerProcessing = true;
new Thread(new DeltaComputer(),"DeltaComputer").start();
}
} }
} }
} }
private volatile boolean deltaComputerProcessing = false;
private class DeltaComputer extends Thread { private class DeltaComputer extends Thread {
public DeltaComputer() { public DeltaComputer() {
} }
@ -1078,18 +1078,19 @@ public class SimpleReasoner extends StatementListener {
log.info("finished computing inferences for batch " + qualifier + " update"); log.info("finished computing inferences for batch " + qualifier + " update");
if (batchMode1 && (aBoxDeltaModeler2.getRetractions().size() > 0)) { if (batchMode1 && (aBoxDeltaModeler2.getRetractions().size() > 0)) {
retractions = aBoxDeltaModeler2.getRetractions();
batchMode2 = true; batchMode2 = true;
batchMode1 = false; batchMode1 = false;
retractions = aBoxDeltaModeler2.getRetractions();
qualifier = "(2)"; qualifier = "(2)";
log.info("switching from batch mode 1 to batch mode 2"); log.info("switching from batch mode 1 to batch mode 2");
} else if (batchMode2 && (aBoxDeltaModeler1.getRetractions().size() > 0)) { } else if (batchMode2 && (aBoxDeltaModeler1.getRetractions().size() > 0)) {
retractions = aBoxDeltaModeler1.getRetractions();
batchMode1 = true; batchMode1 = true;
batchMode2 = false; batchMode2 = false;
retractions = aBoxDeltaModeler1.getRetractions();
qualifier = "(1)"; qualifier = "(1)";
log.info("switching from batch mode 2 to batch mode 1"); log.info("switching from batch mode 2 to batch mode 1");
} else { } else {
deltaComputerProcessing = false;
finished = true; finished = true;
batchMode1 = false; batchMode1 = false;
batchMode2 = false; batchMode2 = false;
@ -1097,21 +1098,21 @@ public class SimpleReasoner extends StatementListener {
} }
} }
if (aBoxDeltaModeler1.getRetractions().size() > 0) { deltaComputerProcessing = false;
log.warn("Unexpected condition: the aBoxDeltaModeler1 retractions model was not empty at the end of the DeltaComputer.run method");
aBoxDeltaModeler1.getRetractions().removeAll();
}
if (aBoxDeltaModeler2.getRetractions().size() > 0) { if (batchMode1 || batchMode2) {
log.warn("Unexpected condition: the aBoxDeltaModeler2 retractions model was not empty at the end of the DeltaComputer.run method");
aBoxDeltaModeler2.getRetractions().removeAll();
}
if (batchMode1 || batchMode2) {
log.warn("Unexpected condition at the end of DeltaComputer.run method: batchMode1=" + batchMode1 + ", batchMode2 =" + batchMode2 + ". (both should be false)" ); log.warn("Unexpected condition at the end of DeltaComputer.run method: batchMode1=" + batchMode1 + ", batchMode2 =" + batchMode2 + ". (both should be false)" );
batchMode1 = false; batchMode1 = false;
batchMode2 = false; batchMode2 = false;
} }
if (aBoxDeltaModeler1.getRetractions().size() > 0) {
log.warn("Unexpected condition: the aBoxDeltaModeler1 retractions model was not empty at the end of the DeltaComputer.run method");
}
if (aBoxDeltaModeler2.getRetractions().size() > 0) {
log.warn("Unexpected condition: the aBoxDeltaModeler2 retractions model was not empty at the end of the DeltaComputer.run method");
}
} }
} }