added algoritm logic

Author: francastagna

client-java/controller-api/pom.xml

@@ -22,6 +22,10 @@
             <groupId>org.evomaster</groupId>
             <artifactId>evomaster-client-java-sql-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.evomaster</groupId>
+            <artifactId>evomaster-client-java-instrumentation-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.evomaster</groupId>
             <artifactId>evomaster-test-utils-java</artifactId>

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/ControllerConstants.java

@@ -33,4 +33,5 @@ public class ControllerConstants {
     public static final String POST_SEARCH_ACTION = "/postSearchAction";
 
     public static final String DERIVE_PARAMS = "/deriveParams";
+
 }

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/SutInfoDto.java

@@ -6,7 +6,6 @@
 import org.evomaster.client.java.controller.api.dto.problem.RestProblemDto;
 import org.evomaster.client.java.controller.api.dto.problem.GraphQLProblemDto;
 import org.evomaster.client.java.controller.api.dto.problem.WebProblemDto;
-
 import java.util.List;
 
 public class SutInfoDto {

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/TestResultsDto.java

@@ -1,5 +1,7 @@
 package org.evomaster.client.java.controller.api.dto;
 
+import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,4 +16,9 @@ public class TestResultsDto {
     public List<AdditionalInfoDto> additionalInfoList = new ArrayList<>();
 
     public List<ExtraHeuristicsDto> extraHeuristics = new ArrayList<>();
+
+    /**
+     * Incremental DynaMOSA control-dependence graphs discovered since the last handshake.
+     */
+    public List<ControlDependenceGraphDto> dynamosaCdgs = new ArrayList<>();
 }

client-java/controller/src/main/java/org/evomaster/client/java/controller/EmbeddedSutController.java

@@ -6,6 +6,8 @@
 import org.evomaster.client.java.controller.api.dto.problem.rpc.ScheduleTaskInvocationDto;
 import org.evomaster.client.java.controller.internal.SutController;
 import org.evomaster.client.java.instrumentation.*;
+import org.evomaster.client.java.instrumentation.external.DynamosaControlDependenceSnapshot;
+import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.object.ClassToSchema;
 import org.evomaster.client.java.instrumentation.staticstate.ExecutionTracer;
 import org.evomaster.client.java.instrumentation.staticstate.ObjectiveRecorder;
@@ -31,6 +33,8 @@
  */
 public abstract class EmbeddedSutController extends SutController {
 
+    private int dynamosaCdgIndex = 0;
+
     @Override
     public final void setupForGeneratedTest(){
         //In the past, we configured P6Spy here
@@ -138,4 +142,21 @@ public final void getJvmDtoSchema(List<String> dtoNames) {
     public final void bootingSut(boolean bootingSut) {
         ObjectiveRecorder.setBooting(bootingSut);
     }
+
+    @Override
+    public List<ControlDependenceGraphDto> getDynamosaControlDependenceGraphs() {
+        DynamosaControlDependenceSnapshot snapshot = InstrumentationController.getControlDependenceSnapshot(dynamosaCdgIndex);
+        dynamosaCdgIndex = snapshot.getNextIndex();
+        return snapshot.getGraphs();
+    }
+
+    @Override
+    public void setDynamosaGraphsEnabled(boolean enableGraphs) {
+        InstrumentationController.setDynamosaGraphsEnabled(enableGraphs);
+    }
+
+    @Override
+    public void setWriteCfgEnabled(boolean writeCfg) {
+        InstrumentationController.setWriteCfgEnabled(writeCfg);
+    }
 }

client-java/controller/src/main/java/org/evomaster/client/java/controller/ExternalSutController.java

@@ -13,6 +13,7 @@
 import org.evomaster.client.java.instrumentation.external.JarAgentLocator;
 import org.evomaster.client.java.instrumentation.external.ServerController;
 import org.evomaster.client.java.instrumentation.external.DynamosaConfigDto;
+import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -448,6 +449,15 @@ public BootTimeInfoDto getBootTimeInfoDto() {
         return getBootTimeInfoDto(serverController.handleBootTimeObjectiveInfo());
     }
 
+    @Override
+    public List<ControlDependenceGraphDto> getDynamosaControlDependenceGraphs() {
+        if (!isInstrumentationActivated()){
+            return Collections.emptyList();
+        }
+        List<ControlDependenceGraphDto> graphs = serverController.getDynamosaControlDependenceGraphs();
+        return graphs != null ? graphs : Collections.emptyList();
+    }
+
     @Override
     public final void newActionSpecificHandler(ActionDto dto) {
         if (isInstrumentationActivated()) {

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/EMController.java

@@ -19,6 +19,7 @@
 import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.evomaster.client.java.controller.problem.rpc.schema.LocalAuthSetupSchema;
 import org.evomaster.client.java.instrumentation.*;
+import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.shared.StringSpecializationInfo;
 import org.evomaster.client.java.instrumentation.staticstate.ExecutionTracer;
 import org.evomaster.client.java.utils.SimpleLogger;
@@ -254,7 +255,6 @@ public Response getSutInfo(@Context HttpServletRequest httpServletRequest) {
             return Response.status(500).entity(WrappedResponseDto.withError(msg)).build();
         }
 
-
         return Response.status(200).entity(WrappedResponseDto.withData(dto)).build();
     }
 
@@ -593,6 +593,12 @@ public Response getTestResults(
                     SimpleLogger.error(msg);
                     return Response.status(500).entity(WrappedResponseDto.withError(msg)).build();
                 }
+
+            List<ControlDependenceGraphDto> dynamosaCdgs =
+                    noKillSwitch(() -> sutController.getDynamosaControlDependenceGraphs());
+            if (dynamosaCdgs != null && !dynamosaCdgs.isEmpty()) {
+                dto.dynamosaCdgs.addAll(dynamosaCdgs);
+                }
 //            }
 //        else {
 //                // there is still some data that we need during minimization

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/SutController.java

@@ -49,6 +49,7 @@
 import org.evomaster.client.java.instrumentation.AdditionalInfo;
 import org.evomaster.client.java.instrumentation.BootTimeObjectiveInfo;
 import org.evomaster.client.java.instrumentation.TargetInfo;
+import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.evomaster.client.java.utils.SimpleLogger;
 import org.glassfish.jersey.jackson.JacksonFeature;
@@ -1592,6 +1593,10 @@ public void setWriteCfgEnabled(boolean writeCfg){
 
     public abstract BootTimeInfoDto getBootTimeInfoDto();
 
+    public List<ControlDependenceGraphDto> getDynamosaControlDependenceGraphs(){
+        return Collections.emptyList();
+    }
+
     protected BootTimeInfoDto getBootTimeInfoDto(BootTimeObjectiveInfo info){
         if (info == null)
             return null;

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/InstrumentationController.java

@@ -1,9 +1,11 @@
 package org.evomaster.client.java.instrumentation;
 
-import org.evomaster.client.java.instrumentation.object.ClassToSchema;
+import org.evomaster.client.java.instrumentation.dynamosa.graphs.GraphPool;
 import org.evomaster.client.java.instrumentation.staticstate.ExecutionTracer;
 import org.evomaster.client.java.instrumentation.staticstate.ObjectiveRecorder;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
+import org.evomaster.client.java.instrumentation.dynamosa.DynamosaConfig;
+import org.evomaster.client.java.instrumentation.external.DynamosaControlDependenceSnapshot;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,6 +18,7 @@ public class InstrumentationController {
     public static void resetForNewSearch(){
         ExecutionTracer.reset();
         ObjectiveRecorder.reset(false);
+        GraphPool.refreshAllCdgs();
     }
 
     /*
@@ -146,4 +149,16 @@ public static void extractSpecifiedDto(List<String> dtoNames){
         UnitsInfoRecorder.registerSpecifiedDtoSchema(ExtractJvmClass.extractAsSchema(dtoNames));
     }
 
+    public static DynamosaControlDependenceSnapshot getControlDependenceSnapshot(int fromIndex){
+        return GraphPool.exportSnapshotFromIndex(fromIndex);
+    }
+
+    public static void setDynamosaGraphsEnabled(boolean enableGraphs) {
+        DynamosaConfig.setEnableGraphs(enableGraphs);
+    }
+
+    public static void setWriteCfgEnabled(boolean writeCfg) {
+        DynamosaConfig.setWriteCfgEnabled(writeCfg);
+    }
+
 }

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/Instrumentator.java

@@ -8,7 +8,7 @@
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.evomaster.client.java.utils.SimpleLogger;
 import org.evomaster.client.java.instrumentation.dynamosa.DynamosaConfig;
-import org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg.CFGClassAdapter;
+import org.evomaster.client.java.instrumentation.dynamosa.visitor.CFGClassVisitor;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
@@ -67,16 +67,15 @@ public byte[] transformBytes(ClassLoader classLoader, ClassName className, Class
         ClassNode cn = new ClassNode();
         reader.accept(cn, readFlags);
 
-        if(canInstrumentForCoverage(className)){
+        boolean canCollectCoverage = canInstrumentForCoverage(className);
+        if(canCollectCoverage){
+            if (DynamosaConfig.isGraphsEnabled()){
+                cv = new CFGClassVisitor(classLoader, cv);
+            }
             cv = new CoverageClassVisitor(cv, className);
         } else {
             cv = new ThirdPartyClassVisitor(cv, className);
-        }
-
-        boolean dynamosaGraphs = DynamosaConfig.isGraphsEnabled();
-        if (dynamosaGraphs) {
-            cv = new CFGClassAdapter(classLoader, cv);
-        }
+        }   
 
         try {
             cn.accept(cv);