AsyncBarrier.dec runs into refcounting problem

gitlab #490

Change-Id: I47b3e917a11038b444a326f03b46352d5671cbe0

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
index 117a1a27fb3d0e2fba3acab9ef9a57f7280858c2..73e612a9f4004b154478ad3893213e6960d5d8d3 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
@@ -19,37 +19,41 @@ import org.simantics.db.service.QueryControl;
 
 abstract public class TransientResourceRead<R> extends BinaryRead<Object,Resource,R> implements ReadExt {
 
 
 abstract public class TransientResourceRead<R> extends BinaryRead<Object,Resource,R> implements ReadExt {
 

-       protected static final Object WITH_PARENT = new Object();
-       
-       public TransientResourceRead(ReadGraph graph, Resource parameter) throws DatabaseException {
-               this(graph, graph.getService(QueryControl.class), parameter);
-       }
-       
-       public TransientResourceRead(ReadGraph graph, QueryControl qc, Resource parameter) throws DatabaseException {
-               super(resolveFirstParameter(graph, qc), parameter);
-       }
-
-       final private static Object resolveFirstParameter(ReadGraph graph, QueryControl qc) throws DatabaseException {
-               if(qc.hasParentRequest(graph)) return WITH_PARENT;
-               else return graph.getModificationCounter();
-       }
-
-       @Override
-       final public R perform(ReadGraph _graph) throws DatabaseException {
-               if(parameter == WITH_PARENT) {
-                       return perform(_graph, parameter2);
-               } else {
-                       QueryControl qc = _graph.getService(QueryControl.class);
-                       ReadGraph graph = qc.getIndependentGraph(_graph);
-                       return perform(graph, parameter2);
-               }
-       }
-
-       abstract public R perform(ReadGraph graph, Resource parameter) throws DatabaseException;
-    
-       @Override
-       public boolean isImmutable(ReadGraph graph) throws DatabaseException {
-               return graph.isImmutable(parameter2);
-       }
-       
+    protected static final Object WITH_PARENT = new Object();
+
+    public TransientResourceRead(ReadGraph graph, Resource parameter) throws DatabaseException {
+        this(graph, graph.getService(QueryControl.class), parameter);
+    }
+
+    public TransientResourceRead(ReadGraph graph, QueryControl qc, Resource parameter) throws DatabaseException {
+        super(resolveFirstParameter(graph, qc), parameter);
+    }
+
+    final private static Object resolveFirstParameter(ReadGraph graph, QueryControl qc) throws DatabaseException {
+        if(qc.hasParentRequest(graph)) return WITH_PARENT;
+        else return graph.getModificationCounter();
+    }
+
+    @Override
+    final public R perform(ReadGraph _graph) throws DatabaseException {
+        if(parameter == WITH_PARENT) {
+            return perform(_graph, parameter2);
+        } else {
+            QueryControl qc = _graph.getService(QueryControl.class);
+            return qc.syncRequestIndependent(_graph, new UniqueRead<R>() {
+                @Override
+                public R perform(ReadGraph graph) throws DatabaseException {
+                    return TransientResourceRead.this.perform(graph, parameter2);
+                }
+            });
+        }
+    }
+
+    abstract public R perform(ReadGraph graph, Resource parameter) throws DatabaseException;
+
+    @Override
+    public boolean isImmutable(ReadGraph graph) throws DatabaseException {
+        return graph.isImmutable(parameter2);
+    }
+

 }
 }

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
index 8f96bb9e6d3a51a48c7b98baa40f962fc83f5617..9f89a0d8fa2a4f2ede8474513ac9f8ae5ce33de1 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
@@ -19,34 +19,31 @@ import org.simantics.db.impl.query.AsyncReadEntry;
 import org.simantics.db.impl.query.PendingTaskSupport;
 import org.simantics.db.procedure.AsyncProcedure;
 import org.simantics.db.request.AsyncRead;
 import org.simantics.db.impl.query.PendingTaskSupport;
 import org.simantics.db.procedure.AsyncProcedure;
 import org.simantics.db.request.AsyncRead;

-public class BlockingAsyncProcedure<Result> implements AsyncProcedure<Result> {
+
+public class BlockingAsyncProcedure<Result> implements AsyncProcedure<Result>, Runnable {

 
     private static final Object NO_RESULT = new Object();
 
     private final Object key;
     private final ReadGraphImpl queryGraph;
     private final ReadGraphImpl callerGraph;
 
     private static final Object NO_RESULT = new Object();
 
     private final Object key;
     private final ReadGraphImpl queryGraph;
     private final ReadGraphImpl callerGraph;

+    private final AsyncReadEntry<Result> entry;

     private final AsyncProcedure<Result> procedure;
     private PendingTaskSupport pendingTaskSupport;
     private final boolean needsToBlock;
     private Object result = NO_RESULT;
     private Throwable exception = null;
     private final AsyncProcedure<Result> procedure;
     private PendingTaskSupport pendingTaskSupport;
     private final boolean needsToBlock;
     private Object result = NO_RESULT;
     private Throwable exception = null;

-
-    private ReadGraphImpl queryGraph() {
-        return queryGraph;
-    }

     
     public BlockingAsyncProcedure(ReadGraphImpl callerGraph, AsyncReadEntry<Result> entry, AsyncProcedure<Result> procedure, Object key, boolean needsToBlock) {
         
         // A new graph for evaluating the query with correct parent and asyncBarrier
     
     public BlockingAsyncProcedure(ReadGraphImpl callerGraph, AsyncReadEntry<Result> entry, AsyncProcedure<Result> procedure, Object key, boolean needsToBlock) {
         
         // A new graph for evaluating the query with correct parent and asyncBarrier

-        queryGraph = callerGraph.withParent(entry, () -> {
-
-            dispatchProcedure(queryGraph(), callerGraph, entry, procedure, needsToBlock);
-            
-        }, needsToBlock);
-        
+        queryGraph = callerGraph.withParent(entry, this, needsToBlock);

         queryGraph.asyncBarrier.inc();
         queryGraph.asyncBarrier.inc();

+        
+        // This makes sure that caller does not quit before dispatch
+        callerGraph.asyncBarrier.inc();

 
 

+        this.entry = entry;

         this.procedure = procedure;
         this.key = key;
         this.queryGraph.asyncBarrier.inc();
         this.procedure = procedure;
         this.key = key;
         this.queryGraph.asyncBarrier.inc();


@@ -112,34 +109,39 @@ public class BlockingAsyncProcedure<Result> implements AsyncProcedure<Result> {
         return "." + procedure; 
     }
     
         return "." + procedure; 
     }
     

-    private void dispatchProcedure(ReadGraphImpl queryGraph, ReadGraphImpl parentGraph, AsyncReadEntry<Result> entry, AsyncProcedure<Result> procedure_, boolean needsToBlock) {
+    @Override
+    public void run() {

         
         

-        AsyncProcedure<Result> procedure = entry != null ? entry : procedure_;
+        AsyncProcedure<Result> procedure__ = entry != null ? entry : procedure;

 
 

-        ReadGraphImpl executeGraph = parentGraph.withParent(parentGraph.parent, null, needsToBlock);
+        ReadGraphImpl executeGraph = callerGraph.withParent(callerGraph.parent, null, needsToBlock);

         executeGraph.asyncBarrier.inc();
         executeGraph.asyncBarrier.inc();

+        
+        // This counters the inc in the constructor 
+        callerGraph.asyncBarrier.dec();
+        

         try {
         try {

-            if(procedure != null) {
-                procedure.execute(executeGraph, get());
+            if(procedure__ != null) {
+                procedure__.execute(executeGraph, get());

             }
         } catch (DatabaseException e) {
             }
         } catch (DatabaseException e) {

-            if(procedure != null) procedure.exception(executeGraph, e);
+            if(procedure__ != null) procedure__.exception(executeGraph, e);

             exception = e;
         } catch (Throwable t) {
             DatabaseException dbe = new DatabaseException(t);
             exception = e;
         } catch (Throwable t) {
             DatabaseException dbe = new DatabaseException(t);

-            if(procedure != null) procedure.exception(executeGraph, dbe);
+            if(procedure__ != null) procedure__.exception(executeGraph, dbe);

             exception = dbe;
         } finally {
 
             if (entry != null) {
                 assert(entry.isReady());
                 // This does not throw
             exception = dbe;
         } finally {
 
             if (entry != null) {
                 assert(entry.isReady());
                 // This does not throw

-                entry.performFromCache(executeGraph, procedure_);
+                entry.performFromCache(executeGraph, procedure);

             }
 
             executeGraph.asyncBarrier.dec();
             if(needsToBlock)
             }
 
             executeGraph.asyncBarrier.dec();
             if(needsToBlock)

-                executeGraph.asyncBarrier.waitBarrier(procedure, executeGraph);
+                executeGraph.asyncBarrier.waitBarrier(procedure__, executeGraph);

         }
 
         if (BarrierTracing.BOOKKEEPING) {
         }
 
         if (BarrierTracing.BOOKKEEPING) {

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
index 637db3f26f8e119173fbf29cbe54b46ed9b17002..f1e5b5cce10cc4758207a257c2f6cfeb4f0a3372 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
@@ -14,13 +14,15 @@ package org.simantics.db.impl.graph;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
 

-import org.simantics.db.common.utils.Logger;

 import org.simantics.db.exception.RuntimeDatabaseException;
 import org.simantics.db.impl.query.CacheEntry;
 import org.simantics.db.impl.query.QueryProcessor.AsyncBarrier;
 import org.simantics.db.exception.RuntimeDatabaseException;
 import org.simantics.db.impl.query.CacheEntry;
 import org.simantics.db.impl.query.QueryProcessor.AsyncBarrier;

+import org.slf4j.LoggerFactory;

 
 public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrier {
 
 
 public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrier {
 

+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(AsyncBarrierImpl.class);
+

     private static final long serialVersionUID = 4724463372850048672L;
 
     static final int WAIT_TIME = 60000;
     private static final long serialVersionUID = 4724463372850048672L;
 
     static final int WAIT_TIME = 60000;


@@ -107,7 +109,7 @@ public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrier {
                 }
             }
             if (count < 0) {
                 }
             }
             if (count < 0) {

-                Logger.defaultLogError(
+                LOGGER.error(

                         "Database request processing error. The application code has performed illegal actions (probably called multiple times the execute or exception method of a single result request.",
                         new Exception());
             }
                         "Database request processing error. The application code has performed illegal actions (probably called multiple times the execute or exception method of a single result request.",
                         new Exception());
             }

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
index 48662d1903a08267a13dded57e04e04f8b85db6d..110e1d59bbb460090a368cc1763b383f2258aa43 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
@@ -188,8 +188,6 @@ import org.simantics.utils.DataContainer;
 import org.simantics.utils.Development;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.collections.CollectionUtils;
 import org.simantics.utils.Development;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.collections.CollectionUtils;

-import org.simantics.utils.threads.logger.ITask;
-import org.simantics.utils.threads.logger.ThreadLogger;

 import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.hash.TObjectIntHashMap;
 import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.hash.TObjectIntHashMap;


@@ -1922,14 +1920,11 @@ public class ReadGraphImpl implements AsyncReadGraph {
         * Implementation of the interface RequestProcessor
         */
 
         * Implementation of the interface RequestProcessor
         */
 

-       @Override
-       public <T> T syncRequest(final Read<T> request) throws DatabaseException {
-               assert (request != null);
-
-               T result = (T)QueryCache.runnerReadEntry(this, request, parent, null, null, true);
-               return result;
-               
-       }
+    @Override
+    public <T> T syncRequest(final Read<T> request) throws DatabaseException {
+        assert (request != null);
+        return (T)QueryCache.runnerReadEntry(this, request, parent, null, null, true);
+    }

 
        @Override
        public <T> T syncRequest(Read<T> request, SyncListener<T> procedure)
 
        @Override
        public <T> T syncRequest(Read<T> request, SyncListener<T> procedure)


@@ -1943,16 +1938,12 @@ public class ReadGraphImpl implements AsyncReadGraph {
                return syncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 
                return syncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 

-       @Override
-       public <T> T syncRequest(final Read<T> request, final AsyncProcedure<T> procedure) throws DatabaseException {
-
-               assert (request != null);
-
-               ListenerBase listener = procedure != null ? getListenerBase(procedure) : null;
-               T result = (T)QueryCache.runnerReadEntry(this, request, parent, listener, procedure, true);
-               return result;
-
-       }
+    @Override
+    public <T> T syncRequest(final Read<T> request, final AsyncProcedure<T> procedure) throws DatabaseException {
+        assert (request != null);
+        ListenerBase listener = procedure != null ? getListenerBase(procedure) : null;
+        return (T)QueryCache.runnerReadEntry(this, request, parent, listener, procedure, true);
+    }

 
        @Override
        public <T> T syncRequest(final Read<T> request,
 
        @Override
        public <T> T syncRequest(final Read<T> request,


@@ -2028,17 +2019,13 @@ public class ReadGraphImpl implements AsyncReadGraph {
                return syncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 
                return syncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 

-       @Override
-       final public <T> T syncRequest(final AsyncRead<T> request,
-                       final AsyncProcedure<T> procedure) throws DatabaseException {
-
-               assert (request != null);
-
-               ListenerBase listener = getListenerBase(procedure);
-               T result = (T)QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure, true); 
-               return result;
-
-       }
+    @Override
+    final public <T> T syncRequest(final AsyncRead<T> request,
+            final AsyncProcedure<T> procedure) throws DatabaseException {
+        assert (request != null);
+        ListenerBase listener = getListenerBase(procedure);
+        return (T)QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure, true); 
+    }

 
        @Override
        public <T> T syncRequest(AsyncRead<T> request,
 
        @Override
        public <T> T syncRequest(AsyncRead<T> request,


@@ -5235,54 +5222,55 @@ public class ReadGraphImpl implements AsyncReadGraph {
                asyncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 
                asyncRequest(request, new NoneToAsyncListener<T>(procedure));
        }
 

-       @Override
-       final public <T> void asyncRequest(final AsyncRead<T> request,
-                       final AsyncProcedure<T> procedure) {
+    @Override
+    final public <T> void asyncRequest(final AsyncRead<T> request,
+            final AsyncProcedure<T> procedure) {

 
 

-               assert (request != null);
-               assert (procedure != null);
+        assert (request != null);
+        assert (procedure != null);

 
         AsyncBarrierImpl barrier = asyncBarrier;
         if(barrier != null)
             barrier.inc();
 
 
         AsyncBarrierImpl barrier = asyncBarrier;
         if(barrier != null)
             barrier.inc();
 

-               processor.scheduleNow(new SessionTask(this) {
+        processor.scheduleNow(new SessionTask(this) {

 
 

-                       @Override
-                       public void run0(int thread) {
+            @Override
+            public void run0(int thread) {

 
 

-                           if(barrier != null)
-                           barrier.inc();
+                if(barrier != null)
+                    barrier.inc();

 
 

-                           try {
-                                       final ListenerBase listener = getListenerBase(procedure);
-                                       QueryCache.runnerAsyncReadEntry(ReadGraphImpl.this, request, parent, listener, new AsyncProcedure<T>() {
+                try {
+                    final ListenerBase listener = getListenerBase(procedure);
+                    QueryCache.runnerAsyncReadEntry(ReadGraphImpl.this, request, parent, listener, new AsyncProcedure<T>() {

 
 

-                                               @Override
-                                               public void execute(AsyncReadGraph graph, T result) {
-                                                       procedure.execute(graph, result);
-                                               if(barrier != null)
-                                                   barrier.dec();
-                                               }
+                        @Override
+                        public void execute(AsyncReadGraph graph, T result) {
+                            procedure.execute(graph, result);
+                            if(barrier != null)
+                                barrier.dec();
+                        }

 
 

-                                               @Override
-                                               public void exception(AsyncReadGraph graph, Throwable throwable) {
-                                                       procedure.exception(graph, throwable);
+                        @Override
+                        public void exception(AsyncReadGraph graph, Throwable throwable) {
+                            procedure.exception(graph, throwable);

                             if(barrier != null)
                                 barrier.dec();
                             if(barrier != null)
                                 barrier.dec();

-                                               }
-                                               
-                                       }, false);
-                               if(barrier != null)
-                                   barrier.dec();
-                               } catch (DatabaseException e) {
-                                       Logger.defaultLogError(e);
-                               }
-                       }
-                       
-               });
+                        }
+
+                    }, false);
+                } catch (DatabaseException e) {
+                    LOGGER.error("Error while executing async request", e);
+                } finally {
+                    if(barrier != null)
+                        barrier.dec();
+                }
+            }

 
 

-       }
+        });
+
+    }

 
        @Override
        public <T> void asyncRequest(AsyncRead<T> request,
 
        @Override
        public <T> void asyncRequest(AsyncRead<T> request,

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
index dd410b4ce7e8c57fba7e86d94a30dbb7b9ec1e9f..e3bd437416af310936e66533746b270d8228aba8 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
@@ -413,7 +413,7 @@ public class QueryListening {
 
     }
 
 
     }
 

-    public void fireListeners(WriteGraphImpl graph) {
+    public void fireListeners(ReadGraphImpl graph) {

 
         assert (!processor.updating);
         assert (!processor.cache.collecting);
 
         assert (!processor.updating);
         assert (!processor.cache.collecting);

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
index a46bc0e8dd4e1b024dea3b0dd8d7269b10a19192..6345b7375fece679ba7f20103713bf0f1eb37b79 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
@@ -1279,8 +1279,9 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
                        entry.prepareRecompute(querySupport);
                        
                        ReadGraphImpl parentGraph = graph.forRecompute(entry);
                        entry.prepareRecompute(querySupport);
                        
                        ReadGraphImpl parentGraph = graph.forRecompute(entry);

-
+                       parentGraph.asyncBarrier.inc();

                        query.recompute(parentGraph);
                        query.recompute(parentGraph);

+                       parentGraph.asyncBarrier.dec();

 
                        if(entry.isExcepted()) return ListenerEntry.NO_VALUE;
 
 
                        if(entry.isExcepted()) return ListenerEntry.NO_VALUE;
 

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/Dependencies.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/Dependencies.java
index 0aa36390b6030ed4068ed99ed9c5160640feeb73..83837a960a6950888baf3180b664be0fadfb4fbb 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/Dependencies.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/Dependencies.java
@@ -13,13 +13,14 @@ package org.simantics.db.layer0.genericrelation;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;

-import org.simantics.db.common.utils.Logger;
+import org.simantics.db.common.request.UniqueRead;

 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.service.QueryControl;
 import org.simantics.operation.Layer0X;
 import org.simantics.scl.runtime.function.FunctionImpl4;
 import org.simantics.scl.runtime.function.UnsaturatedFunction2;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.service.QueryControl;
 import org.simantics.operation.Layer0X;
 import org.simantics.scl.runtime.function.FunctionImpl4;
 import org.simantics.scl.runtime.function.UnsaturatedFunction2;

+import org.slf4j.LoggerFactory;

 
 /**
  * dependencies:
 
 /**
  * dependencies:


@@ -30,6 +31,8 @@ import org.simantics.scl.runtime.function.UnsaturatedFunction2;
  */
 public class Dependencies extends FunctionImpl4<ReadGraph, Resource, String, Integer, Object> {
 
  */
 public class Dependencies extends FunctionImpl4<ReadGraph, Resource, String, Integer, Object> {
 

+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(Dependencies.class);
+

     public static final String FIELD_MODEL    = "Model";
     public static final String FIELD_PARENT   = "Parent";
     public static final String FIELD_RESOURCE = "Resource";
     public static final String FIELD_MODEL    = "Model";
     public static final String FIELD_PARENT   = "Parent";
     public static final String FIELD_RESOURCE = "Resource";


@@ -71,10 +74,15 @@ public class Dependencies extends FunctionImpl4<ReadGraph, Resource, String, Int
             final int maxResults = _maxResults != null ? _maxResults : Integer.MAX_VALUE;
             
             QueryControl qc = graph.getService(QueryControl.class);
             final int maxResults = _maxResults != null ? _maxResults : Integer.MAX_VALUE;
             
             QueryControl qc = graph.getService(QueryControl.class);

-            return index.query(qc.getIndependentGraph(graph), query, getBindingPattern(), new Object[] { model }, maxResults);
+            return qc.syncRequestIndependent(graph, new UniqueRead<Object>() {
+                @Override
+                public Object perform(ReadGraph graph) throws DatabaseException {
+                    return index.query(graph, query, getBindingPattern(), new Object[] { model }, maxResults);
+                }
+            });

             
         } catch (DatabaseException e) {
             
         } catch (DatabaseException e) {

-            Logger.defaultLogError(e);
+            LOGGER.error("Error while performing index query", e);

             return null;
         }
     }
             return null;
         }
     }

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependencyResources.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependencyResources.java
index 1702af0f38e6182832673997ab7b55588ae5f335..a2059a6ad27264b02381a3b4400d18f7ed5a5401 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependencyResources.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/DependencyResources.java
@@ -13,13 +13,14 @@ package org.simantics.db.layer0.genericrelation;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;

-import org.simantics.db.common.utils.Logger;
+import org.simantics.db.common.request.UniqueRead;

 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.service.QueryControl;
 import org.simantics.operation.Layer0X;
 import org.simantics.scl.runtime.function.FunctionImpl4;
 import org.simantics.scl.runtime.function.UnsaturatedFunction2;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.GenericRelationIndex;
 import org.simantics.db.service.QueryControl;
 import org.simantics.operation.Layer0X;
 import org.simantics.scl.runtime.function.FunctionImpl4;
 import org.simantics.scl.runtime.function.UnsaturatedFunction2;

+import org.slf4j.LoggerFactory;

 
 /**
  * dependencyResources:
 
 /**
  * dependencyResources:


@@ -30,6 +31,8 @@ import org.simantics.scl.runtime.function.UnsaturatedFunction2;
  */
 public class DependencyResources extends FunctionImpl4<ReadGraph, Resource, String, Integer, Object> {
 
  */
 public class DependencyResources extends FunctionImpl4<ReadGraph, Resource, String, Integer, Object> {
 

+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(DependencyResources.class);
+

     protected Resource getIndexRelation(ReadGraph graph) {
         return Layer0X.getInstance(graph).DependenciesRelation;
     }
     protected Resource getIndexRelation(ReadGraph graph) {
         return Layer0X.getInstance(graph).DependenciesRelation;
     }


@@ -61,10 +64,15 @@ public class DependencyResources extends FunctionImpl4<ReadGraph, Resource, Stri
             final int maxResults = _maxResults != null ? _maxResults : Integer.MAX_VALUE;
             
             QueryControl qc = graph.getService(QueryControl.class);
             final int maxResults = _maxResults != null ? _maxResults : Integer.MAX_VALUE;
             
             QueryControl qc = graph.getService(QueryControl.class);

-            return index.queryResources(qc.getIndependentGraph(graph), query, getBindingPattern(), new Object[] { model }, maxResults);
+            return qc.syncRequestIndependent(graph, new UniqueRead<Object>() {
+                @Override
+                public Object perform(ReadGraph graph) throws DatabaseException {
+                    return index.queryResources(graph, query, getBindingPattern(), new Object[] { model }, maxResults);
+                }
+            });

             
         } catch (DatabaseException e) {
             
         } catch (DatabaseException e) {

-            Logger.defaultLogError(e);
+            LOGGER.error("Error while performing index query", e);

             return null;
         }
     }
             return null;
         }
     }

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryControlImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryControlImpl.java
index 53a3dc1ad0b955c57547e70b450fbf55c6cd8907..f5e55deaae4d8a3b45b434c50c84c76577943836 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryControlImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryControlImpl.java
@@ -13,6 +13,7 @@ import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.procedure.AsyncContextMultiProcedure;
 import org.simantics.db.procedure.AsyncMultiProcedure;
 import org.simantics.db.request.ExternalRead;
 import org.simantics.db.procedure.AsyncContextMultiProcedure;
 import org.simantics.db.procedure.AsyncMultiProcedure;
 import org.simantics.db.request.ExternalRead;

+import org.simantics.db.request.Read;

 import org.simantics.db.service.QueryControl;
 import org.simantics.utils.DataContainer;
 import org.slf4j.Logger;
 import org.simantics.db.service.QueryControl;
 import org.simantics.utils.DataContainer;
 import org.slf4j.Logger;


@@ -145,6 +146,17 @@ public class QueryControlImpl implements QueryControl {
                ReadGraphImpl impl = (ReadGraphImpl)graph;
                return impl.withParent(null, null, false);
        }
                ReadGraphImpl impl = (ReadGraphImpl)graph;
                return impl.withParent(null, null, false);
        }

+       
+    @Override
+    public <T> T syncRequestIndependent(ReadGraph graph, Read<T> request) throws DatabaseException {
+        ReadGraphImpl independent = ((ReadGraphImpl)graph).withParent(null, null, false);
+        independent.asyncBarrier.inc();
+        try {
+            return independent.syncRequest(request);
+        } finally {
+            independent.asyncBarrier.dec();
+        }
+    }

 
        @Override
        public boolean hasParentRequest(ReadGraph graph) {
 
        @Override
        public boolean hasParentRequest(ReadGraph graph) {

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
index 22d0f316545762d4937b384bea9fd648e8bdd441..f8fd7d17ddab55e7274388ff259155918227486f 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
@@ -461,7 +461,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     });
 
                     assert (null != writer);
                     });
 
                     assert (null != writer);

-//                    writer.state.barrier.inc();
+                    writer.asyncBarrier.inc();

 
                     try {
                         request.perform(writer);
 
                     try {
                         request.perform(writer);


@@ -471,7 +471,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                             Logger.defaultLogError("Write transaction caused an unexpected error, see exception.", t);
                         writeState.except(t);
                     } finally {
                             Logger.defaultLogError("Write transaction caused an unexpected error, see exception.", t);
                         writeState.except(t);
                     } finally {

-//                        writer.state.barrier.dec();
+                        writer.asyncBarrier.dec();

 //                        writer.waitAsync(request);
                     }
 
 //                        writer.waitAsync(request);
                     }
 


@@ -571,52 +571,21 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                 VirtualGraph vg = getProvider(request.getProvider());
                 WriteGraphImpl writer = WriteGraphImpl.create(getQueryProvider2(), writeSupport, vg);
 
                 VirtualGraph vg = getProvider(request.getProvider());
                 WriteGraphImpl writer = WriteGraphImpl.create(getQueryProvider2(), writeSupport, vg);
 

-                try {
-                    WriteState<T> writeStateT = new WriteState<T>(writer, request, notify, procedure);
-                    writeState = writeStateT;
+                WriteState<T> writeStateT = new WriteState<T>(writer, request, notify, procedure);
+                writeState = writeStateT;
+                assert (null != writer);

 
 

-                    assert (null != writer);
-//                    writer.state.barrier.inc();
+                try {
+                    writer.asyncBarrier.inc();

                     writeStateT.setResult(request.perform(writer));
                     assert (null != writer);
                     writeStateT.setResult(request.perform(writer));
                     assert (null != writer);

-
-//                    writer.state.barrier.dec();
-//                    writer.waitAsync(null);
-

                 } catch (Throwable e) {
                 } catch (Throwable e) {

-
-//                    writer.state.barrier.dec();
-//                    writer.waitAsync(null);
-

                     writeState.except(e);
                     writeState.except(e);

-
-//                  state.stopWriteTransaction(clusterStream);
-//
-//              } catch (Throwable e) {
-//                  // Log it first, just to be safe that the error is always logged.
-//                  Logger.defaultLogError("Write transaction caused an unexpected error, see exception.", e);
-//
-//                  try {
-//                      // Callback is client code, we have to be prepared for it to throw unexpected exceptions.
-//                      // All we can do here is to log those, can't really pass them anywhere.
-//                      if (procedure != null) {
-//                          if(e instanceof DatabaseException) procedure.exception((DatabaseException)e);
-//                          else procedure.exception(new DatabaseException(e));
-//                      }
-//                  } catch (Throwable e2) {
-//                      Logger.defaultLogError("Write request callback caused an unexpected error, see exception.", e2);
-//                  }
-//
-//                  clientChanges = new ClientChangesImpl(SessionImplSocket.this);
-//
-//                  state.stopWriteTransaction(clusterStream);
-

                 } finally {
                 } finally {

+                    writer.asyncBarrier.dec();

                     fireSessionVariableChange(SessionVariables.QUEUED_WRITES);
                 }
 
                     fireSessionVariableChange(SessionVariables.QUEUED_WRITES);
                 }
 

-//              if(notify != null) notify.release();
-

                 task.finish();
 
             }
                 task.finish();
 
             }


@@ -1626,6 +1595,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                 ITask task = ThreadLogger.task(request);
 
                 final ReadGraphImpl newGraph = ReadGraphImpl.create(getQueryProvider2());
                 ITask task = ThreadLogger.task(request);
 
                 final ReadGraphImpl newGraph = ReadGraphImpl.create(getQueryProvider2());

+                newGraph.asyncBarrier.inc();

 
                 try {
 
 
                 try {
 


@@ -1663,6 +1633,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 
                 } finally {
 
 
                 } finally {
 

+                    newGraph.asyncBarrier.dec();
+

                     fireSessionVariableChange(SessionVariables.QUEUED_READS);
 
                 }
                     fireSessionVariableChange(SessionVariables.QUEUED_READS);
 
                 }


@@ -2479,6 +2451,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                 return;
 
             WriteGraphImpl reactionGraph = WriteGraphImpl.create(graph.processor, writeSupport, null);
                 return;
 
             WriteGraphImpl reactionGraph = WriteGraphImpl.create(graph.processor, writeSupport, null);

+            reactionGraph.asyncBarrier.inc();

 
             try {
 
 
             try {
 


@@ -2493,6 +2466,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 
             } finally {
 
 
             } finally {
 

+                reactionGraph.asyncBarrier.dec();
+

             }
 
         } catch (Throwable t) {
             }
 
         } catch (Throwable t) {

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
index 4c6e77b1a94729c0274078ef5318ffcf30a51f36..1e468f2c3f25e2e3e50cc6487fc02e57d3a7017e 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
@@ -24,6 +24,7 @@ import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.InternalException;
 import org.simantics.db.exception.RuntimeDatabaseException;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.InternalException;
 import org.simantics.db.exception.RuntimeDatabaseException;

+import org.simantics.db.impl.graph.ReadGraphImpl;

 import org.simantics.db.impl.graph.WriteGraphImpl;
 import org.simantics.db.impl.query.QueryProcessor;
 import org.simantics.db.request.WriteOnly;
 import org.simantics.db.impl.graph.WriteGraphImpl;
 import org.simantics.db.impl.query.QueryProcessor;
 import org.simantics.db.request.WriteOnly;


@@ -340,7 +341,10 @@ class State {
 
 //                start = System.nanoTime();
                 queryProvider.propagateChangesInQueryCache(graph);
 
 //                start = System.nanoTime();
                 queryProvider.propagateChangesInQueryCache(graph);

-                queryProvider.listening.fireListeners(graph);
+                ReadGraphImpl listenerGraph = graph.forRecompute(null);
+                listenerGraph.asyncBarrier.inc();
+                queryProvider.listening.fireListeners(listenerGraph);
+                listenerGraph.asyncBarrier.dec();

 //                duration = System.nanoTime() - start;
 //                System.out.println("performScheduledUpdates " + 1e-9*duration + "s. ");
 
 //                duration = System.nanoTime() - start;
 //                System.out.println("performScheduledUpdates " + 1e-9*duration + "s. ");
 

diff --git a/bundles/org.simantics.db/src/org/simantics/db/service/QueryControl.java b/bundles/org.simantics.db/src/org/simantics/db/service/QueryControl.java
index 3da3c5aa3baa8f71e50bb1615939dcc8ef8a7fae..a8c7286437aa4b1d08c619926a05b8d986eec5b0 100644 (file)
--- a/bundles/org.simantics.db/src/org/simantics/db/service/QueryControl.java
+++ b/bundles/org.simantics.db/src/org/simantics/db/service/QueryControl.java
@@ -17,9 +17,11 @@ import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;

+import org.simantics.db.exception.DatabaseException;

 import org.simantics.db.procedure.AsyncContextMultiProcedure;
 import org.simantics.db.procedure.AsyncMultiProcedure;
 import org.simantics.db.request.ExternalRead;
 import org.simantics.db.procedure.AsyncContextMultiProcedure;
 import org.simantics.db.procedure.AsyncMultiProcedure;
 import org.simantics.db.request.ExternalRead;

+import org.simantics.db.request.Read;

 
 
 /**
 
 
 /**


@@ -87,12 +89,25 @@ public interface QueryControl {
      * performed with the specified ReadGraph. DB listeners are therefore not
      * triggered by anything that is performed with the returned ReadGraph.
      * 
      * performed with the specified ReadGraph. DB listeners are therefore not
      * triggered by anything that is performed with the returned ReadGraph.
      * 

+     * @Deprecated In favor of syncRequestIndependent 

      * @param graph read transaction handle to clone for listener-independent
      *        use
      * @return read transaction handle that is independent of the requests
      *         performed with the parameter
      */
     ReadGraph getIndependentGraph(ReadGraph graph);
      * @param graph read transaction handle to clone for listener-independent
      *        use
      * @return read transaction handle that is independent of the requests
      *         performed with the parameter
      */
     ReadGraph getIndependentGraph(ReadGraph graph);

+    
+    /**
+     * Performs the given request without accumulating query dependencies.
+     * DB listeners are therefore not triggered by anything that is performed within the request.
+     * 
+     * @param graph read transaction handle to clone for listener-independent
+     *        use
+     * @param request the request to perform
+     * @return the result of the request evaluation
+     */
+    <T> T syncRequestIndependent(ReadGraph graph, Read<T> request) throws DatabaseException;
+    

     boolean hasParentRequest(ReadGraph graph);
 
 }
     boolean hasParentRequest(ReadGraph graph);
 
 }