DB request scheduling scheme fails with district diagrams

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / ReadEntry.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
index 1ceca45a5a0cec7371f632941a13b3c1610fc60a..8f547d22b3e950a9c3b87e035fd9a0e07a4aef08 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
@@ -25,20 +25,20 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ReadEntry.class);
 
-    protected Read<T> request;
+    protected Read<T> id;
 
     public ReadEntry(Read<T> request) {
-        this.request = request;
+        this.id = request;
     }
 
     @Override
     int makeHash() {
-        return request.hashCode();
+        return id.hashCode();
     }
 
     @Override
     public Object getOriginalRequest() {
-        return request;
+        return id;
     }
 
     @Override
@@ -57,7 +57,7 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
                 try {
 
-                    T result = request.perform(graph);
+                    T result = id.perform(graph);
                     setResult(result);
                     setReady();
 
@@ -76,8 +76,8 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
             @Override
             public int type() {
-                if (request instanceof ReadExt) {
-                    return ((ReadExt) request).getType();
+                if (id instanceof ReadExt) {
+                    return ((ReadExt) id).getType();
                 } else {
                     return RequestFlags.INVALIDATE;
                 }
@@ -85,10 +85,10 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
             @Override
             public String toString() {
-                if (request == null)
+                if (id == null)
                     return "DISCARDED";
                 else
-                    return request.toString() + statusOrException;
+                    return id.toString() + statusOrException;
             }
 
         };
@@ -96,14 +96,14 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
     }
 
     public static <T> T computeForEach(ReadGraphImpl graph, Read<T> request, ReadEntry<T> entry,
-            AsyncProcedure<T> procedure_) throws DatabaseException {
+            AsyncProcedure<T> procedure_, boolean needsToBlock) throws DatabaseException {
 
         AsyncProcedure<T> procedure = entry != null ? entry : procedure_;
 
-        ReadGraphImpl queryGraph = graph.withParent(entry);
+        ReadGraphImpl queryGraph = graph.withParent(entry, null, needsToBlock);
         queryGraph.asyncBarrier.inc();
 
-        ReadGraphImpl executeGraph = graph.withParent(graph.parent);
+        ReadGraphImpl executeGraph = graph.withParent(graph.parent, null, needsToBlock);
         executeGraph.asyncBarrier.inc();
         
         try {
@@ -139,7 +139,8 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
             } finally {
  
                 executeGraph.asyncBarrier.dec();
-                executeGraph.asyncBarrier.waitBarrier(procedure, executeGraph);
+                if(needsToBlock)
+                    executeGraph.asyncBarrier.waitBarrier(procedure, executeGraph);
 
             }
                 
@@ -181,10 +182,10 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
     @Override
     public String toString() {
-        if (request == null)
+        if (id == null)
             return "DISCARDED";
         else
-            return request.toString() + " - " + statusOrException;
+            return id.toString() + " - " + statusOrException;
     }
 
     public Object get(ReadGraphImpl graph, AsyncProcedure<T> procedure) throws DatabaseException {
@@ -196,8 +197,8 @@ public final class ReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> implem
 
     @Override
     boolean isImmutable(ReadGraphImpl graph) throws DatabaseException {
-        if (request instanceof ReadExt) {
-            return ((ReadExt) request).isImmutable(graph);
+        if (id instanceof ReadExt) {
+            return ((ReadExt) id).isImmutable(graph);
         }
         return false;
     }