X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FGraphClientImpl2.java;h=dce477ebeae0fdf35d1db078acfd7e6e885ea825;hp=904427b6d617f6682c78547db1dde17a419dff48;hb=c26409b1caf2f1e560d37c5befd11b442399c3fe;hpb=5258d33623db182975901570d58958286397e1e7

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
index 904427b6d..dce477ebe 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
@@ -27,14 +27,13 @@ import org.simantics.acorn.exception.IllegalAcornStateException;
 import org.simantics.acorn.internal.ClusterChange;
 import org.simantics.acorn.internal.ClusterUpdateProcessorBase;
 import org.simantics.acorn.internal.UndoClusterUpdateProcessor;
+import org.simantics.acorn.lru.ClusterChangeSet.Entry;
 import org.simantics.acorn.lru.ClusterInfo;
 import org.simantics.acorn.lru.ClusterStreamChunk;
 import org.simantics.acorn.lru.ClusterUpdateOperation;
-import org.simantics.acorn.lru.ClusterChangeSet.Entry;
 import org.simantics.db.ClusterCreator;
 import org.simantics.db.Database;
 import org.simantics.db.ServiceLocator;
-import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.SDBException;
 import org.simantics.db.server.ProCoreException;
@@ -43,11 +42,14 @@ import org.simantics.db.service.ClusterUID;
 import org.simantics.db.service.LifecycleSupport;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.logging.TimeLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.hash.TLongObjectHashMap;
 
 public class GraphClientImpl2 implements Database.Session {
-	
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GraphClientImpl2.class);
 	public static final boolean DEBUG = false;
 
 	public final ClusterManager clusters;
@@ -124,10 +126,10 @@ public class GraphClientImpl2 implements Database.Session {
 						mainProgram.mutex.release();
 					}
 				} catch (IllegalAcornStateException | ProCoreException e) {
-					Logger.defaultLogError("Snapshotting failed", e);
+					LOGGER.error("Snapshotting failed", e);
 					unexpectedClose = true;
 				} catch (InterruptedException e) {
-					Logger.defaultLogError("Snapshotting interrupted", e);
+				    LOGGER.error("Snapshotting interrupted", e);
 				} finally {
 					try {
 						if(tr != null)
@@ -137,11 +139,11 @@ public class GraphClientImpl2 implements Database.Session {
     	                    try {
     	                        support.close();
     	                    } catch (DatabaseException e1) {
-    	                        Logger.defaultLogError("Failed to close database as a safety measure due to failed snapshotting", e1);
+    	                        LOGGER.error("Failed to close database as a safety measure due to failed snapshotting", e1);
     	                    }
 						}
 					} catch (ProCoreException e) {
-						Logger.defaultLogError("Failed to end snapshotting write transaction", e);
+					    LOGGER.error("Failed to end snapshotting write transaction", e);
 					}
 				}
 			}
@@ -184,7 +186,7 @@ public class GraphClientImpl2 implements Database.Session {
 	
 	@Override
 	public void close() throws ProCoreException {
-	    System.err.println("Closing " + this + " and mainProgram " + mainProgram);
+	    LOGGER.info("Closing " + this + " and mainProgram " + mainProgram);
 		if(!closed && !isClosing) {
 		    isClosing = true;
 			try {
@@ -249,7 +251,7 @@ public class GraphClientImpl2 implements Database.Session {
 			clusters.state.headChangeSetId++;
 			return clusters.state.headChangeSetId;
 		} catch (SDBException e) {
-			Logger.defaultLogError("Failed to undo cancelled transaction", e);
+		    LOGGER.error("Failed to undo cancelled transaction", e);
 			throw new ProCoreException(e);
 		}
 	}
@@ -725,29 +727,67 @@ public class GraphClientImpl2 implements Database.Session {
     public boolean rolledback() {
         return clusters.rolledback();
     }
+    
+    public void purge() throws IllegalAcornStateException {
+        clusters.purge(locator);
+    }
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	////////////////////////
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+    public void purgeDatabase() {
+    	
+	    if (isClosing || unexpectedClose)
+	        return;
+	    
+		saver.execute(new Runnable() {
+
+			@Override
+			public void run() {
+				Transaction tr = null;
+				try {
+					// First take a write transaction
+					tr = askWriteTransaction(-1);
+					// Then make sure that MainProgram is idling
+					mainProgram.mutex.acquire();
+					try {
+						synchronized(mainProgram) {
+							if(mainProgram.operations.isEmpty()) {
+								purge();
+							} else {
+								// MainProgram is becoming busy again - delay snapshotting
+								return;
+							}
+						}
+					} finally {
+						mainProgram.mutex.release();
+					}
+				} catch (IllegalAcornStateException | ProCoreException e) {
+				    LOGGER.error("Purge failed", e);
+					unexpectedClose = true;
+				} catch (InterruptedException e) {
+				    LOGGER.error("Purge interrupted", e);
+				} finally {
+					try {
+						if(tr != null)
+							endTransaction(tr.getTransactionId());
+						if (unexpectedClose) {
+    						LifecycleSupport support = getServiceLocator().getService(LifecycleSupport.class);
+    	                    try {
+    	                        support.close();
+    	                    } catch (DatabaseException e1) {
+    	                        LOGGER.error("Failed to close database as a safety measure due to failed purge", e1);
+    	                    }
+						}
+					} catch (ProCoreException e) {
+					    LOGGER.error("Failed to end purge write transaction", e);
+					}
+				}
+			}
+		});
+    	
+    }
+    
+    public long getTailChangeSetId() {
+    	return clusters.getTailChangeSetId();
+    }
+    
 }