Cleaning up code for runtime, installer, RMI, compiler for the Java side

[iot2.git] / iotjava / iotpolicy / IoTCompiler.java

diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java
index a1144919e47a8f3e8e62be71e4fb692d9fe7c4f5..58538c9c00d4455840045e03ac306452c36c4795 100644 (file)
--- a/iotjava/iotpolicy/IoTCompiler.java
+++ b/iotjava/iotpolicy/IoTCompiler.java
@@ -417,8 +417,6 @@ public class IoTCompiler {
                for (Map.Entry<String,Set<String>> intMeth : mapNewIntMethods.entrySet()) {
                        String newIntface = intMeth.getKey();
                        int newObjectId = getNewIntfaceObjectId(newIntface);
-                       //println("private final static int object" + newObjectId + "Id = " + 
-                       //      newObjectId + ";\t//" + newIntface);
                        Set<String> methodIds = intMeth.getValue();
                        print("private static Integer[] object" + newObjectId + "Permission = { ");
                        int i = 0;
@@ -824,7 +822,6 @@ public class IoTCompiler {
                                println("retClsVal[retPos++] = null;");
                        }
                }
-               //println("Object[] retActualObj = rmiComm.getStructObjects(retCls, retClsVal);");
                // Handle the actual returned struct
                writeWaitForReturnValueJava(method, intDecl, "Object[] retActualObj = rmiComm.getStructObjects(retCls, retClsVal);");
                if (isArray(retType)) {                 // An array
@@ -1088,7 +1085,6 @@ public class IoTCompiler {
                        // Now, write the body of stub!
                        if (isCallbackMethod)
                                writeCallbackMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType);
-                       //else
                        writeStdMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType);
                        println("}\n");
                }
@@ -1156,7 +1152,6 @@ public class IoTCompiler {
        private void writePropertiesJavaSkeleton(String intface, InterfaceDecl intDecl) {
 
                println("private " + intface + " mainObj;");
-               //println("private int objectId = 0;");
                Integer objId = mapIntfaceObjId.get(intface);
                println("private int objectId = " + objId + ";");
                println("// Communications and synchronizations");
@@ -1719,7 +1714,6 @@ public class IoTCompiler {
 
                // Generate array of parameter objects
                boolean isCallbackMethod = false;
-               //String callbackType = null;
                Set<String> callbackType = new HashSet<String>();
                println("byte[] localMethodBytes = methodBytes;");
                println("rmiComm.setGetMethodBytes();");
@@ -1771,7 +1765,6 @@ public class IoTCompiler {
 
                // Generate array of parameter objects
                boolean isCallbackMethod = false;
-               //String callbackType = null;
                Set<String> callbackType = new HashSet<String>();
                println("byte[] localMethodBytes = methodBytes;");
                println("rmiComm.setGetMethodBytes();");
@@ -1781,7 +1774,6 @@ public class IoTCompiler {
                        String paramType = returnGenericCallbackType(methPrmTypes.get(i));
                        if (callbackClasses.contains(paramType)) {
                                isCallbackMethod = true;
-                               //callbackType = paramType;
                                callbackType.add(paramType);
                                print("int[].class");
                        } else {        // Generate normal classes if it's not a callback object
@@ -1791,7 +1783,6 @@ public class IoTCompiler {
                        if (i != methParams.size() - 1)
                                print(", ");
                }
-               //println(" }, ");
                // Generate generic class if it's a generic type.. null otherwise
                print(" }, new Class<?>[] { ");
                for (int i = 0; i < methParams.size(); i++) {
@@ -2744,7 +2735,6 @@ public class IoTCompiler {
                                        println("1;");
                                }
                                println("void* paramObjStruct" + i + "[] = { &structLen" + i + " };");
-                               //println("void* retStructLen" + i + " = NULL;");
                                println("rmiComm->remoteCall(objectId, methodIdStruct" + i + 
                                                ", paramClsStruct" + i + ", paramObjStruct" + i + 
                                                ", numParam" + i + ");\n");
@@ -2924,7 +2914,6 @@ public class IoTCompiler {
                                println("retObj[retPos++] = &retParam" + i + ";");
                        }
                }
-               //println("rmiComm->getStructObjects(retCls, numRet, retObj);");
                writeWaitForReturnValueCplus(method, intDecl, "rmiComm->getStructObjects(retCls, numRet, retObj);");
                if (isArrayOrList(retType, retType)) {  // An array or list
                        println("vector<" + simpleType + "> structRet(retLen);");
@@ -3186,9 +3175,6 @@ public class IoTCompiler {
                println("delete obj;");
                println("}\n");
                println("extern \"C\" void init" + newStubClass + "(void* t) {");
-               //println(newStubClass + "* obj = (" + newStubClass + "*) t;");
-               //println("obj->init();");
-               //println("while(true);");
                println("}\n");
        }
 
@@ -3226,7 +3212,6 @@ public class IoTCompiler {
                                }
                                println("using namespace std;"); println("");
                                // Add default constructor and destructor
-                               //println(newStubClass + "() { }"); println("");
                                writeConstructorCplusStub(newStubClass, callbackExist, callbackClasses, methods, intDecl);
                                writeCallbackConstructorCplusStub(newStubClass, callbackExist, callbackClasses, methods, intDecl);
                                writeDeconstructorCplusStub(newStubClass, callbackExist, callbackClasses);
@@ -3482,9 +3467,7 @@ public class IoTCompiler {
                for (int i = 0; i < methParams.size(); i++) {
                        String paramType = methPrmTypes.get(i);
                        String param = methParams.get(i);
-                       //if (callbackType.equals(paramType)) {
                        if (checkCallbackType(paramType, callbackType)) // Check if this has callback object
-                               //println("int numStubs" + i + " = 0;");
                                println("vector<int> numStubIdArray" + i + ";");
                }
        }
@@ -3667,14 +3650,12 @@ public class IoTCompiler {
 
                // Generate array of parameter types
                boolean isCallbackMethod = false;
-               //String callbackType = null;
                Set<String> callbackType = new HashSet<String>();
                print("string paramCls[] = { ");
                for (int i = 0; i < methParams.size(); i++) {
                        String paramType = returnGenericCallbackType(methPrmTypes.get(i));
                        if (callbackClasses.contains(paramType)) {
                                isCallbackMethod = true;
-                               //callbackType = paramType;
                                callbackType.add(paramType);
                                print("\"int*\"");
                        } else {        // Generate normal classes if it's not a callback object
@@ -3881,9 +3862,7 @@ public class IoTCompiler {
                                String prmType = returnGenericCallbackType(methPrmTypes.get(i));
                                if (callbackClasses.contains(prmType)) {
                                        isCallbackMethod = true;
-                                       //callbackType = prmType;
                                        callbackType.add(prmType);
-                                       //println("int numStubs" + i + " = 0;");
                                        println("vector<int> numStubIdArray" + i + ";");
                                        println("paramCls[pos] = \"int*\";");
                                        println("paramObj[pos++] = &numStubIdArray" + i + ";");
@@ -4293,9 +4272,6 @@ public class IoTCompiler {
                println("delete obj;");
                println("}\n");
                println("extern \"C\" void init" + newSkelClass + "(void* t) {");
-               //println(newSkelClass + "* obj = (" + newSkelClass + "*) t;");
-               //println("obj->init();");
-               //println("while(true);");
                println("}\n");
        }
 
@@ -4402,7 +4378,7 @@ public class IoTCompiler {
        public static void printUsage() {
 
                System.out.println();
-               System.out.println("Sentinel interface and stub compiler version 1.0");
+               System.out.println("Vigilia interface and stub compiler version 1.0");
                System.out.println("Copyright (c) 2015-2016 University of California, Irvine - Programming Language Group.");
                System.out.println("All rights reserved.");
                System.out.println("Usage:");
@@ -4550,14 +4526,8 @@ public class IoTCompiler {
        // Basically the compiler needs to parse the policy (and requires) files for callback class first
        private int getNewIntfaceObjectId(String newIntface) {
 
-//             if (!mapNewIntfaceObjId.containsKey(newIntface)) {
-//                     throw new Error("IoTCompiler: Need to parse policy and requires files for callback class first! " +
-//                                                     "Please place the two files for callback class in front...\n");
-//                     return -1;
-//             } else {
-                       int retObjId = mapNewIntfaceObjId.get(newIntface);
-                       return retObjId;
-//             }
+               int retObjId = mapNewIntfaceObjId.get(newIntface);
+               return retObjId;
        }
 
 
@@ -4647,8 +4617,6 @@ public class IoTCompiler {
                // Add the standard list first
                importClasses.add("<vector>");
                importClasses.add("<set>");
-               //importClasses.add("\"IoTRMICall.hpp\"");
-               //importClasses.add("\"IoTRMIObject.hpp\"");
                importClasses.add("\"IoTRMIComm.hpp\"");
                importClasses.add("\"IoTRMICommClient.hpp\"");
                importClasses.add("\"IoTRMICommServer.hpp\"");