Attachment 118347 Details for Bug 255785 – Proposed patch

[patch] Proposed patch

v00.txt (text/plain), 9.62 KB, created by Frederic Fusier

on 2008-11-20 05:27:10 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2008-11-20 05:27:10 EST

Size: 9.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.test.performance.ui
>Index: src/org/eclipse/test/performance/ui/FingerPrint.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.basebuilder/plugins/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/FingerPrint.java,v
>retrieving revision 1.31
>diff -u -r1.31 FingerPrint.java
>--- src/org/eclipse/test/performance/ui/FingerPrint.java	18 Nov 2008 14:50:07 -0000	1.31
>+++ src/org/eclipse/test/performance/ui/FingerPrint.java	20 Nov 2008 10:17:54 -0000
>@@ -54,15 +54,15 @@
>  * @param performanceResults The performance results used to print the fingerprints
>  */
> public void print(PerformanceResults performanceResults) {
>-	String baselineBuildName = performanceResults.getBaselineName();
>+//	String baselineBuildName = performanceResults.getBaselineName();
> 	String buildName = performanceResults.getName();
> 	
> 	// Compute fingerprint output file name prefix
>-	int referenceUnderscoreIndex = baselineBuildName.indexOf('_');
>-	String baselinePrefix = baselineBuildName;
>-	if (referenceUnderscoreIndex != -1) {
>-		baselinePrefix = baselineBuildName.substring(0, referenceUnderscoreIndex);
>-	}
>+//	int referenceUnderscoreIndex = baselineBuildName.indexOf('_');
>+//	String baselinePrefix = baselineBuildName;
>+//	if (referenceUnderscoreIndex != -1) {
>+//		baselinePrefix = baselineBuildName.substring(0, referenceUnderscoreIndex);
>+//	}
> 	int currentUnderscoreIndex = buildName.indexOf('_');
> 	if  (currentUnderscoreIndex != -1){
> 		buildName = buildName.substring(0, currentUnderscoreIndex);
>@@ -72,7 +72,8 @@
> 		buffer.append(this.component);
> 		buffer.append('_');
> 	}
>-	buffer.append(baselinePrefix);
>+//	buffer.append(baselinePrefix);
>+	buffer.append(AbstractResults.VERSION_REF);
> 	buffer.append('_');
> 	buffer.append(buildName);
> 	String filePrefix = buffer.toString();
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
>retrieving revision 1.96
>diff -u -r1.96 helper.xml
>--- eclipse/helper.xml	14 Nov 2008 15:50:09 -0000	1.96
>+++ eclipse/helper.xml	20 Nov 2008 10:17:55 -0000
>@@ -334,7 +334,7 @@
> 		</condition>
> 		<property name="configArgs" value="" />
> 		
>-		<property name="eclipse.perf.config.descriptors" value="Win XP Sun 1.5.0_10 (2 x 3.00GHz, 3GB RAM), SLED 10 Sun 1.50_10 (2 x 3.00GHz, 3GB RAM), RHEL 5.0 Sun 1.6_04 (2 x 3.00GHz, 3GB RAM)"/>
>+		<property name="eclipse.perf.config.descriptors" value="Win XP Sun 1.5.0_10 (2 x 3.00GHz - 3GB RAM), SLED 10 Sun 1.50_10 (2 x 3.00GHz - 3GB RAM), RHEL 5.0 Sun 1.6_04 (2 x 3.00GHz - 3GB RAM)"/>
> 		
> 			
> 		<java jar="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar" fork="true" maxmemory="512m" error="${buildDirectory}/perfgenerror.txt">
>#P org.eclipse.test.performance
>Index: src/org/eclipse/test/internal/performance/results/DB_Results.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/results/DB_Results.java,v
>retrieving revision 1.7
>diff -u -r1.7 DB_Results.java
>--- src/org/eclipse/test/internal/performance/results/DB_Results.java	18 Nov 2008 17:12:41 -0000	1.7
>+++ src/org/eclipse/test/internal/performance/results/DB_Results.java	20 Nov 2008 10:17:56 -0000
>@@ -123,6 +123,7 @@
> 		"org.eclipse.jdt.ui", //$NON-NLS-1$
> 		"org.eclipse.jface", //$NON-NLS-1$
> 		"org.eclipse.osgi", //$NON-NLS-1$
>+		"org.eclipse.pde.api.tools", //$NON-NLS-1$
> 		"org.eclipse.pde.ui", //$NON-NLS-1$
> 		"org.eclipse.swt", //$NON-NLS-1$
> 		"org.eclipse.team", //$NON-NLS-1$
>@@ -218,6 +219,7 @@
> 			return SUPPORTED_COMPONENTS[i];
> 		}
> 	}
>+	System.err.println("Not able to find a supported component for scenario "+scenarioName); //$NON-NLS-1$
> 	return null;
> }
> 
>@@ -780,7 +782,7 @@
>  * The list is sorted alphabetically.
>  */
> private int storeBuildName(String build) {
>-	boolean isVersion = Character.isDigit(build.charAt(0));
>+	boolean isVersion = build.startsWith("R-"); //$NON-NLS-1$
> 	if (BUILDS == null) {
> 		BUILDS = new String[1];
> 		BUILDS[BUILDS_LENGTH++] = build;
>Index: src/org/eclipse/test/internal/performance/results/AbstractResults.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/results/AbstractResults.java,v
>retrieving revision 1.10
>diff -u -r1.10 AbstractResults.java
>--- src/org/eclipse/test/internal/performance/results/AbstractResults.java	8 Nov 2008 11:06:23 -0000	1.10
>+++ src/org/eclipse/test/internal/performance/results/AbstractResults.java	20 Nov 2008 10:17:56 -0000
>@@ -75,11 +75,9 @@
> 	 * (see {@link PerformanceResults#read(File)}.
> 	 */
> 	public final static String[] BOXES = {
>-		"RHEL 4.0 Sun 1.4.2_10 (3 GHz 2.5 GB)", //$NON-NLS-1$
>-		"Win XP Sun 1.4.2_10 (3 GHz 2 GB)", //$NON-NLS-1$
>-		"RHEL 3.0 Sun 1.4.2_10 (3 GHz 2 GB)", //$NON-NLS-1$
>-		"Win XP Sun 1.4.2_10 (2 GHz 512 MB)", //$NON-NLS-1$
>-		"RHEL 3.0 Sun 1.4.2_10 (2 GHz 512 MB)", //$NON-NLS-1$
>+		"Win XP Sun 1.5.0_10 (2 x 3.00GHz, 3GB RAM)", //$NON-NLS-1$
>+		"SLED 10 Sun 1.50_10 (2 x 3.00GHz, 3GB RAM)", //$NON-NLS-1$
>+		"RHEL 5.0 Sun 1.6_04 (2 x 3.00GHz, 3GB RAM)", //$NON-NLS-1$
> 	};
> 
> 	protected static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmm"); //$NON-NLS-1$
>@@ -87,33 +85,15 @@
> 	// Initialize constant fields depending on DB version
> 	public final static String VERSION_REF, VERSION;
> 	static {
>-		String dbName = PerformanceTestPlugin.getDBName();
>-		String version;
>-	
> 		// Initialize reference version and database directory
>-		char mainVersion;
>-		char minorVersion;
>-		if (dbName.equals("perfDB")) { //$NON-NLS-1$
>-			version = "_R3.3"; //$NON-NLS-1$
>-			VERSION_REF = "3.2"; //$NON-NLS-1$
>-			mainVersion = '3';
>-			minorVersion = '3';
>-			VERSION = "3.3"; //$NON-NLS-1$
>-		} else {
>-			mainVersion = dbName.charAt(dbName.length()-2);
>-			minorVersion = dbName.charAt(dbName.length()-1);
>-			version = ""; //$NON-NLS-1$
>-			VERSION_REF = mainVersion+"."+(char)(minorVersion-1); //$NON-NLS-1$
>-			VERSION = mainVersion+"."+minorVersion; //$NON-NLS-1$
>-		}
>+		VERSION_REF = "R-3.4"; //$NON-NLS-1$
>+		VERSION = "3.5"; //$NON-NLS-1$
> 	
> 		// Initialize configuration names
> 		CONFIGS = new String[] {
>-			"eclipseperflnx3"+version, //$NON-NLS-1$
>-			"eclipseperfwin2"+version, //$NON-NLS-1$
>-			"eclipseperflnx2"+version, //$NON-NLS-1$
>-			"eclipseperfwin1"+version, //$NON-NLS-1$
>-			"eclipseperflnx1"+version, //$NON-NLS-1$
>+			"epwin2", //$NON-NLS-1$
>+			"eplnx1", //$NON-NLS-1$
>+			"eplnx2", //$NON-NLS-1$
> 		};
> 	}
> 
>Index: src/org/eclipse/test/internal/performance/results/BuildResults.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/results/BuildResults.java,v
>retrieving revision 1.11
>diff -u -r1.11 BuildResults.java
>--- src/org/eclipse/test/internal/performance/results/BuildResults.java	8 Nov 2008 11:06:23 -0000	1.11
>+++ src/org/eclipse/test/internal/performance/results/BuildResults.java	20 Nov 2008 10:17:56 -0000
>@@ -47,7 +47,7 @@
> BuildResults(AbstractResults parent, int id) {
> 	super(parent, id);
> 	this.name = DB_Results.getBuildName(id);
>-	this.baseline = this.name.startsWith(AbstractResults.VERSION_REF);
>+	this.baseline = this.name.startsWith(VERSION_REF);
> }
> 
> /*
>Index: src/org/eclipse/test/internal/performance/results/PerformanceResults.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/results/PerformanceResults.java,v
>retrieving revision 1.3
>diff -u -r1.3 PerformanceResults.java
>--- src/org/eclipse/test/internal/performance/results/PerformanceResults.java	1 Oct 2008 13:03:18 -0000	1.3
>+++ src/org/eclipse/test/internal/performance/results/PerformanceResults.java	20 Nov 2008 10:17:56 -0000
>@@ -35,8 +35,23 @@
> 	private String configPattern;
> 
> public static PerformanceResults createPerformanceResults(String scenarioPattern, File dataDir, boolean print) {
>-	DB_Results.getBuilds(); // Init build names
>-	if (DB_Results.LAST_CURRENT_BUILD == null || DB_Results.LAST_BASELINE_BUILD == null) return null;
>+	List builds = DB_Results.getBuilds(); // Init build names
>+	if (DB_Results.LAST_CURRENT_BUILD == null) {
>+		System.err.println("Could not find the last current build amongst the following builds list:");	//$NON-NLS-1$
>+		int size = builds.size();
>+		for (int i=0; i<size; i++) {
>+			System.err.println("	- "+builds.get(i)); //$NON-NLS-1$
>+		}
>+		return null;
>+	}
>+	if (DB_Results.LAST_BASELINE_BUILD == null) {
>+		System.err.println("Could not find the last baseline build amongst the following builds list:");	//$NON-NLS-1$
>+		int size = builds.size();
>+		for (int i=0; i<size; i++) {
>+			System.err.println("	- "+builds.get(i)); //$NON-NLS-1$
>+		}
>+		return null;
>+	}
> 	PerformanceResults performanceResults = new PerformanceResults(DB_Results.LAST_CURRENT_BUILD, DB_Results.LAST_BASELINE_BUILD, print);
> 	performanceResults.read(null, scenarioPattern, dataDir, DEFAULT_FAILURE_THRESHOLD);
> 	return performanceResults;

Actions: View | Diff

Attachments on bug 255785: 118347