From 1ba8d3916d0eb69237907c90db11b341b635f04b Mon Sep 17 00:00:00 2001
From: Pawel Piech
Date: Wed, 24 Mar 2010 18:50:29 +0000
Subject: [306982] - [concurrent] DsfRunnable.finalize() method increases the
cost of garbage collecting 10x
---
.../eclipse/cdt/dsf/concurrent/DsfExecutable.java | 65 +++++++++++-----------
.../eclipse/cdt/dsf/concurrent/RequestMonitor.java | 36 +++++++-----
2 files changed, 57 insertions(+), 44 deletions(-)
(limited to 'dsf')
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DsfExecutable.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DsfExecutable.java
index a93eb722bcb..3ff34ed67e4 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DsfExecutable.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DsfExecutable.java
@@ -14,7 +14,6 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.cdt.dsf.internal.DsfPlugin;
-import org.eclipse.cdt.dsf.internal.LoggingUtils;
import org.eclipse.core.runtime.Platform;
/**
@@ -181,34 +180,38 @@ public class DsfExecutable {
return true;
}
- /**
- * Checks to see if the object was executed before being garbage collected.
- * If not, and it's expected to have been, then output a trace message to
- * that effect.
- *
- * @see java.lang.Object#finalize()
- */
- @Override
- protected void finalize() {
- if (DEBUG_EXECUTOR && !fSubmitted && isExecutionRequired()) {
- StringBuilder traceBuilder = new StringBuilder();
-
- // Record the time
- traceBuilder.append(DsfPlugin.getDebugTime());
- traceBuilder.append(' ');
-
- final String refstr = LoggingUtils.toString(this, false);
- traceBuilder.append("DSF executable was never executed: " + refstr); //$NON-NLS-1$
- final String tostr = LoggingUtils.trimTrailingNewlines(this.toString());
- if (!tostr.equals(refstr)) {
- traceBuilder.append(" ["); //$NON-NLS-1$
- traceBuilder.append(tostr);
- traceBuilder.append(']');
- }
- traceBuilder.append("\nCreated at:\n"); //$NON-NLS-1$
- traceBuilder.append(fCreatedAt);
-
- DsfPlugin.debug(traceBuilder.toString());
- }
- }
+// Bug 306982
+// Disable the use of finalize() method in DSF runnables tracing to avoid
+// a performance penalty in garbage colleciton.
+//
+// /**
+// * Checks to see if the object was executed before being garbage collected.
+// * If not, and it's expected to have been, then output a trace message to
+// * that effect.
+// *
+// * @see java.lang.Object#finalize()
+// */
+// @Override
+// protected void finalize() {
+// if (DEBUG_EXECUTOR && !fSubmitted && isExecutionRequired()) {
+// StringBuilder traceBuilder = new StringBuilder();
+//
+// // Record the time
+// traceBuilder.append(DsfPlugin.getDebugTime());
+// traceBuilder.append(' ');
+//
+// final String refstr = LoggingUtils.toString(this, false);
+// traceBuilder.append("DSF executable was never executed: " + refstr); //$NON-NLS-1$
+// final String tostr = LoggingUtils.trimTrailingNewlines(this.toString());
+// if (!tostr.equals(refstr)) {
+// traceBuilder.append(" ["); //$NON-NLS-1$
+// traceBuilder.append(tostr);
+// traceBuilder.append(']');
+// }
+// traceBuilder.append("\nCreated at:\n"); //$NON-NLS-1$
+// traceBuilder.append(fCreatedAt);
+//
+// DsfPlugin.debug(traceBuilder.toString());
+// }
+// }
}
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
index cf63ebcd195..2357ea98da5 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
@@ -10,12 +10,13 @@
*******************************************************************************/
package org.eclipse.cdt.dsf.concurrent;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import org.eclipse.cdt.dsf.internal.DsfPlugin;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
@@ -101,7 +102,7 @@ public class RequestMonitor extends DsfExecutable {
*/
private final RequestMonitor fParentRequestMonitor;
- private ListenerList fCancelListeners;
+ private List