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

NIHVIVO-2873 (have threads pay attention to shutdown state)

Browse source
This commit is contained in:
stellamit 2011-07-13 16:38:42 +00:00
parent bc7164bc55
commit 999659dbcf
5 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -302,7 +302,8 @@ public class IndividualController extends FreemarkerHttpServlet {
}
// If still no custom template defined, and inferencing is asynchronous (under RDB), check
// the superclasses of the vclass for a custom template specification.
if (customTemplate == null && SimpleReasoner.isSimpleReasonerSetupComplete(getServletContext())) {
SimpleReasoner simpleReasoner = (SimpleReasoner) getServletContext().getAttribute(SimpleReasoner.class.getName());
if (customTemplate == null && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) {
log.debug("Checking superclasses for custom template specification because ABox reasoning is asynchronous");
for (VClass directVClass : directClasses) {
VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();

7
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
View file

@ -32,13 +32,14 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
String messageStr = "";
try {
if (!SimpleReasoner.isSimpleReasonerSetupComplete(vreq.getSession().getServletContext())) {
Object simpleReasoner = vreq.getSession().getServletContext().getAttribute(SimpleReasoner.class.getName());
if ((simpleReasoner instanceof SimpleReasoner) && !((SimpleReasoner)simpleReasoner).isABoxReasoningAsynchronous()) {
messageStr = "No SimpleReasoner has been set up.";
} else {
String signal = (String) vreq.getParameter("signal");
Object simpleReasoner = vreq.getSession().getServletContext().getAttribute(SimpleReasoner.class.getName());
if (simpleReasoner instanceof SimpleReasoner) {
if (((SimpleReasoner)simpleReasoner).isRecomputing()) {

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

@ -62,8 +62,8 @@ public class SimpleReasoner extends StatementListener {
private CumulativeDeltaModeler aBoxDeltaModeler1 = null;
private CumulativeDeltaModeler aBoxDeltaModeler2 = null;
private boolean batchMode1, batchMode2;
private boolean stopRequested;
private boolean batchMode1 = false, batchMode2 = false;
private boolean stopRequested = false;
/**
* @param tboxModel - input. This model contains both asserted and inferred TBox axioms
@ -1158,7 +1158,7 @@ public class SimpleReasoner extends StatementListener {
}
}
} catch (Exception e) {
log.error("Exception while recomputing ABox inference model", e);
log.error("Exception while computing mostSpecificType annotations", e);
inferenceRebuildModel.removeAll(); // don't do this in the finally, it's needed in the case
// where there isn't an exception
return;
@ -1227,14 +1227,12 @@ public class SimpleReasoner extends StatementListener {
log.info("ABox inference model updated with mostSpecificType annotations");
}
public static boolean isSimpleReasonerSetupComplete(ServletContext ctx) {
Object string = ctx.getAttribute("SimpleReasonerSetupState");
if (string instanceof String) {
return true;
} else {
return false;
}
public boolean isABoxReasoningAsynchronous() {
if (batchMode1 || batchMode2) {
return true;
} else {
return false;
}
}
@Override
@ -1271,25 +1269,31 @@ public class SimpleReasoner extends StatementListener {
log.info("starting DeltaComputer.run");
Model retractions = aBoxDeltaModeler1.getRetractions();
boolean finished = (retractions.size() == 0);
boolean abort = false;
String qualifier = "(1)";
while (!finished && !stopRequested) {
retractions.enterCriticalSection(Lock.READ);
StmtIterator iter = null;
try {
log.info("run: started computing inferences for batch " + qualifier + " update");
StmtIterator iter = retractions.listStatements();
iter = retractions.listStatements();
int num = 0;
while (iter.hasNext()) {
while (iter.hasNext() && !stopRequested) {
Statement stmt = iter.next();
try {
removedABoxTypeAssertion(stmt, inferenceModel);
setMostSpecificTypes(stmt.getSubject(), inferenceModel, new HashSet<String>());
//TODO update this part when subproperty inferencing is added.
} catch (NullPointerException npe) {
abort = true;
break;
} catch (Exception e) {
log.error("exception while computing inferences for batch " + qualifier + " update: " + e.getMessage());
log.error("exception in batch mode ",e);
//log.error("exception while computing inferences for batch " + qualifier + " update: " + e.getMessage());
}
num++;
@ -1303,11 +1307,22 @@ public class SimpleReasoner extends StatementListener {
}
}
} finally {
iter.close();
retractions.removeAll();
retractions.leaveCriticalSection();
log.info("finished computing inferences for batch " + qualifier + " update");
}
if (abort) {
log.info("a NullPointerException was received while computing inferences in batch " + qualifier + " mode. Halting inference computation.");
return;
}
if (stopRequested) {
log.info("a stopRequested signal was received during DeltaComputer.run. Halting Processing.");
return;
}
log.info("finished computing inferences for batch " + qualifier + " update");
if (batchMode1 && (aBoxDeltaModeler2.getRetractions().size() > 0)) {
retractions = aBoxDeltaModeler2.getRetractions();
@ -1327,11 +1342,6 @@ public class SimpleReasoner extends StatementListener {
batchMode2 = false;
log.info("finished processing retractions in batch mode");
}
if (stopRequested) {
log.info("a stopRequested signal was received during DeltaComputer.run. Halting Processing.");
return;
}
}
if (aBoxDeltaModeler1.getRetractions().size() > 0) {
@ -1356,7 +1366,7 @@ public class SimpleReasoner extends StatementListener {
* This is called when the system shuts down.
*/
public void setStopRequested() {
stopRequested = true;
this.stopRequested = true;
}
public static String stmtString(Statement statement) {

3
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
View file

@ -127,7 +127,6 @@ public class SimpleReasonerSetup implements ServletContextListener {
}
assertionsOms.getTBoxModel().register(new SimpleReasonerTBoxListener(simpleReasoner));
sce.getServletContext().setAttribute("SimpleReasonerSetupState","complete");
log.info("Simple reasoner connected for the ABox");
@ -138,9 +137,11 @@ public class SimpleReasonerSetup implements ServletContextListener {
@Override
public void contextDestroyed(ServletContextEvent sce) {
log.info("received contextDestroyed notification");
SimpleReasoner simpleReasoner = getSimpleReasonerFromServletContext(sce.getServletContext());
if (simpleReasoner != null) {
log.info("sending stop request to SimpleReasoner");
simpleReasoner.setStopRequested();
}
}

3
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
View file

@ -54,7 +54,8 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
boolean isVClass = individual.isVClass(vClassUri);
// If reasoning is asynchronous (under RDB), this inference may not have been made yet.
// Check the superclasses of the individual's vclass.
if (!isVClass && SimpleReasoner.isSimpleReasonerSetupComplete(getServletContext())) {
SimpleReasoner simpleReasoner = (SimpleReasoner)getServletContext().getAttribute(SimpleReasoner.class.getName());
if (!isVClass && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) {
log.debug("Checking superclasses to see if individual is a " + vClassUri + " because reasoning is asynchronous");
List<VClass> directVClasses = individual.getVClasses(true);
for (VClass directVClass : directVClasses) {