Add beginning of support for dsm

[IRC.git] / Robust / src / Main / Main.java

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 775891c634d390133301faa57a4193a254bfddde..1dc2d334583a22c970a29374e70a6ed893f137c8 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -15,6 +15,9 @@ import Analysis.TaskStateAnalysis.TaskGraph;
 import Analysis.CallGraph.CallGraph;
 import Analysis.TaskStateAnalysis.TagAnalysis;
 import Analysis.TaskStateAnalysis.GarbageAnalysis;
+import Analysis.TaskStateAnalysis.ExecutionGraph;
+import Analysis.TaskStateAnalysis.SafetyAnalysis;
+import Analysis.Locality.LocalityAnalysis;
 import Interface.*;
 
 public class Main {
@@ -43,8 +46,12 @@ public class Main {
              state.TASK=true;
          else if (option.equals("-taskstate"))
              state.TASKSTATE=true;
+         else if (option.equals("-optional"))
+             state.OPTIONAL=true;
          else if (option.equals("-thread"))
              state.THREAD=true;
+         else if (option.equals("-dsm"))
+             state.DSM=true;
          else if (option.equals("-webinterface"))
              state.WEBINTERFACE=true;
          else if (option.equals("-instructionfailures"))
@@ -54,13 +61,14 @@ public class Main {
              System.out.println("-dir outputdirectory -- output code in outputdirectory");
              System.out.println("-struct structfile -- output structure declarations for repair tool");
              System.out.println("-mainclass -- main function to call");
+             System.out.println("-dsm -- distributed shared memory support");
              System.out.println("-precise -- use precise garbage collection");
-
              System.out.println("-conscheck -- turn on consistency checking");
              System.out.println("-task -- compiler for tasks");
              System.out.println("-thread -- threads");
              System.out.println("-instructionfailures -- insert code for instruction level failures");
              System.out.println("-taskstate -- do task state analysis");
+             System.out.println("-optional -- enable optional arguments");
              System.out.println("-webinterface -- enable web interface");
              System.out.println("-help -- print out help");
              System.exit(0);
@@ -83,12 +91,17 @@ public class Main {
       readSourceFile(state, ClassLibraryPrefix+"File.java");
       readSourceFile(state, ClassLibraryPrefix+"InetAddress.java");
 
-      if (state.THREAD) {
-         readSourceFile(state, ClassLibraryPrefix+"Thread.java");
-         readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
-      } else {
+
+
+      if (state.TASK) {
          readSourceFile(state, ClassLibraryPrefix+"Object.java");
          readSourceFile(state, ClassLibraryPrefix+"TagDescriptor.java");
+      } else {
+         if (state.THREAD) {
+             readSourceFile(state, ClassLibraryPrefix+"Thread.java");
+             readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
+         } else
+             readSourceFile(state, ClassLibraryPrefix+"ObjectJavaNT.java");
       }
 
       if (state.TASK) {
@@ -120,19 +133,28 @@ public class Main {
          ta.taskAnalysis();
          TaskGraph tg=new TaskGraph(state, ta);
          tg.createDOTfiles();
+
+         if (state.OPTIONAL) {
+             ExecutionGraph et=new ExecutionGraph(state, ta);
+             et.createExecutionGraph();
+             SafetyAnalysis sa = new SafetyAnalysis(et.getExecutionGraph(), state, ta);
+             sa.buildPath();
+         }
+
          if (state.WEBINTERFACE) {
              GarbageAnalysis ga=new GarbageAnalysis(state, ta);
-             WebInterface wi=new WebInterface(state, ta, tg, ga);
+             WebInterface wi=new WebInterface(state, ta, tg, ga, taganalysis);
              JhttpServer serve=new JhttpServer(8000,wi);
              serve.run();
          }
 
 
       }
-
-      
+      if (state.DSM) {
+         CallGraph callgraph=new CallGraph(state);
+         LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
+      }
       
-
       BuildCode bc=new BuildCode(state, bf.getMap(), tu);
       bc.buildCode();
       System.exit(0);