Add concurrent programs running to tregression

microbat/META-INF/MANIFEST.MF

@@ -132,6 +132,8 @@ Export-Package: microbat;uses:="org.osgi.framework,org.eclipse.jface.resource,or
    org.eclipse.core.commands,
    microbat.model.trace",
  microbat.handler.xml,
+ microbat.instrumentation.instr.aggreplay.shared,
+ microbat.instrumentation.model.id,
  microbat.instrumentation.output,
  microbat.model;uses:="microbat.model.variable,microbat.model.value,microbat.model.trace",
  microbat.model.trace;

microbat/plugin.xml

@@ -132,6 +132,22 @@
             id="microbat.command.RestoreTrace"
             name="Restore Trace">
       </command>
+      <command
+            defaultHandler="microbat.handler.ConcurrentRecordHandler"
+            id="microbat.command.conc.record"
+            name="Concurrent Record">
+      </command>
+      <command
+            defaultHandler="microbat.handler.ConcurrentReplayHandler"
+            id="microbat.command.conc.replay"
+            name="Concurrent Replay">
+      </command>
+      <command
+            defaultHandler="microbat.handler.ReplayExperimentHandler"
+            description="Need to run record before running the experiment"
+            id="microbat.command.replayExperiment"
+            name="Run replay experiment">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
@@ -194,6 +210,19 @@
                   label="Restore Trace"
                   style="push">
             </command>
+            <menu
+                  label="Concurrent Programs">
+               <command
+                     commandId="microbat.command.conc.record"
+                     label="Record"
+                     style="push">
+               </command>
+               <command
+                     commandId="microbat.command.conc.replay"
+                     label="Replay"
+                     style="push">
+               </command>
+            </menu>
          </menu>
       </menuContribution>
       <menuContribution

microbat/src/main/microbat/agent/AggrePlaySharedVarRunner.java

@@ -0,0 +1,33 @@
+package microbat.agent;
+
+import java.util.Collection;
+
+import microbat.instrumentation.AgentConstants;
+import microbat.instrumentation.AgentParams;
+import sav.common.core.SavException;
+import sav.common.core.utils.CollectionBuilder;
+import sav.strategies.vm.AgentVmRunner;
+import sav.strategies.vm.VMConfiguration;
+
+public class AggrePlaySharedVarRunner extends AgentVmRunner implements Runnable {
+	private static final String STORAGE_FILE = "shared_var.txt";
+
+	public AggrePlaySharedVarRunner(String agentJar, VMConfiguration vmConfig) {
+		super(agentJar, AgentConstants.AGENT_OPTION_SEPARATOR, AgentConstants.AGENT_PARAMS_SEPARATOR);
+	}
+
+	private void setUpParams() {
+		super.addAgentParam(AgentParams.OPT_SHARED_DETECTION, true);
+		super.addAgentParam(AgentParams.OPT_DUMP_FILE, STORAGE_FILE);
+	}
+
+	@Override
+	public void run() {
+		try {
+			super.startAndWaitUntilStop(getProgramArgs());
+		} catch (SavException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}

microbat/src/main/microbat/agent/AggrePlayTraceAgentRunner.java

@@ -0,0 +1,84 @@
+package microbat.agent;
+
+import java.util.List;
+
+import microbat.instrumentation.AgentConstants;
+import microbat.instrumentation.AgentParams;
+import microbat.util.Settings;
+import sav.common.core.SavException;
+import sav.common.core.utils.CollectionBuilder;
+import sav.common.core.utils.SingleTimer;
+import sav.common.core.utils.StringUtils;
+import sav.strategies.vm.AgentVmRunner;
+import sav.strategies.vm.VMConfiguration;
+import sav.strategies.vm.VMRunner;
+
+/**
+ * Runner used to abstract the running of the aggre play trace agent
+ * @author Gabau
+ *
+ */
+public class AggrePlayTraceAgentRunner extends AgentVmRunner implements Runnable {
+
+	private boolean enableSettingHeapSize = true;
+	private VMConfiguration configuration;
+	private static final String VARIABLE_DUMP_FILEPATH= "shared_var.info";
+	private static final String RECORDING_DUMP_PATH = "recording.info";
+	public AggrePlayTraceAgentRunner(String agentJar, VMConfiguration vmConfig) {
+		super(agentJar, AgentConstants.AGENT_OPTION_SEPARATOR, AgentConstants.AGENT_PARAMS_SEPARATOR);
+		this.configuration = vmConfig;
+	}
+
+	private void setUp() {
+		this.configuration.setDebug(Settings.isRunWtihDebugMode);
+		this.configuration.setPort(9000);
+	}
+
+	@Override
+	protected void buildVmOption(CollectionBuilder<String, ?> builder,
+			VMConfiguration config) {
+		builder.appendIf("-Xmx30g", enableSettingHeapSize);
+		// builder.appendIf("-Xmn10g", enableSettingHeapSize);
+		builder.appendIf("-XX:+UseG1GC", enableSettingHeapSize);
+		super.buildVmOption(builder, config);
+	}
+
+	private void runSharedVarDetector() throws SavException {
+		super.addAgentParam(AgentParams.OPT_SHARED_DETECTION, true);
+		super.addAgentParam(AgentParams.OPT_DUMP_FILE, VARIABLE_DUMP_FILEPATH);
+		super.startAndWaitUntilStop(getProgramArgs());
+	}
+
+	/**
+	 * Method used for running the individual concurrent modes.
+	 * @param mode
+	 * @param concDumpFile The path to the conc dump
+	 * @param dumpFile The dump file
+	 * @throws SavException 
+	 */
+	public void concReplay(String mode, String concDumpFile, String dumpFile) throws SavException {
+		setUp();
+		addAgentParam(mode, true);
+		addAgentParam(AgentParams.OPT_CONC_RECORD_DUMP, concDumpFile);
+		addAgentParam(AgentParams.OPT_DUMP_FILE, dumpFile);
+		super.startAndWaitUntilStop(this.configuration);
+		removeAgentParam(mode);
+	}
+
+	/**
+	 * Run's the three stages of the record and replay
+	 */
+	@Override
+	public void run() {
+		SingleTimer.start("Aggr");
+		try {
+			runSharedVarDetector();
+		} catch (SavException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+
+	}
+
+}

microbat/src/main/microbat/agent/ExecTraceFileReader.java

@@ -1,6 +1,7 @@
 package microbat.agent;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import microbat.codeanalysis.runtime.PreCheckInformation;
@@ -11,14 +12,20 @@
 public class ExecTraceFileReader {
 	private String msg;
 	private Trace trace;
+	private List<Trace> allTraces;
 
 	public Trace read(String execTraceFile) {
 		RunningInfo info = RunningInfo.readFromFile(execTraceFile);
 		this.trace = info.getMainTrace();
 		this.msg = info.getProgramMsg();
+		this.allTraces = info.getTraceList();
 		return trace;
 	}
 
+	public List<Trace> getAllTraces() {
+		return this.allTraces;
+	}
+
 	public PreCheckInformation readPrecheck(String precheckFile) {
 		PrecheckInfo info = PrecheckInfo.readFromFile(precheckFile);
 		PreCheckInformation result = new PreCheckInformation(info.getThreadNum(), info.getStepTotal(), info.isOverLong(),

microbat/src/main/microbat/agent/TraceAgentRunner.java

@@ -17,6 +17,7 @@
 import microbat.model.trace.Trace;
 import microbat.preference.DatabasePreference;
 import microbat.trace.Reader;
+import microbat.util.MicroBatUtil;
 import sav.common.core.SavException;
 import sav.common.core.SavRtException;
 import sav.common.core.utils.CollectionBuilder;
@@ -42,6 +43,10 @@ public class TraceAgentRunner extends AgentVmRunner {
 
 	private List<Trace> traces;
 
+	public void stopRunning() {
+		super.stop();
+	}
+
 	public TraceAgentRunner(String agentJar, VMConfiguration vmConfig) {
 		super(agentJar, AgentConstants.AGENT_OPTION_SEPARATOR, AgentConstants.AGENT_PARAMS_SEPARATOR);
 		this.setConfig(vmConfig);
@@ -54,6 +59,31 @@ protected void buildVmOption(CollectionBuilder<String, ?> builder, VMConfigurati
 		builder.appendIf("-XX:+UseG1GC", enableSettingHeapSize);
 		super.buildVmOption(builder, config);
 	}
+
+	public boolean sharedDetection() throws SavException {
+		addAgentParam(AgentParams.OPT_SHARED_DETECTION, true);
+		super.startAndWaitUntilStop(getConfig());
+		removeAgentParam(AgentParams.OPT_SHARED_DETECTION);
+		return true;
+	}
+
+	/**
+	 * Method used for running the individual concurrent modes.
+	 * @param mode
+	 * @param concDumpFile The path to the conc dump
+	 * @param dumpFile The dump file
+	 * @throws SavException 
+	 */
+	public void concReplay(String mode, String concDumpFile, String dumpFile) throws SavException {
+		addAgentParam(mode, true);
+		addAgentParam(AgentParams.OPT_CONC_RECORD_DUMP, concDumpFile);
+		addAgentParam(AgentParams.OPT_DUMP_FILE, dumpFile);
+		super.startAndWaitUntilStop(getConfig());
+		removeAgentParam(mode);
+		removeAgentParam(AgentParams.OPT_DUMP_FILE);
+		removeAgentParam(AgentParams.OPT_CONC_RECORD_DUMP);
+	}
+
 
 	public boolean precheck(String filePath) throws SavException {
 		isPrecheckMode = true;
@@ -279,8 +309,12 @@ private void updateTestResult(String msg) {
 			unknownTestResult = true;
 			return;
 		}
+		isTestSuccessful = MicroBatUtil.checkTestResult(msg);
 		int sIdx = msg.indexOf(";");
-		isTestSuccessful = Boolean.valueOf(msg.substring(0, sIdx));
+		if (sIdx < 0 || msg.length() < sIdx) {
+			unknownTestResult = true;
+			return;
+		}
 		testFailureMessage = msg.substring(sIdx + 1, msg.length());
 	}