Attachment 166062 Details for Bug 287096 – Patch ibackported to 2.x stream based on 3.1 stream

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch ibackported to 2.x stream based on 3.1 stream

backport.txt (text/plain), 12.68 KB, created by Krzysztof Daniel

on 2010-04-26 07:56:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2010-04-26 07:56:57 EDT

Size: 12.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.sse.core
>Index: src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java,v
>retrieving revision 1.16
>diff -u -r1.16 SSECorePlugin.java
>--- src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java	10 Apr 2007 20:07:25 -0000	1.16
>+++ src/org/eclipse/wst/sse/core/internal/SSECorePlugin.java	26 Apr 2010 11:56:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2006 IBM Corporation and others.
>+ * Copyright (c) 2001, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -16,9 +16,11 @@
> import org.eclipse.core.runtime.Preferences;
> import org.eclipse.wst.sse.core.StructuredModelManager;
> import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
>+import org.eclipse.wst.sse.core.internal.model.ModelManagerImpl;
> import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
> import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
> import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
>+import org.eclipse.wst.sse.core.internal.tasks.TaskScanningScheduler;
> import org.osgi.framework.BundleContext;
> 
> 
>@@ -60,6 +62,11 @@
> 	 */
> 	public void stop(BundleContext context) throws Exception {
> 		savePluginPreferences();
>+		
>+		((ModelManagerImpl) ModelManagerImpl.getInstance()).removePreferenceListener();
>+
>+		TaskScanningScheduler.shutdown();
>+
> 		FileBufferModelManager.shutdown();
> 
> 		super.stop(context);
>@@ -75,6 +82,16 @@
> 
> 		// initialize FileBuffer handling
> 		FileBufferModelManager.startup();
>+
>+		/**
>+		 * If the user starts the workbench with
>+		 * -Dorg.eclipse.wst.sse.core.taskscanner=off, the scanner should be
>+		 * disabled
>+		 */
>+		String scan = System.getProperty("org.eclipse.wst.sse.core.taskscanner"); //$NON-NLS-1$
>+		if (scan == null || !scan.equalsIgnoreCase("off")) { //$NON-NLS-1$
>+			TaskScanningScheduler.startup();
>+		}
> 	}
> 
> 	/**
>Index: src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java,v
>retrieving revision 1.33.2.1.6.2
>diff -u -r1.33.2.1.6.2 ModelManagerImpl.java
>--- src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java	5 Mar 2010 04:40:50 -0000	1.33.2.1.6.2
>+++ src/org/eclipse/wst/sse/core/internal/model/ModelManagerImpl.java	26 Apr 2010 11:56:27 -0000
>@@ -40,14 +40,22 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.OperationCanceledException;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.jobs.ILock;
> import org.eclipse.core.runtime.jobs.Job;
>+import org.eclipse.core.runtime.preferences.ConfigurationScope;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.IPreferencesService;
>+import org.eclipse.core.runtime.preferences.IScopeContext;
>+import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.IRegion;
>+import org.eclipse.osgi.util.NLS;
> import org.eclipse.text.edits.MultiTextEdit;
> import org.eclipse.text.edits.ReplaceEdit;
> import org.eclipse.text.edits.TextEdit;
>@@ -94,6 +102,27 @@
>  */
> public class ModelManagerImpl implements IModelManager {
> 
>+	private static int WAIT_DELAY = getInt("org.eclipse.wst.sse.core.modelmanager.maxWaitDuringConcurrentLoad");
>+	private static boolean ALLOW_INTERRUPT_WAITING_THREAD = getBoolean("org.eclipse.wst.sse.core.modelmanager.allowInterruptsDuringConcurrentLoad");
>+	private static IEclipsePreferences.IPreferenceChangeListener LISTENER;
>+	static {
>+		InstanceScope scope = new InstanceScope();
>+		IEclipsePreferences instancePrefs = scope.getNode(SSECorePlugin.ID);
>+		LISTENER = new IEclipsePreferences.IPreferenceChangeListener() {
>+
>+					public void preferenceChange(PreferenceChangeEvent event) {
>+
>+				if ("modelmanager.maxWaitDuringConcurrentLoad".equals(event.getKey())) {
>+					WAIT_DELAY = getInt("org.eclipse.wst.sse.core.modelmanager.maxWaitDuringConcurrentLoad");
>+				}
>+				else if ("modelmanager.allowInterruptsDuringConcurrentLoad".equals(event.getKey())) {
>+					ALLOW_INTERRUPT_WAITING_THREAD = getBoolean("org.eclipse.wst.sse.core.modelmanager.allowInterruptsDuringConcurrentLoad");
>+				}
>+			}
>+		};
>+		instancePrefs.addPreferenceChangeListener(LISTENER);
>+	}
>+
> 	static class ReadEditType {
> 		ReadEditType(String type) {
> 		}
>@@ -107,7 +136,8 @@
> 		int referenceCountForRead;
> 		IStructuredModel theSharedModel;
> 		boolean initializing = true;
>-		boolean doWait = true;
>+		volatile boolean doWait = true;
>+		final Object loadCondition = new Object();
> 		
> 		SharedObject(IStructuredModel sharedModel) {
> 			theSharedModel = sharedModel;
>@@ -119,15 +149,43 @@
> 		 * Waits until this shared object has been attempted to be loaded. 
> 		 * The load is "attempted" because not all loads result in a model. 
> 		 * However, upon leaving this method, theShareModel variable
>-		 * is up-to-date.
>+		 * is up-to-date. Should not be called if holding a lock on this object.
> 		 */
>-		public synchronized void waitForLoadAttempt() {
>-			while(initializing) {
>-				try {
>-					wait();
>+		public void waitForLoadAttempt() {
>+			synchronized(loadCondition) {
>+				long start = System.currentTimeMillis();
>+				// Note: A WAIT_DELAY of 0 is infinite
>+				int maxTimeMs = Math.max(0, WAIT_DELAY);
>+				final int waitInterval = Math.min(250, maxTimeMs);
>+				boolean interrupted = false;
>+				while (initializing && maxTimeMs >= 0) {
>+					try {
>+						loadCondition.wait(waitInterval);
>+						maxTimeMs -= waitInterval;
>+					}
>+					catch (InterruptedException e) {
>+						interrupted = true;
>+						if (ALLOW_INTERRUPT_WAITING_THREAD) {
>+							break;
>+						}
>+					}
> 				}
>-				catch (InterruptedException e) {
>-					// ignore interruption!
>+				if (initializing) {
>+					long totalWaitTime = System.currentTimeMillis() - start;
>+					if (interrupted) {
>+						throw new OperationCanceledException(
>+								"Waiting thread interrupted during simultenous model load. Load aborted. (Waited "
>+										+ totalWaitTime + "ms)");
>+					}
>+					else {
>+						throw new OperationCanceledException(
>+								"Waiting thread timed-out during simultenous model load. Load aborted. (Waited "
>+										+ totalWaitTime + "ms)");
>+					}
>+				}
>+				if (interrupted) {
>+					// Propagate (don't swallow) the interrupt
>+					Thread.currentThread().interrupt();
> 				}
> 			}
> 		}
>@@ -137,9 +195,11 @@
> 		 * {@link #waitForLoadAttempt()} will proceed after this 
> 		 * method returns. 
> 		 */
>-		public synchronized void setLoaded() {
>-			initializing = false;
>-			notifyAll();
>+		public void setLoaded() {
>+			synchronized(loadCondition) {
>+				initializing = false;
>+				loadCondition.notifyAll();
>+			}
> 		}
> 	}
> 
>@@ -164,6 +224,12 @@
> 		return instance;
> 	}
> 
>+	public void removePreferenceListener() {
>+		InstanceScope scope = new InstanceScope();
>+		IEclipsePreferences instancePrefs = scope.getNode(SSECorePlugin.ID);
>+		instancePrefs.removePreferenceChangeListener(LISTENER);
>+	}
>+
> 	/**
> 	 * Our cache of managed objects
> 	 */
>@@ -181,9 +247,12 @@
> 	ModelManagerImpl() {
> 		super();
> 		fManagedObjects = new HashMap();
>-		// To prevent deadlocks:  always acquire multiple locks in this order: SYNC, sharedObject. 
>-		// DO NOT acquire a SYNC within a sharedObject lock, unless you already own the SYNC lock
>-		// Tip: Try to hold the smallest number of locks you can
>+		/**
>+		 * NOTES: To prevent deadlocks: always acquire multiple locks in this
>+		 * order: SYNC->sharedObject->sharedObject.loadCondition DO NOT acquire a
>+		 * SYNC within a sharedObject lock, unless you already own the SYNC lock
>+		 * Tip: Try to hold the smallest number of locks you can
>+		 */
> 	}
> 
> 	private IStructuredModel _commonCreateModel(IFile file, String id, IModelHandler handler, URIResolver resolver, ReadEditType rwType, EncodingRule encodingRule) throws IOException,CoreException {
>@@ -376,7 +445,6 @@
> 	}
> 
> 	private IStructuredModel _commonCreateModel(String id, IModelHandler handler, URIResolver resolver) throws ResourceInUse {
>-
> 		IModelLoader loader = handler.getModelLoader();
> 		IStructuredModel result = loader.createModel();
> 		// in the past, id was null for "unmanaged" case, so we won't
>@@ -1138,10 +1206,10 @@
> 				// and return the object.
> 				SYNC.release();
> 				doRelease=false;
>+				if (sharedObject.doWait) {
>+					sharedObject.waitForLoadAttempt();
>+				}
> 				synchronized(sharedObject) {
>-					if (sharedObject.doWait) {
>-						sharedObject.waitForLoadAttempt();
>-					}
> 					if (sharedObject.theSharedModel!=null) {
> 						_incrCount(sharedObject, EDIT);
> 					}
>@@ -1220,11 +1288,10 @@
> 				// and return the object.
> 				SYNC.release();
> 				doRelease=false;
>-
>+				if (sharedObject.doWait) {
>+					sharedObject.waitForLoadAttempt();
>+				}
> 				synchronized(sharedObject) {
>-					if (sharedObject.doWait) {
>-						sharedObject.waitForLoadAttempt();
>-					}
> 					if (sharedObject.theSharedModel!=null) {
> 						_incrCount(sharedObject, READ);
> 					}
>@@ -2073,4 +2140,92 @@
> 			SYNC.release();
> 			return inUse;
> 		}
>+
>+	private static String getProperty(String property) {
>+		// Importance order is:
>+		// default-default < instanceScope < configurationScope < systemProperty < envVar
>+		String value=null;
>+		
>+		if (value == null) {
>+			value = System.getenv(property);
>+		}
>+		if (value == null) {
>+			value = System.getProperty(property);
>+		}
>+		if (value==null) {
>+			IPreferencesService preferencesService = Platform.getPreferencesService();
>+			IScopeContext[] lookupOrder = new IScopeContext[] {
>+					 new ConfigurationScope(), new InstanceScope()
>+			};
>+			String key = property;
>+			if (property != null && property.startsWith(SSECorePlugin.ID)) {
>+				// +1, include the "."
>+				key = property.substring(SSECorePlugin.ID.length() + 1, property.length());
>+			}
>+			preferencesService.getString(SSECorePlugin.ID, key, null, lookupOrder);
>+		}
>+		
>+		return value;
>+	}
>+
>+	private static String getDefault(String property) {
>+		// this is the "default-default"
>+		if ("org.eclipse.wst.sse.core.modelmanager.maxWaitDuringConcurrentLoad".equals(property)) {
>+			return "0";
>+		}
>+		else if ("org.eclipse.wst.sse.core.modelmanager.allowInterruptsDuringConcurrentLoad"
>+				.equals(property)) {
>+			return "false";
>+		}
>+		return null;
>+	}
>+
>+	private static boolean getBoolean(String key) {
>+		String property = getProperty(key);
>+		// if (property != null) {
>+		//			System.out.println("Tweak: " + key + "=" + Boolean.parseBoolean(property)); //$NON-NLS-1$ //$NON-NLS-2$
>+		// }
>+		return property != null ? Boolean.parseBoolean(property) : Boolean
>+				.parseBoolean(getDefault(key));
>+	}
>+
>+	private static int getInt(String key) {
>+		String property = getProperty(key);
>+		int size = 0;
>+		if (property != null) {
>+			try {
>+				size = Integer.parseInt(property);
>+				//	System.out.println("Tweak: " + key + "=" + size); //$NON-NLS-1$ //$NON-NLS-2$
>+			}
>+			catch (NumberFormatException e) {
>+				size = getDefaultInt(key, property, size);
>+			}
>+		}
>+		else {
>+			size = getDefaultInt(key, property, size);
>+		}
>+		return size;
>+	}
>+
>+	private static int getDefaultInt(String key, String property, int size) {
>+		// ignored
>+		try {
>+			size = Integer.parseInt(getDefault(key));
>+		}
>+		catch (NumberFormatException e1) {
>+			handleIntParseException(key, property, e1);
>+			size = 0;
>+		}
>+		return size;
>+	}
>+
>+	private static void handleIntParseException(String key, String property,
>+			NumberFormatException e1) {
>+		Exception n = new Exception(
>+				NLS
>+						.bind(
>+								"Exception during parse of default value for key ''{0}'' value was ''{1}''. Using 0 instead", //$NON-NLS-1$
>+								key, property), e1);
>+		n.printStackTrace();
>+	}
> }

Actions: View | Diff

Attachments on bug 287096: 144990 | 145676 | 145681 | 145821 | 145825 | 145829 | 146449 | 147495 | 147502 | 166062 | 166063