Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2008-11-10 15:21:52 +0000
committerPascal Rapicault2008-11-10 15:21:52 +0000
commita40a10aaf20739c63dcc1483b91f188386490a69 (patch)
treeb872cb401ec8195b0394e673a91e5ab4f5a4977d
parentd670f226349f43ef6c27be7fa697ab1059e44890 (diff)
downloadrt.equinox.p2-a40a10aaf20739c63dcc1483b91f188386490a69.tar.gz
rt.equinox.p2-a40a10aaf20739c63dcc1483b91f188386490a69.tar.xz
rt.equinox.p2-a40a10aaf20739c63dcc1483b91f188386490a69.zip
Bug 251913 - [planner] High memory use in projectorv20081112-1019
-rw-r--r--bundles/org.eclipse.equinox.p2.core/.options5
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/Tracing.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java3
3 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/.options b/bundles/org.eclipse.equinox.p2.core/.options
index 6af42a301..cf100dbed 100644
--- a/bundles/org.eclipse.equinox.p2.core/.options
+++ b/bundles/org.eclipse.equinox.p2.core/.options
@@ -14,4 +14,7 @@ org.eclipse.equinox.p2.core/engine/installregistry=false
org.eclipse.equinox.p2.core/metadata/parsing=false
#Detailed debugging information about mirror selection
-org.eclipse.equinox.p2.core/artifacts/mirrors=false \ No newline at end of file
+org.eclipse.equinox.p2.core/artifacts/mirrors=false
+
+#Detailde debugging information about the projector
+org.eclipse.equinox.p2.core/planner/projector=false \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/Tracing.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/Tracing.java
index 6f81df5fb..695dd996c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/Tracing.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/Tracing.java
@@ -19,6 +19,7 @@ import org.eclipse.osgi.service.debug.DebugOptions;
* debug statements.
*/
public class Tracing {
+
//master p2 debug flag
public static boolean DEBUG = false;
@@ -28,6 +29,7 @@ public class Tracing {
public static boolean DEBUG_INSTALL_REGISTRY = false;
public static boolean DEBUG_METADATA_PARSING = false;
public static boolean DEBUG_MIRRORS = false;
+ public static boolean DEBUG_PLANNER_PROJECTOR = false;
static {
DebugOptions options = (DebugOptions) ServiceHelper.getService(Activator.context, DebugOptions.class.getName());
@@ -39,6 +41,7 @@ public class Tracing {
DEBUG_INSTALL_REGISTRY = options.getBooleanOption(Activator.ID + "/engine/installregistry", false); //$NON-NLS-1$
DEBUG_METADATA_PARSING = options.getBooleanOption(Activator.ID + "/metadata/parsing", false); //$NON-NLS-1$
DEBUG_MIRRORS = options.getBooleanOption(Activator.ID + "/artifacts/mirrors", false); //$NON-NLS-1$
+ DEBUG_PLANNER_PROJECTOR = options.getBooleanOption(Activator.ID + "/planner/projector", false); //$NON-NLS-1$
}
}
}
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 971480495..4352a8954 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -13,6 +13,7 @@ import java.io.*;
import java.util.*;
import java.util.Map.Entry;
import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.CapabilityQuery;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
@@ -32,7 +33,7 @@ import org.sat4j.specs.*;
* back into information understandable by the planner.
*/
public class Projector {
- private static boolean DEBUG = false;
+ private static boolean DEBUG = Tracing.DEBUG_PLANNER_PROJECTOR;
private IQueryable picker;
private Map variables; //key IU, value corresponding variable in the problem

Back to the top