X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=3a735e6c24c07900f92a5006790e100af3bb52b2;hb=5d26dc0201bd7fafbaafa4f74ff1a10929a14e5b;hp=6998ee55e127afa761b7aad2499264bc816588d8;hpb=d0e8f57df83c175bac2098412ee71646fb9ff0e9;p=simantics%2Fplatform.git

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 6998ee55e..3a735e6c2 100644
--- 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
@@ -5401,11 +5401,6 @@ public class ReadGraphImpl implements ReadGraph {
 		return processor.getSession();
 	}
 
-//	@Override
-//	final public Builtins getBuiltins() {
-//		return processor.getSession().getBuiltins();
-//	}
-
 	@Override
 	public <T> void asyncRequest(final Read<T> request) {
 
@@ -5471,10 +5466,6 @@ public class ReadGraphImpl implements ReadGraph {
         return new ReadGraphImpl(null, support);
     }
 
-    public static ReadGraphImpl forRecompute(CacheEntry entry, QueryProcessor support) {
-        return new ReadGraphImpl(entry, support);       
-    }
-
 	@Override
 	public <T> void asyncRequest(Read<T> request, SyncProcedure<T> procedure) {
 		asyncRequest(request, new SyncToAsyncProcedure<T>(procedure));
@@ -6015,53 +6006,17 @@ public class ReadGraphImpl implements ReadGraph {
 		return thread == Integer.MIN_VALUE;
 	}
 
-//	final private boolean isSync(int thread) {
-//		return thread < -1 && thread > Integer.MIN_VALUE;
-//	}
-
 	ReadGraphImpl(ReadGraphImpl graph) {
 		this(graph.parent, graph.processor);
 	}
 
 	ReadGraphImpl(CacheEntry parent, QueryProcessor support) {
-//		this.state = new ReadGraphState(barrier, support);
 		this.parent = parent;
 		this.processor = support;
 	}
 	
-	ReadGraphImpl(final QueryProcessor support) {
-		
-//		this.state = state;
-		this.processor = support;
-		this.parent = null;
-		
-	}
-
-//	public static ReadGraphImpl createSync(int syncThread, Object syncParent,
-//			ReadGraphSupportImpl support) {
-//		return new ReadGraphImpl(syncThread, syncThread, syncParent, null,
-//				support, new AsyncBarrierImpl(null));
-//	}
-
 	public static ReadGraphImpl create(QueryProcessor support) {
-		return new ReadGraphImpl(support);
-	}
-
-//	public ReadGraphImpl newAsync() {
-//		return this;
-////		if(!state.synchronizedExecution) {
-////			return this;
-////		} else {
-////			return new ReadGraphImpl(false, parent, state.support, state.barrier);
-////		}
-//	}
-
-//	public ReadGraphImpl newSync() {
-//		return new ReadGraphImpl(parent, processor);
-//	}
-
-	public ReadGraphImpl newSync(CacheEntry parentEntry) {
-		return new ReadGraphImpl(parentEntry, processor);
+		return new ReadGraphImpl(null, support);
 	}
 
 	public ReadGraphImpl newRestart(ReadGraphImpl impl) {
@@ -6069,41 +6024,10 @@ public class ReadGraphImpl implements ReadGraph {
 		WriteGraphImpl write = processor.getSession().getService(
 				WriteGraphImpl.class);
 
-//		if (write.callerThread != impl.callerThread)
-//			return new WriteGraphImpl(impl.callerThread, parent, state.support, write.writeSupport, write.provider, write.state.barrier);
 		return write;
 
 	}
 
-//	public ReadGraphImpl newSync(Object parentRequest) {
-//		return new ReadGraphImpl(callerThread, state.parent, state.support, new AsyncBarrierImpl(state.barrier));
-//	}
-
-//	public ReadGraphImpl newSync(final int callerThread, Object parentRequest) {
-//		assert (state.syncThread == callerThread || (state.syncThread == Integer.MIN_VALUE && callerThread != Integer.MIN_VALUE));
-//		return new ReadGraphImpl(callerThread, callerThread, parentRequest,
-//				state.parent, state.support, new AsyncBarrierImpl(state.barrier));
-//	}
-//
-//	public ReadGraphImpl newSyncAsync(Object parentRequest) {
-////		assert (callerThread < 0);
-//		return new ReadGraphImpl(callerThread, state.syncThread, parentRequest,
-//				state.parent, state.support, new AsyncBarrierImpl(state.barrier));
-//	}
-//
-//	public ReadGraphImpl newSyncAsync(final int callerThread,
-//			Object parentRequest) {
-////		assert (callerThread < 0);
-//		// assert(state.syncThread == callerThread || (state.syncThread == Integer.MIN_VALUE
-//		// && callerThread != Integer.MIN_VALUE) );
-//		return new ReadGraphImpl(callerThread, callerThread, parentRequest,
-//				state.parent, state.support, new AsyncBarrierImpl(state.barrier));
-//	}
-
-	public ReadGraphImpl withAsyncParent(CacheEntry parent) {
-		return new ReadGraphImpl(parent, processor);
-	}
-
 	public ReadGraphImpl withParent(CacheEntry parent) {
 		if(parent == this.parent) return this;
 		else return new ReadGraphImpl(parent, processor);
@@ -6120,56 +6044,13 @@ public class ReadGraphImpl implements ReadGraph {
 		
 		assert(procedure.done());
 		
-//		while (!procedure.done()) {
-//
-//			boolean executed = processor.resumeTasks(callerThread, null, null);
-//			if (!executed) {
-//				try {
-//					Thread.sleep(1);
-//					//								sema.tryAcquire(1, TimeUnit.MILLISECONDS);
-//				} catch (InterruptedException e) {
-//					e.printStackTrace();
-//				}
-//			}
-//
-//		}
-		
 	}
 
 	public <T> void waitAsyncProcedure(AsyncReadProcedure<T> procedure) {
 		
 		assert(procedure.done());
 		
-//		while (!procedure.done()) {
-//
-//			boolean executed = processor.processor.resume(this);
-//			if (!executed) {
-//				try {
-//					Thread.sleep(1);
-//					//								sema.tryAcquire(1, TimeUnit.MILLISECONDS);
-//				} catch (InterruptedException e) {
-//					e.printStackTrace();
-//				}
-//			}
-//
-//		}
-		
 	}
-	
-//	public void waitAsync(Object request) {
-//		try {
-//			state.barrier.waitBarrier(request, this);
-//		} catch (Throwable t) {
-//			t.printStackTrace();
-//			processor.scanPending();
-//			processor.querySupport.checkTasks();
-//			throw new RuntimeDatabaseException(t);
-//		}
-//	}
-
-//	public void restart() {
-//		state.barrier.restart();
-//	}
 
 	public boolean resumeTasks() {
 		return processor.resumeTasks(this);