Preparing for Blinky Config

spideruci · May 15, 2020 · 4e110e1 · 4e110e1
1 parent 0d17629
commit 4e110e1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,11 +2,6 @@
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
- <parent>
-  <groupId>org.spideruci.analysis</groupId>
-  <artifactId>blinky</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
- </parent>
 
  <groupId>org.spideruci.analysis</groupId>
  <artifactId>blinky-core</artifactId>

diff --git a/resources/config.yaml b/resources/config.yaml
@@ -67,7 +67,6 @@ retransformInclusionList:
 - org/w3c
 - org/xml
 # - sun/
-
 # - java/util/Vector
 # - java
 # - sun
@@ -81,6 +80,8 @@ retransformInclusionList:
 # - org/w3c
 # - org/xml
 
+profiler: 'org/spideruci/analysis/dynamic/profilers/CoverageTracker'
+
 ## FUTURE EXAMPLES (NOT YET TESTED; DO NOT UNCOMMENT):
 # name: blinky
 # number: !!int 1

diff --git a/src/org/spideruci/analysis/dynamic/TraceLogger.java b/src/org/spideruci/analysis/dynamic/TraceLogger.java
@@ -2,8 +2,10 @@
 
 import static org.spideruci.analysis.dynamic.Profiler.REAL_OUT;
 
+import org.spideruci.analysis.dynamic.api.EmptyProfiler;
 import org.spideruci.analysis.dynamic.api.IProfiler;
 import org.spideruci.analysis.dynamic.profilers.TimeAndCountTracker;
+import org.spideruci.analysis.statik.instrumentation.Config;
 import org.spideruci.analysis.trace.EventBuilder;
 import org.spideruci.analysis.trace.EventType;
 import org.spideruci.analysis.trace.TraceEvent;
@@ -14,7 +16,7 @@ public class TraceLogger {
   public static final int TIMESTAMP = 1;
   public static final int CALLDEPTH = 2;
 
-  public static IProfiler profiler = new TimeAndCountTracker();
+  public static IProfiler profiler = Config.profiler;
 
   private static long count = 0;
 

diff --git a/src/org/spideruci/analysis/statik/instrumentation/Config.java b/src/org/spideruci/analysis/statik/instrumentation/Config.java
@@ -1,12 +1,17 @@
 package org.spideruci.analysis.statik.instrumentation;
 
+import org.spideruci.analysis.dynamic.api.EmptyProfiler;
+import org.spideruci.analysis.dynamic.api.IProfiler;
+
 public class Config {
   public static int LINE_COUNT = 0;
 
   public static String[] exclusionList;
   public static String[] inclusionList;
   public static String[] retransformInclusionList;
   public static String[] retransformExclusionList;
+
+  public static IProfiler profiler = new EmptyProfiler(); // TODO: set to null so that the blinky-config has a change to override this
 
   public static boolean checkInclusionList = false;
   public static boolean forceCheckInclusionList = false;