Dynamosa Algorithm

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

@@ -0,0 +1,13 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Descriptor and numeric id for a branch objective (true or false outcome).
+ */
+public class BranchObjectiveDto implements Serializable {
+
+    public int id;
+    public String descriptiveId;
+}
+

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

@@ -0,0 +1,20 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Serializable representation of the control-dependence information of a method.
+ * Contains only the data needed by EvoMaster core: branch objective identifiers,
+ * the subset that are roots, and the parent-child relationships between them.
+ */
+public class ControlDependenceGraphDto implements Serializable {
+
+    public String className;
+    public String methodName;
+    public List<BranchObjectiveDto> objectives = new ArrayList<>();
+    public List<Integer> rootObjectiveIds = new ArrayList<>();
+    public List<DependencyEdgeDto> edges = new ArrayList<>();
+}
+

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

@@ -0,0 +1,13 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Directed edge describing that parentObjectiveId must be covered before childObjectiveId.
+ */
+public class DependencyEdgeDto implements Serializable {
+
+    public int parentObjectiveId;
+    public int childObjectiveId;
+}
+

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

@@ -45,6 +45,19 @@ public class SutRunDto {
      */
     public String methodReplacementCategories;
 
+    /**
+     * Whether to enable Control Dependence Graph generation in the Java agent
+     */
+    public Boolean enableControlDependenceGraphs;
+
+    /**
+     * Whether to write generated graphs (DOT/PNGs) to disk on the agent side.
+     * <p>
+     * <b>Debugging only</b>: when enabled, graph files are written to a fixed location,
+     * so running multiple experiments in parallel will cause file overwrites.
+     */
+    public Boolean writeCfg;
+
 
     public SutRunDto() {
     }

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

@@ -14,4 +14,9 @@ public class TestResultsDto {
     public List<AdditionalInfoDto> additionalInfoList = new ArrayList<>();
 
     public List<ExtraHeuristicsDto> extraHeuristics = new ArrayList<>();
+
+    /**
+     * Incremental control-dependence graphs discovered since the last handshake.
+     */
+    public List<ControlDependenceGraphDto> controlDependenceGraphs = 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.ControlDependenceSnapshot;
+import org.evomaster.client.java.controller.api.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 controlDependenceGraphIndex = 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> getControlDependenceGraphs() {
+        ControlDependenceSnapshot snapshot = InstrumentationController.getControlDependenceSnapshot(controlDependenceGraphIndex);
+        controlDependenceGraphIndex = snapshot.getNextIndex();
+        return snapshot.getGraphs();
+    }
+
+    @Override
+    public void setControlDependenceGraphsEnabled(boolean enableGraphs) {
+        InstrumentationController.setControlDependenceGraphsEnabled(enableGraphs);
+    }
+
+    @Override
+    public void setWriteCfgEnabled(boolean writeCfg) {
+        InstrumentationController.setWriteCfgEnabled(writeCfg);
+    }
 }

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

@@ -12,6 +12,8 @@
 import org.evomaster.client.java.controller.internal.SutController;
 import org.evomaster.client.java.instrumentation.external.JarAgentLocator;
 import org.evomaster.client.java.instrumentation.external.ServerController;
+import org.evomaster.client.java.instrumentation.external.ControlDependenceGraphConfigDto;
+import org.evomaster.client.java.controller.api.dto.ControlDependenceGraphDto;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -447,6 +449,15 @@ public BootTimeInfoDto getBootTimeInfoDto() {
         return getBootTimeInfoDto(serverController.handleBootTimeObjectiveInfo());
     }
 
+    @Override
+    public List<ControlDependenceGraphDto> getControlDependenceGraphs() {
+        if (!isInstrumentationActivated()){
+            return Collections.emptyList();
+        }
+        List<ControlDependenceGraphDto> graphs = serverController.getControlDependenceGraphs();
+        return graphs != null ? graphs : Collections.emptyList();
+    }
+
     @Override
     public final void newActionSpecificHandler(ActionDto dto) {
         if (isInstrumentationActivated()) {
@@ -522,6 +533,28 @@ public final void setExecutingInitMongo(boolean executingInitMongo) {
         ExecutionTracer.setExecutingInitMongo(executingInitMongo);
     }
 
+    /**
+     * Send CDG configuration to the Java Agent.
+     */
+    public final void setControlDependenceGraphsEnabled(boolean enableGraphs) {
+        checkInstrumentation();
+        ControlDependenceGraphConfigDto dto = new ControlDependenceGraphConfigDto();
+        dto.enableGraphs = enableGraphs;
+        dto.writeCfg = null;
+        serverController.setControlDependenceGraphConfig(dto);
+    }
+
+    /**
+     * Control whether the agent writes DOT/PNG graphs to disk.
+     */
+    public final void setWriteCfgEnabled(boolean writeCfg) {
+        checkInstrumentation();
+        ControlDependenceGraphConfigDto dto = new ControlDependenceGraphConfigDto();
+        dto.enableGraphs = null;
+        dto.writeCfg = writeCfg;
+        serverController.setControlDependenceGraphConfig(dto);
+    }
+
     @Override
     public final void setExecutingAction(boolean executingAction){
         checkInstrumentation();

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.controller.api.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();
     }
 
@@ -377,6 +377,11 @@ public Response runSut(SutRunDto dto, @Context HttpServletRequest httpServletReq
                     if (!noKillSwitch(() -> sutController.isSutRunning())) {
                         noKillSwitch(() -> sutController.bootingSut(true));
                         baseUrlOfSUT = noKillSwitch(() -> sutController.startSut());
+                        // Configure CDG generation on the agent, if requested by core
+                        Boolean enableGraphs = dto.enableControlDependenceGraphs;
+                        if (enableGraphs != null) noKillSwitch(() -> sutController.setControlDependenceGraphsEnabled(enableGraphs));
+                        Boolean writeCfg = dto.writeCfg;
+                        if (writeCfg != null) noKillSwitch(() -> sutController.setWriteCfgEnabled(writeCfg));
                         noKillSwitch(() -> sutController.bootingSut(false));
                         if (baseUrlOfSUT == null) {
                             //there has been an internal failure in starting the SUT
@@ -588,6 +593,12 @@ public Response getTestResults(
                     SimpleLogger.error(msg);
                     return Response.status(500).entity(WrappedResponseDto.withError(msg)).build();
                 }
+
+            List<ControlDependenceGraphDto> cdgs =
+                    noKillSwitch(() -> sutController.getControlDependenceGraphs());
+            if (cdgs != null && !cdgs.isEmpty()) {
+                dto.controlDependenceGraphs.addAll(cdgs);
+                }
 //            }
 //        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.controller.api.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.evomaster.client.java.utils.SimpleLogger;
 import org.glassfish.jersey.jackson.JacksonFeature;
@@ -1564,6 +1565,15 @@ public abstract List<TargetInfo> getTargetInfos(Collection<Integer> ids,
 
     public abstract void setExecutingAction(boolean executingAction);
 
+    /**
+     * Enable/disable Control Dependence Graph generation in the Java agent.
+     */
+    public abstract void setControlDependenceGraphsEnabled(boolean enableGraphs);
+
+    /**
+     * Enable/disable writing graphs to disk in the Java agent.
+     */
+    public abstract void setWriteCfgEnabled(boolean writeCfg);
 
     /**
      * specify whether the SUT is booting (ie starting up), or not.
@@ -1576,6 +1586,8 @@ public abstract List<TargetInfo> getTargetInfos(Collection<Integer> ids,
 
     public abstract BootTimeInfoDto getBootTimeInfoDto();
 
+    public abstract List<ControlDependenceGraphDto> getControlDependenceGraphs();
+
     protected BootTimeInfoDto getBootTimeInfoDto(BootTimeObjectiveInfo info){
         if (info == null)
             return null;

client-java/instrumentation/pom.xml

@@ -26,6 +26,10 @@
             <groupId>org.evomaster</groupId>
             <artifactId>evomaster-client-java-instrumentation-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.evomaster</groupId>
+            <artifactId>evomaster-client-java-controller-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
@@ -181,7 +185,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>

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.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.graphs.ControlDependenceGraphConfig;
+import org.evomaster.client.java.instrumentation.external.ControlDependenceSnapshot;
 
 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 ControlDependenceSnapshot getControlDependenceSnapshot(int fromIndex){
+        return GraphPool.exportSnapshotFromIndex(fromIndex);
+    }
+
+    public static void setControlDependenceGraphsEnabled(boolean enableGraphs) {
+        ControlDependenceGraphConfig.setEnableGraphs(enableGraphs);
+    }
+
+    public static void setWriteCfgEnabled(boolean writeCfg) {
+        ControlDependenceGraphConfig.setWriteCfgEnabled(writeCfg);
+    }
+
 }

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

@@ -7,6 +7,8 @@
 import org.evomaster.client.java.instrumentation.shared.ClassName;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.evomaster.client.java.utils.SimpleLogger;
+import org.evomaster.client.java.instrumentation.graphs.ControlDependenceGraphConfig;
+import org.evomaster.client.java.instrumentation.graphs.visitor.CFGClassVisitor;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
@@ -65,11 +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 (ControlDependenceGraphConfig.isGraphsEnabled()){
+                cv = new CFGClassVisitor(classLoader, cv);
+            }
             cv = new CoverageClassVisitor(cv, className);
         } else {
             cv = new ThirdPartyClassVisitor(cv, className);
-        }
+        }   
 
         try {
             cn.accept(cv);