X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=blobdiff_plain;f=iotjava%2Fiotpolicy%2FIoTCompiler.java;h=027ea07670c77433c6e030ff6f984f26893de84c;hp=ee3d287ee396d2b898ad0e45afa8ef77fab8a79d;hb=HEAD;hpb=4951f81458fa28e4db26f568df9f30e7afdecf0c diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java index ee3d287..027ea07 100644 --- a/iotjava/iotpolicy/IoTCompiler.java +++ b/iotjava/iotpolicy/IoTCompiler.java @@ -48,6 +48,8 @@ public class IoTCompiler { private Map mapIntfacePTH; private Map mapIntDeclHand; private Map>> mapInt2NewInts; + private Map mapInt2NewIntName; + private Map> mapInt2Drv; // Data structure to store our types (primitives and non-primitives) for compilation private Map mapPrimitives; private Map mapNonPrimitivesJava; @@ -58,12 +60,24 @@ public class IoTCompiler { private PrintWriter pw; private String dir; private String subdir; + private Map mapPortCount; // Counter for ports + private static int portCount = 0; + private static int countObjId = 1; // Always increment object Id for a new stub/skeleton + private String mainClass; + private String controllerClass; /** * Class constants */ private final static String OUTPUT_DIRECTORY = "output_files"; + private final static String INTERFACES_DIRECTORY = "interfaces"; + private final static String VIRTUALS_DIRECTORY = "virtuals"; + private final static String DRIVERS_DIRECTORY = "drivers"; + private final static String CONTROLLER_DIRECTORY = "controller"; + private final static String CODE_PREFIX = "iotcode"; + private final static String INTERFACE_PACKAGE = "iotcode.interfaces"; + private enum ParamCategory { @@ -83,6 +97,8 @@ public class IoTCompiler { mapIntfacePTH = new HashMap(); mapIntDeclHand = new HashMap(); mapInt2NewInts = new HashMap>>(); + mapInt2NewIntName = new HashMap(); + mapInt2Drv = new HashMap>(); mapIntfaceObjId = new HashMap(); mapNewIntfaceObjId = new HashMap(); mapPrimitives = new HashMap(); @@ -91,9 +107,34 @@ public class IoTCompiler { arraysToMap(mapNonPrimitivesJava, IoTRMITypes.nonPrimitivesJava, IoTRMITypes.nonPrimitiveJavaLibs); mapNonPrimitivesCplus = new HashMap(); arraysToMap(mapNonPrimitivesCplus, IoTRMITypes.nonPrimitivesJava, IoTRMITypes.nonPrimitivesCplus); + mapPortCount = new HashMap(); pw = null; dir = OUTPUT_DIRECTORY; subdir = null; + mainClass = null; + controllerClass = null; + } + + + /** + * setDriverClass() sets the name of the driver class. + */ + public void setDriverClass(String intface, String driverClass) { + + List drvList = mapInt2Drv.get(intface); + if(drvList == null) + drvList = new ArrayList(); + drvList.add(driverClass); + mapInt2Drv.put(intface, drvList); + } + + + /** + * setControllerClass() sets the name of the controller class. + */ + public void setControllerClass(String _controllerClass) { + + controllerClass = _controllerClass; } @@ -136,7 +177,18 @@ public class IoTCompiler { mapIntfacePTH.put(origInt, ptHandler); mapIntDeclHand.put(origInt, decHandler); // Set object Id counter to 0 for each interface - mapIntfaceObjId.put(origInt, new Integer(0)); + mapIntfaceObjId.put(origInt, countObjId++); + } + + + /** + * setObjectId() updates the object Id. This option is useful + * when the stub/skeleton are also used in other apps, so that + * we can set a single object Id for the stub/skeleton. + */ + private void setObjectId(String intface, String objectId) { + + mapIntfaceObjId.put(intface, Integer.parseInt(objectId)); } @@ -177,11 +229,20 @@ public class IoTCompiler { } // Add interface and methods information into map mapNewIntMethods.put(strInt, setMethods); + // Map new interface method name to the original interface + // TODO: perhaps need to check in the future if we have more than 1 stub interface for one original interface + mapInt2NewIntName.put(origInt, strInt); + if (mainClass == null) // Take the first class as the main class (whichever is placed first in the order of compilation files) + mainClass = origInt; } // Map the map of interface-methods to the original interface mapInt2NewInts.put(origInt, mapNewIntMethods); } + +/*================ + * Java generation + *================/ /** * HELPER: writeMethodJavaLocalInterface() writes the method of the local interface @@ -242,6 +303,7 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, INTERFACES_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Get the right EnumDecl DeclarationHandler decHandler = mapIntDeclHand.get(intface); @@ -250,8 +312,9 @@ public class IoTCompiler { // Iterate over enum declarations for (String enType : enumTypes) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + enType + ".java"); + FileWriter fw = new FileWriter(path + "/" + enType + ".java"); pw = new PrintWriter(new BufferedWriter(fw)); + println("package " + INTERFACE_PACKAGE + ";\n"); println("public enum " + enType + " {"); List enumMembers = enumDecl.getMembers(enType); for (int i = 0; i < enumMembers.size(); i++) { @@ -279,6 +342,7 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, INTERFACES_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Get the right StructDecl DeclarationHandler decHandler = mapIntDeclHand.get(intface); @@ -287,8 +351,9 @@ public class IoTCompiler { // Iterate over enum declarations for (String stType : structTypes) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + stType + ".java"); + FileWriter fw = new FileWriter(path + "/" + stType + ".java"); pw = new PrintWriter(new BufferedWriter(fw)); + println("package " + INTERFACE_PACKAGE + ";\n"); println("public class " + stType + " {"); List structMemberTypes = structDecl.getMemberTypes(stType); List structMembers = structDecl.getMembers(stType); @@ -318,16 +383,20 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, INTERFACES_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + intface + ".java"); + FileWriter fw = new FileWriter(path + "/" + intface + ".java"); pw = new PrintWriter(new BufferedWriter(fw)); // Pass in set of methods and get import classes DeclarationHandler decHandler = mapIntDeclHand.get(intface); InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); List methods = intDecl.getMethods(); Set importClasses = getImportClasses(methods, intDecl); - printImportStatements(importClasses); + List stdImportClasses = getStandardJavaIntfaceImportClasses(); + List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); + println("package " + INTERFACE_PACKAGE + ";\n"); + printImportStatements(allImportClasses); // Write interface header println(""); println("public interface " + intface + " {"); @@ -340,6 +409,17 @@ public class IoTCompiler { } + /** + * HELPER: updateIntfaceObjIdMap() updates the mapping between new interface and object Id + */ + private void updateIntfaceObjIdMap(String intface, String newIntface) { + + // We are assuming that we only generate one stub per one skeleton at this point @Feb 2017 + Integer objId = mapIntfaceObjId.get(intface); + mapNewIntfaceObjId.put(newIntface, objId); + } + + /** * generateJavaInterfaces() generate stub interfaces based on the methods list in Java */ @@ -347,6 +427,7 @@ public class IoTCompiler { // Create a new directory String path = createDirectories(dir, subdir); + path = createDirectories(dir + "/" + subdir, INTERFACES_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { Map> mapNewIntMethods = mapInt2NewInts.get(intface); @@ -359,13 +440,18 @@ public class IoTCompiler { DeclarationHandler decHandler = mapIntDeclHand.get(intface); InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); // Pass in set of methods and get import classes - Set importClasses = getImportClasses(intMeth.getValue(), intDecl); - printImportStatements(importClasses); + Set methods = intMeth.getValue(); + Set importClasses = getImportClasses(methods, intDecl); + List stdImportClasses = getStandardJavaIntfaceImportClasses(); + List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); + println("package " + INTERFACE_PACKAGE + ";\n"); + printImportStatements(allImportClasses); // Write interface header println(""); println("public interface " + newIntface + " {\n"); + updateIntfaceObjIdMap(intface, newIntface); // Write methods - writeMethodJavaInterface(intMeth.getValue(), intDecl); + writeMethodJavaInterface(methods, intDecl); println("}"); pw.close(); System.out.println("IoTCompiler: Generated interface " + newIntface + ".java..."); @@ -382,9 +468,7 @@ public class IoTCompiler { Map> mapNewIntMethods = mapInt2NewInts.get(intface); for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("private final static int object" + newObjectId + "Id = " + - newObjectId + ";\t//" + newIntface); + int newObjectId = getNewIntfaceObjectId(newIntface); Set methodIds = intMeth.getValue(); print("private static Integer[] object" + newObjectId + "Permission = { "); int i = 0; @@ -398,7 +482,7 @@ public class IoTCompiler { i++; } println(" };"); - println("private List set" + newObjectId + "Allowed;"); + println("private static List set" + newObjectId + "Allowed;"); } } @@ -406,28 +490,21 @@ public class IoTCompiler { /** * HELPER: writePropertiesJavaStub() writes the properties of the stub class */ - private void writePropertiesJavaStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { + private void writePropertiesJavaStub(String intface, Set methods, InterfaceDecl intDecl) { - println("private IoTRMICall rmiCall;"); - println("private String address;"); - println("private int[] ports;\n"); // Get the object Id Integer objId = mapIntfaceObjId.get(intface); - println("private final static int objectId = " + objId + ";"); - mapNewIntfaceObjId.put(newIntface, objId); - mapIntfaceObjId.put(intface, objId++); - if (callbackExist) { - // We assume that each class only has one callback interface for now - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("// Callback properties"); - println("private IoTRMIObject rmiObj;"); - println("List<" + callbackType + "> listCallbackObj;"); - println("private static int objIdCnt = 0;"); - // Generate permission stuff for callback stubs - DeclarationHandler decHandler = mapIntDeclHand.get(callbackType); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(callbackType); - writePropertiesJavaPermission(callbackType, intDecl); + println("private int objectId = " + objId + ";"); + println("private IoTRMIComm rmiComm;"); + // Write the list of AtomicBoolean variables + println("// Synchronization variables"); + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("private AtomicBoolean retValueReceived" + methodNumId + " = new AtomicBoolean(false);"); + } } println("\n"); } @@ -441,8 +518,8 @@ public class IoTCompiler { Map> mapNewIntMethods = mapInt2NewInts.get(intface); for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("set" + newObjectId + "Allowed = Arrays.asList(object" + newObjectId +"Permission);"); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("set" + newObjectId + "Allowed = new ArrayList(Arrays.asList(object" + newObjectId +"Permission));"); } } @@ -450,78 +527,58 @@ public class IoTCompiler { /** * HELPER: writeConstructorJavaStub() writes the constructor of the stub class */ - private void writeConstructorJavaStub(String intface, String newStubClass, boolean callbackExist, Set callbackClasses) { + private void writeConstructorJavaStub(String intface, String newStubClass, Set methods, InterfaceDecl intDecl) { - println("public " + newStubClass + "(int _port, String _address, int _rev, int[] _ports) throws Exception {"); - println("address = _address;"); - println("ports = _ports;"); - println("rmiCall = new IoTRMICall(_port, _address, _rev);"); - if (callbackExist) { - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - writeConstructorJavaPermission(intface); - println("listCallbackObj = new ArrayList<" + callbackType + ">();"); - println("___initCallBack();"); + println("public " + newStubClass + "(int _localPortSend, int _localPortRecv, int _portSend, int _portRecv, String _skeletonAddress, int _rev) throws Exception {"); + println("if (_localPortSend != 0 && _localPortRecv != 0) {"); + println("rmiComm = new IoTRMICommClient(_localPortSend, _localPortRecv, _portSend, _portRecv, _skeletonAddress, _rev);"); + println("} else"); + println("{"); + println("rmiComm = new IoTRMICommClient(_portSend, _portRecv, _skeletonAddress, _rev);"); + println("}"); + // Register the AtomicBoolean variables + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("rmiComm.registerStub(objectId, " + methodNumId + ", retValueReceived" + methodNumId + ");"); + } } + println("IoTRMIUtil.mapStub.put(objectId, this);"); println("}\n"); } /** - * HELPER: writeJavaMethodCallbackPermission() writes permission checks in stub for callbacks + * HELPER: writeCallbackConstructorJavaStub() writes the callback constructor of the stub class */ - private void writeJavaMethodCallbackPermission(String intface) { + private void writeCallbackConstructorJavaStub(String intface, String newStubClass, Set methods, InterfaceDecl intDecl) { - println("int methodId = IoTRMIObject.getMethodId(method);"); - // Get all the different stubs - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("if (!set" + newObjectId + "Allowed.contains(methodId)) {"); - println("throw new Error(\"Callback object for " + intface + " is not allowed to access method: \" + methodId);"); - println("}"); + println("public " + newStubClass + "(IoTRMIComm _rmiComm, int _objectId) throws Exception {"); + println("rmiComm = _rmiComm;"); + println("objectId = _objectId;"); + // Register the AtomicBoolean variables + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("rmiComm.registerStub(objectId, " + methodNumId + ", retValueReceived" + methodNumId + ");"); + } } + println("}\n"); } /** - * HELPER: writeInitCallbackJavaStub() writes callback initialization in stub + * HELPER: getPortCount() gets port count for different stubs and skeletons */ - private void writeInitCallbackJavaStub(String intface, InterfaceDecl intDecl) { + private int getPortCount(String intface) { - println("public void ___initCallBack() {"); - // Generate main thread for callbacks - println("Thread thread = new Thread() {"); - println("public void run() {"); - println("try {"); - println("rmiObj = new IoTRMIObject(ports[0]);"); - println("while (true) {"); - println("byte[] method = rmiObj.getMethodBytes();"); - writeJavaMethodCallbackPermission(intface); - println("int objId = IoTRMIObject.getObjectId(method);"); - println(intface + "_CallbackSkeleton skel = (" + intface + "_CallbackSkeleton) listCallbackObj.get(objId);"); - println("if (skel != null) {"); - println("skel.invokeMethod(rmiObj);"); - println("} else {"); - println("throw new Error(\"" + intface + ": Object with Id \" + objId + \" not found!\");"); - println("}"); - println("}"); - println("} catch (Exception ex) {"); - println("ex.printStackTrace();"); - println("throw new Error(\"Error instantiating class " + intface + "_CallbackSkeleton!\");"); - println("}"); - println("}"); - println("};"); - println("thread.start();\n"); - // Generate info sending part - String method = "___initCallBack()"; - println("int methodId = " + intDecl.getHelperMethodNumId(method) + ";"); - println("Class retType = void.class;"); - println("Class[] paramCls = new Class[] { int.class, String.class, int.class };"); - println("Object[] paramObj = new Object[] { ports[0], address, 0 };"); - println("rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); - println("}\n"); + if (!mapPortCount.containsKey(intface)) + mapPortCount.put(intface, portCount++); + return mapPortCount.get(intface); } @@ -534,20 +591,20 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isEnumClass(simpleType)) { // Check if this is enum type if (isArray(param)) { // An array - println("int len" + i + " = " + param + ".length;"); - println("int paramEnum" + i + "[] = new int[len];"); + println("int len" + i + " = " + getSimpleIdentifier(param) + ".length;"); + println("int paramEnum" + i + "[] = new int[len" + i + "];"); println("for (int i = 0; i < len" + i + "; i++) {"); - println("paramEnum" + i + "[i] = " + param + "[i].ordinal();"); + println("paramEnum" + i + "[i] = " + getSimpleIdentifier(param) + "[i].ordinal();"); println("}"); } else if (isList(paramType)) { // A list - println("int len" + i + " = " + param + ".size();"); - println("int paramEnum" + i + "[] = new int[len];"); + println("int len" + i + " = " + getSimpleIdentifier(param) + ".size();"); + println("int paramEnum" + i + "[] = new int[len" + i + "];"); println("for (int i = 0; i < len" + i + "; i++) {"); - println("paramEnum" + i + "[i] = " + param + ".get(i).ordinal();"); + println("paramEnum" + i + "[i] = " + getSimpleIdentifier(param) + ".get(i).ordinal();"); println("}"); } else { // Just one element println("int paramEnum" + i + "[] = new int[1];"); @@ -561,13 +618,15 @@ public class IoTCompiler { /** * HELPER: checkAndWriteEnumRetTypeJavaStub() writes the enum return type (convert from enum to int) */ - private void checkAndWriteEnumRetTypeJavaStub(String retType) { + private void checkAndWriteEnumRetTypeJavaStub(String retType, String method, InterfaceDecl intDecl) { + // Write the wait-for-return-value part + writeWaitForReturnValueJava(method, intDecl, "Object retObj = rmiComm.getReturnValue(retType, null);"); // Strips off array "[]" for return type - String pureType = getSimpleArrayType(getSimpleType(retType)); + String pureType = getSimpleArrayType(getGenericType(retType)); // Take the inner type of generic if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(retType)[0]; + pureType = getGenericType(retType); if (isEnumClass(pureType)) { // Check if this is enum type // Enum decoder @@ -603,13 +662,12 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { // Check if this is enum type int methodNumId = intDecl.getMethodNumId(method); String helperMethod = methodNumId + "struct" + i; println("int methodIdStruct" + i + " = " + intDecl.getHelperMethodNumId(helperMethod) + ";"); - println("Class retTypeStruct" + i + " = void.class;"); println("Class[] paramClsStruct" + i + " = new Class[] { int.class };"); if (isArray(param)) { // An array println("Object[] paramObjStruct" + i + " = new Object[] { " + getSimpleArrayType(param) + ".length };"); @@ -618,9 +676,8 @@ public class IoTCompiler { } else { // Just one element println("Object[] paramObjStruct" + i + " = new Object[] { new Integer(1) };"); } - println("rmiCall.remoteCall(objectId, methodIdStruct" + i + - ", retTypeStruct" + i + ", null, paramClsStruct" + i + - ", paramObjStruct" + i + ");\n"); + println("rmiComm.remoteCall(objectId, methodIdStruct" + i + + ", paramClsStruct" + i + ", paramObjStruct" + i + ");\n"); } } } @@ -635,7 +692,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) return true; } @@ -656,10 +713,10 @@ public class IoTCompiler { if (isStructClass(simpleType)) { int members = getNumOfMembers(simpleType); if (isArray(param)) { // An array - String structLen = param + ".length"; + String structLen = getSimpleArrayType(param) + ".length"; print(members + "*" + structLen); } else if (isList(paramType)) { // A list - String structLen = param + ".size()"; + String structLen = getSimpleArrayType(param) + ".size()"; print(members + "*" + structLen); } else print(Integer.toString(members)); @@ -682,15 +739,21 @@ public class IoTCompiler { List memTypes = structDecl.getMemberTypes(simpleType); List members = structDecl.getMembers(simpleType); if (isArray(param)) { // An array - println("for(int i = 0; i < " + param + ".length; i++) {"); + println("for(int i = 0; i < " + getSimpleIdentifier(param) + ".length; i++) {"); + for (int i = 0; i < members.size(); i++) { + String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); + println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); + print("paramObj[pos++] = " + getSimpleIdentifier(param) + "[i]."); + print(getSimpleIdentifier(members.get(i))); + println(";"); + } + println("}"); } else if (isList(paramType)) { // A list - println("for(int i = 0; i < " + param + ".size(); i++) {"); - } - if (isArrayOrList(param, paramType)) { // An array or list + println("for(int i = 0; i < " + getSimpleIdentifier(param) + ".size(); i++) {"); for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); - print("paramObj[pos++] = " + param + "[i]."); + print("paramObj[pos++] = " + getSimpleIdentifier(param) + ".get(i)."); print(getSimpleIdentifier(members.get(i))); println(";"); } @@ -699,7 +762,7 @@ public class IoTCompiler { for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); - print("paramObj[pos++] = " + param + "."); + print("paramObj[pos++] = " + getSimpleIdentifier(param) + "."); print(getSimpleIdentifier(members.get(i))); println(";"); } @@ -710,7 +773,7 @@ public class IoTCompiler { /** * HELPER: writeStructParamClassJavaStub() writes parameters if struct is present */ - private void writeStructParamClassJavaStub(List methParams, List methPrmTypes) { + private void writeStructParamClassJavaStub(List methParams, List methPrmTypes, Set callbackType) { print("int paramLen = "); writeLengthStructParamClassJavaStub(methParams, methPrmTypes); @@ -725,6 +788,9 @@ public class IoTCompiler { String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { writeStructMembersJavaStub(simpleType, paramType, param); + } else if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object + println("paramCls[pos] = int[].class;"); + println("paramObj[pos++] = objIdSent" + i + ";"); } else { String prmType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); @@ -753,7 +819,7 @@ public class IoTCompiler { for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); print("structRet[i]." + getSimpleIdentifier(members.get(i))); - println(" = (" + getSimpleType(getEnumType(prmType)) + ") retObj[retObjPos++];"); + println(" = (" + getSimpleType(getEnumType(prmType)) + ") retActualObj[retObjPos++];"); } println("}"); } else if (isList(retType)) { // A list @@ -761,7 +827,7 @@ public class IoTCompiler { for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); print("structRetMem." + getSimpleIdentifier(members.get(i))); - println(" = (" + getSimpleType(getEnumType(prmType)) + ") retObj[retObjPos++];"); + println(" = (" + getSimpleType(getEnumType(prmType)) + ") retActualObj[retObjPos++];"); } println("structRet.add(structRetMem);"); println("}"); @@ -769,7 +835,7 @@ public class IoTCompiler { for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); print("structRet." + getSimpleIdentifier(members.get(i))); - println(" = (" + getSimpleType(getEnumType(prmType)) + ") retObj[retObjPos++];"); + println(" = (" + getSimpleType(getEnumType(prmType)) + ") retActualObj[retObjPos++];"); } } println("return structRet;"); @@ -779,12 +845,12 @@ public class IoTCompiler { /** * HELPER: writeStructReturnJavaStub() writes parameters if struct is present for return statement */ - private void writeStructReturnJavaStub(String simpleType, String retType) { + private void writeStructReturnJavaStub(String simpleType, String retType, String method, InterfaceDecl intDecl) { - // Handle the returned struct!!! - println("Object retLenObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); + // Handle the returned struct size + writeWaitForReturnValueJava(method, intDecl, "Object retObj = rmiComm.getReturnValue(retType, null);"); // Minimum retLen is 1 if this is a single struct object - println("int retLen = (int) retLenObj;"); + println("int retLen = (int) retObj;"); int numMem = getNumOfMembers(simpleType); println("Class[] retCls = new Class[" + numMem + "*retLen];"); println("Class[] retClsVal = new Class[" + numMem + "*retLen];"); @@ -808,7 +874,8 @@ public class IoTCompiler { println("retClsVal[retPos++] = null;"); } } - println("Object[] retObj = rmiCall.getStructObjects(retCls, retClsVal);"); + // Handle the actual returned struct + writeWaitForReturnValueJava(method, intDecl, "Object[] retActualObj = rmiComm.getStructObjects(retCls, retClsVal);"); if (isArray(retType)) { // An array println(simpleType + "[] structRet = new " + simpleType + "[retLen];"); println("for(int i = 0; i < retLen; i++) {"); @@ -823,11 +890,25 @@ public class IoTCompiler { } + /** + * HELPER: writeWaitForReturnValueJava() writes the synchronization part for return values + */ + private void writeWaitForReturnValueJava(String method, InterfaceDecl intDecl, String getReturnValue) { + + println("// Waiting for return value"); + int methodNumId = intDecl.getMethodNumId(method); + println("while (!retValueReceived" + methodNumId + ".get());"); + println(getReturnValue); + println("retValueReceived" + methodNumId + ".set(false);"); + println("rmiComm.setGetReturnBytes();\n"); + } + + /** * HELPER: writeStdMethodBodyJavaStub() writes the standard method body in the stub class */ private void writeStdMethodBodyJavaStub(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method) { + List methPrmTypes, String method, Set callbackType) { checkAndWriteStructSetupJavaStub(methParams, methPrmTypes, intDecl, method); println("int methodId = " + intDecl.getMethodNumId(method) + ";"); @@ -836,12 +917,17 @@ public class IoTCompiler { checkAndWriteEnumTypeJavaStub(methParams, methPrmTypes); // Generate array of parameter types if (isStructPresent(methParams, methPrmTypes)) { - writeStructParamClassJavaStub(methParams, methPrmTypes); + writeStructParamClassJavaStub(methParams, methPrmTypes, callbackType); } else { print("Class[] paramCls = new Class[] { "); for (int i = 0; i < methParams.size(); i++) { - String paramType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - print(getSimpleType(getEnumType(paramType)) + ".class"); + String prmType = methPrmTypes.get(i); + if (checkCallbackType(prmType, callbackType)) { // Check if this has callback object + print("int[].class"); + } else { // Generate normal classes if it's not a callback object + String paramType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); + print(getSimpleType(getEnumType(paramType)) + ".class"); + } // Check if this is the last element (don't print a comma) if (i != methParams.size() - 1) { print(", "); @@ -851,7 +937,11 @@ public class IoTCompiler { // Generate array of parameter objects print("Object[] paramObj = new Object[] { "); for (int i = 0; i < methParams.size(); i++) { - print(getEnumParam(methPrmTypes.get(i), getSimpleIdentifier(methParams.get(i)), i)); + String paramType = methPrmTypes.get(i); + if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object + print("objIdSent" + i); + } else + print(getEnumParam(methPrmTypes.get(i), getSimpleIdentifier(methParams.get(i)), i)); // Check if this is the last element (don't print a comma) if (i != methParams.size() - 1) { print(", "); @@ -859,26 +949,26 @@ public class IoTCompiler { } println(" };"); } + // Send method call first and wait for return value separately + println("rmiComm.remoteCall(objectId, methodId, paramCls, paramObj);"); // Check if this is "void" - if (retType.equals("void")) { - println("rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); - } else { // We do have a return value + if (!retType.equals("void")) { // We do have a return value // Generate array of parameter types if (isStructClass(getGenericType(getSimpleArrayType(retType)))) { - writeStructReturnJavaStub(getGenericType(getSimpleArrayType(retType)), retType); + writeStructReturnJavaStub(getGenericType(getSimpleArrayType(retType)), retType, method, intDecl); } else { - // Check if the return value NONPRIMITIVES - if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) { - String[] retGenValType = getTypeOfGeneric(retType); - println("Class retGenValType = " + retGenValType[0] + ".class;"); - println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, retGenValType, paramCls, paramObj);"); - println("return (" + retType + ")retObj;"); - } else if (getParamCategory(retType) == ParamCategory.ENUM) { // This is an enum type - println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); - checkAndWriteEnumRetTypeJavaStub(retType); + if (getParamCategory(getGenericType(getSimpleArrayType(retType))) == ParamCategory.ENUM) { + //println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); + checkAndWriteEnumRetTypeJavaStub(retType, method, intDecl); + } else if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) { + // Check if the return value NONPRIMITIVES + String retGenValType = getGenericType(retType); + println("Class retGenValType = " + retGenValType + ".class;"); + writeWaitForReturnValueJava(method, intDecl, "Object retObj = rmiComm.getReturnValue(retType, retGenValType);"); + println("return (" + retType + ")retObj;"); } else { - println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); + writeWaitForReturnValueJava(method, intDecl, "Object retObj = rmiComm.getReturnValue(retType, null);"); println("return (" + retType + ")retObj;"); } } @@ -892,19 +982,80 @@ public class IoTCompiler { private String returnGenericCallbackType(String paramType) { if (getParamCategory(paramType) == ParamCategory.NONPRIMITIVES) - return getTypeOfGeneric(paramType)[0]; + return getGenericType(paramType); else return paramType; } + /** + * HELPER: checkCallbackType() checks the callback type + */ + private boolean checkCallbackType(String paramType, Set callbackType) { + + String prmType = returnGenericCallbackType(paramType); + if (callbackType == null) // If there is no callbackType it means not a callback method + return false; + else { + for (String type : callbackType) { + if (type.equals(prmType)) + return true; // Check callbackType one by one + } + return false; + } + } + + /** * HELPER: checkCallbackType() checks the callback type */ private boolean checkCallbackType(String paramType, String callbackType) { String prmType = returnGenericCallbackType(paramType); - return callbackType.equals(prmType); + if (callbackType == null) // If there is no callbackType it means not a callback method + return false; + else + return callbackType.equals(prmType); + } + + + /** + * HELPER: writeCallbackInstantiationMethodBodyJavaStub() writes the callback object instantiation in the method of the stub class + */ + private void writeCallbackInstantiationMethodBodyJavaStub(String paramIdent, String callbackType, int counter, boolean isMultipleCallbacks) { + + println("if (!IoTRMIUtil.mapSkel.containsKey(" + paramIdent + ")) {"); + println("int newObjIdSent = rmiComm.getObjectIdCounter();"); + if (isMultipleCallbacks) + println("objIdSent" + counter + "[cnt" + counter + "++] = newObjIdSent;"); + else + println("objIdSent" + counter + "[0] = newObjIdSent;"); + println("rmiComm.decrementObjectIdCounter();"); + println(callbackType + "_Skeleton skel" + counter + " = new " + callbackType + "_Skeleton(" + paramIdent + ", rmiComm, newObjIdSent);"); + println("IoTRMIUtil.mapSkel.put(" + paramIdent + ", skel" + counter + ");"); + println("IoTRMIUtil.mapSkelId.put(" + paramIdent + ", newObjIdSent);"); + println("Thread thread = new Thread() {"); + println("public void run() {"); + println("try {"); + println("skel" + counter + ".___waitRequestInvokeMethod();"); + println("} catch (Exception ex) {"); + println("ex.printStackTrace();"); + println("throw new Error(\"Exception when trying to run ___waitRequestInvokeMethod() for " + + callbackType + "_Skeleton!\");"); + println("}"); + println("}"); + println("};"); + println("thread.start();"); + println("while(!skel" + counter + ".didAlreadyInitWaitInvoke());"); + println("}"); + println("else"); + println("{"); + println("int newObjIdSent = IoTRMIUtil.mapSkelId.get(" + paramIdent + ");"); + if (isMultipleCallbacks) + println("objIdSent" + counter + "[cnt" + counter + "++] = newObjIdSent;"); + else + println("objIdSent" + counter + "[0] = newObjIdSent;"); + println("}"); } @@ -912,8 +1063,22 @@ public class IoTCompiler { * HELPER: writeCallbackMethodBodyJavaStub() writes the callback method of the stub class */ private void writeCallbackMethodBodyJavaStub(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method, String callbackType) { + List methPrmTypes, String method, Set callbackType) { + // Determine callback object counter type (List vs. single variable) + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object + print("int[] objIdSent" + i + " = "); + String param = methParams.get(i); + if (isArray(methParams.get(i))) + println("new int[" + getSimpleIdentifier(methParams.get(i)) + ".length];"); + else if (isList(methPrmTypes.get(i))) + println("new int[" + getSimpleIdentifier(methParams.get(i)) + ".size()];"); + else + println("new int[1];"); + } + } println("try {"); // Check if this is single object, array, or list of objects for (int i = 0; i < methParams.size(); i++) { @@ -921,77 +1086,27 @@ public class IoTCompiler { if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object String param = methParams.get(i); if (isArrayOrList(paramType, param)) { // Generate loop - println("for (" + paramType + " cb : " + getSimpleIdentifier(param) + ") {"); - println(callbackType + "_CallbackSkeleton skel = new " + callbackType + "_CallbackSkeleton(cb, objIdCnt++);"); + println("int cnt" + i + " = 0;"); + println("for (" + getGenericType(paramType) + " cb : " + getSimpleIdentifier(param) + ") {"); + writeCallbackInstantiationMethodBodyJavaStub("cb", returnGenericCallbackType(paramType), i, true); } else - println(callbackType + "_CallbackSkeleton skel = new " + callbackType + "_CallbackSkeleton(" + - getSimpleIdentifier(param) + ", objIdCnt++);"); - println("listCallbackObj.add(skel);"); + writeCallbackInstantiationMethodBodyJavaStub(getSimpleIdentifier(param), returnGenericCallbackType(paramType), i, false); if (isArrayOrList(paramType, param)) println("}"); } } - println("} catch (Exception ex) {"); + print("}"); + println(" catch (Exception ex) {"); println("ex.printStackTrace();"); println("throw new Error(\"Exception when generating skeleton objects!\");"); println("}\n"); - println("int methodId = " + intDecl.getMethodNumId(method) + ";"); - String retType = intDecl.getMethodType(method); - println("Class retType = " + getSimpleType(getEnumType(retType)) + ".class;"); - // Generate array of parameter types - print("Class[] paramCls = new Class[] { "); - for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); - if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - print("int.class"); - } else { // Generate normal classes if it's not a callback object - String prmType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - print(getSimpleType(prmType) + ".class"); - } - if (i != methParams.size() - 1) // Check if this is the last element - print(", "); - } - println(" };"); - // Generate array of parameter objects - print("Object[] paramObj = new Object[] { "); - for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); - if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - //if (isArray(methPrmTypes.get(i), methParams.get(i))) - if (isArray(methParams.get(i))) - print(getSimpleIdentifier(methParams.get(i)) + ".length"); - else if (isList(methPrmTypes.get(i))) - print(getSimpleIdentifier(methParams.get(i)) + ".size()"); - else - print("new Integer(1)"); - } else - print(getSimpleIdentifier(methParams.get(i))); - if (i != methParams.size() - 1) - print(", "); - } - println(" };"); - // Check if this is "void" - if (retType.equals("void")) { - println("rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); - } else { // We do have a return value - // Check if the return value NONPRIMITIVES - if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) { - String[] retGenValType = getTypeOfGeneric(retType); - println("Class retGenValType = " + retGenValType[0] + ".class;"); - println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, retGenValType, paramCls, paramObj);"); - println("return (" + retType + ")retObj;"); - } else { - println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); - println("return (" + retType + ")retObj;"); - } - } } /** * HELPER: writeMethodJavaStub() writes the methods of the stub class */ - private void writeMethodJavaStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { + private void writeMethodJavaStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses, String newStubClass) { for (String method : methods) { @@ -1000,14 +1115,16 @@ public class IoTCompiler { print("public " + intDecl.getMethodType(method) + " " + intDecl.getMethodId(method) + "("); boolean isCallbackMethod = false; - String callbackType = null; + //String callbackType = null; + Set callbackType = new HashSet(); for (int i = 0; i < methParams.size(); i++) { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); // Check if this has callback object if (callbackClasses.contains(paramType)) { isCallbackMethod = true; - callbackType = paramType; + //callbackType = paramType; + callbackType.add(paramType); // Even if there're 2 callback arguments, we expect them to be of the same interface } print(methPrmTypes.get(i) + " " + methParams.get(i)); @@ -1020,16 +1137,21 @@ public class IoTCompiler { // Now, write the body of stub! if (isCallbackMethod) writeCallbackMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType); - else - writeStdMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method); + writeStdMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType); println("}\n"); - // Write the init callback helper method - if (isCallbackMethod) - writeInitCallbackJavaStub(callbackType, intDecl); } } + /** + * HELPER: getStubInterface() gets stub interface name based on original interface + */ + public String getStubInterface(String intface) { + + return mapInt2NewIntName.get(intface); + } + + /** * generateJavaStubClasses() generate stubs based on the methods list in Java */ @@ -1039,169 +1161,161 @@ public class IoTCompiler { String path = createDirectories(dir, subdir); for (String intface : mapIntfacePTH.keySet()) { - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - - // Open a new file to write into - String newIntface = intMeth.getKey(); - String newStubClass = newIntface + "_Stub"; - FileWriter fw = new FileWriter(path + "/" + newStubClass + ".java"); - pw = new PrintWriter(new BufferedWriter(fw)); - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - // Pass in set of methods and get import classes - Set methods = intMeth.getValue(); - Set importClasses = getImportClasses(methods, intDecl); - List stdImportClasses = getStandardJavaImportClasses(); - List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); - printImportStatements(allImportClasses); println(""); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write class header - println("public class " + newStubClass + " implements " + newIntface + " {\n"); - // Write properties - writePropertiesJavaStub(intface, newIntface, callbackExist, callbackClasses); - // Write constructor - writeConstructorJavaStub(intface, newStubClass, callbackExist, callbackClasses); - // Write methods - writeMethodJavaStub(intMeth.getValue(), intDecl, callbackClasses); - println("}"); - pw.close(); - System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".java..."); + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + String driverClass = drvList.get(i); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + + // Open a new file to write into + String newIntface = intMeth.getKey(); + String newStubClass = newIntface + "_Stub"; + String packageClass = null; + // Check if this interface is a callback class + if(isCallbackClass(intface)) { + packageClass = CODE_PREFIX + "." + driverClass; + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + } else { + packageClass = controllerClass; + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + } + FileWriter fw = new FileWriter(path + "/" + newStubClass + ".java"); + pw = new PrintWriter(new BufferedWriter(fw)); + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + // Pass in set of methods and get import classes + Set methods = intMeth.getValue(); + Set importClasses = getImportClasses(methods, intDecl); + List stdImportClasses = getStandardJavaImportClasses(); + List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); + // Find out if there are callback objects + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); + println("package " + packageClass + ";\n"); + printImportStatements(allImportClasses); + println("\nimport " + INTERFACE_PACKAGE + ".*;\n"); + // Write class header + println("public class " + newStubClass + " implements " + newIntface + " {\n"); + // Write properties + writePropertiesJavaStub(intface, intMeth.getValue(), intDecl); + // Write constructor + writeConstructorJavaStub(intface, newStubClass, intMeth.getValue(), intDecl); + // Write callback constructor (used if this stub is treated as a callback stub) + writeCallbackConstructorJavaStub(intface, newStubClass, intMeth.getValue(), intDecl); + // Write methods + writeMethodJavaStub(intMeth.getValue(), intDecl, callbackClasses, newStubClass); + println("}"); + pw.close(); + System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".java..."); + } } } } /** - * HELPER: writePropertiesJavaCallbackStub() writes the properties of the callback stub class + * HELPER: writePropertiesJavaSkeleton() writes the properties of the skeleton class */ - private void writePropertiesJavaCallbackStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { + private void writePropertiesJavaSkeleton(String intface, InterfaceDecl intDecl) { - println("private IoTRMICall rmiCall;"); - println("private String address;"); - println("private int[] ports;\n"); - // Get the object Id - println("private static int objectId = 0;"); - if (callbackExist) { - // We assume that each class only has one callback interface for now - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("// Callback properties"); - println("private IoTRMIObject rmiObj;"); - println("List<" + callbackType + "> listCallbackObj;"); - println("private static int objIdCnt = 0;"); - // Generate permission stuff for callback stubs - DeclarationHandler decHandler = mapIntDeclHand.get(callbackType); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(callbackType); - writePropertiesJavaPermission(callbackType, intDecl); - } + println("private " + intface + " mainObj;"); + Integer objId = mapIntfaceObjId.get(intface); + println("private int objectId = " + objId + ";"); + println("// Communications and synchronizations"); + println("private IoTRMIComm rmiComm;"); + println("private AtomicBoolean didAlreadyInitWaitInvoke;"); + println("private AtomicBoolean methodReceived;"); + println("private byte[] methodBytes = null;"); + println("// Permissions"); + writePropertiesJavaPermission(intface, intDecl); println("\n"); } /** - * HELPER: writeConstructorJavaCallbackStub() writes the constructor of the callback stub class + * HELPER: writeStructPermissionJavaSkeleton() writes permission for struct helper */ - private void writeConstructorJavaCallbackStub(String intface, String newStubClass, boolean callbackExist, Set callbackClasses) { + private void writeStructPermissionJavaSkeleton(Collection methods, InterfaceDecl intDecl, String intface) { - // TODO: If we want callback in callback, then we need to add address and port initializations - println("public " + newStubClass + "(IoTRMICall _rmiCall, int _objectId) throws Exception {"); - println("objectId = _objectId;"); - println("rmiCall = _rmiCall;"); - if (callbackExist) { - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - writeConstructorJavaPermission(intface); - println("listCallbackObj = new ArrayList<" + callbackType + ">();"); - println("___initCallBack();"); - println("// TODO: Add address and port initialization here if we want callback in callback!"); + // Use this set to handle two same methodIds + for (String method : methods) { + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + int methodNumId = intDecl.getMethodNumId(method); + String helperMethod = methodNumId + "struct" + i; + int methodHelperNumId = intDecl.getHelperMethodNumId(helperMethod); + // Iterate over interfaces to give permissions to + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + String newIntface = intMeth.getKey(); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("set" + newObjectId + "Allowed.add(" + methodHelperNumId + ");"); + } + } + } } + } + + + /** + * HELPER: writeConstructorJavaSkeleton() writes the constructor of the skeleton class + */ + private void writeConstructorJavaSkeleton(String newSkelClass, String intface, InterfaceDecl intDecl, + Collection methods, boolean callbackExist) { + + println("public " + newSkelClass + "(" + intface + " _mainObj, int _portSend, int _portRecv) throws Exception {"); + println("mainObj = _mainObj;"); + println("rmiComm = new IoTRMICommServer(_portSend, _portRecv);"); + // Generate permission control initialization + writeConstructorJavaPermission(intface); + writeStructPermissionJavaSkeleton(methods, intDecl, intface); + println("IoTRMIUtil.mapSkel.put(_mainObj, this);"); + println("IoTRMIUtil.mapSkelId.put(_mainObj, objectId);"); + println("didAlreadyInitWaitInvoke = new AtomicBoolean(false);"); + println("methodReceived = new AtomicBoolean(false);"); + println("rmiComm.registerSkeleton(objectId, methodReceived);"); + println("Thread thread1 = new Thread() {"); + println("public void run() {"); + println("try {"); + println("___waitRequestInvokeMethod();"); + println("}"); + println("catch (Exception ex)"); + println("{"); + println("ex.printStackTrace();"); + println("}"); + println("}"); + println("};"); + println("thread1.start();"); println("}\n"); } /** - * generateJavaCallbackStubClasses() generate callback stubs based on the methods list in Java - *

- * Callback stubs gets the IoTRMICall objects from outside of the class as contructor input - * because all these stubs are populated by the class that takes in this object as a callback - * object. In such a class, we only use one socket, hence one IoTRMICall, for all callback objects. + * HELPER: writeCallbackConstructorJavaSkeleton() writes the constructor of the skeleton class */ - public void generateJavaCallbackStubClasses() throws IOException { + private void writeCallbackConstructorJavaSkeleton(String newSkelClass, String intface, InterfaceDecl intDecl, + Collection methods, boolean callbackExist) { - // Create a new directory - String path = createDirectories(dir, subdir); - for (String intface : mapIntfacePTH.keySet()) { - - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - - // Open a new file to write into - String newIntface = intMeth.getKey(); - String newStubClass = newIntface + "_CallbackStub"; - FileWriter fw = new FileWriter(path + "/" + newStubClass + ".java"); - pw = new PrintWriter(new BufferedWriter(fw)); - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - // Pass in set of methods and get import classes - Set methods = intMeth.getValue(); - Set importClasses = getImportClasses(methods, intDecl); - List stdImportClasses = getStandardJavaImportClasses(); - List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); - printImportStatements(allImportClasses); println(""); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write class header - println("public class " + newStubClass + " implements " + newIntface + " {\n"); - // Write properties - writePropertiesJavaCallbackStub(intface, newIntface, callbackExist, callbackClasses); - // Write constructor - writeConstructorJavaCallbackStub(intface, newStubClass, callbackExist, callbackClasses); - // Write methods - // TODO: perhaps need to generate callback for callback - writeMethodJavaStub(intMeth.getValue(), intDecl, callbackClasses); - println("}"); - pw.close(); - System.out.println("IoTCompiler: Generated callback stub class " + newStubClass + ".java..."); - } - } - } - - - /** - * HELPER: writePropertiesJavaSkeleton() writes the properties of the skeleton class - */ - private void writePropertiesJavaSkeleton(String intface, boolean callbackExist, InterfaceDecl intDecl) { - - println("private " + intface + " mainObj;"); - //println("private int ports;"); - println("private IoTRMIObject rmiObj;\n"); - // Callback - if (callbackExist) { - println("private static int objIdCnt = 0;"); - println("private IoTRMICall rmiCall;"); - } - writePropertiesJavaPermission(intface, intDecl); - println("\n"); - } - - - /** - * HELPER: writeConstructorJavaSkeleton() writes the constructor of the skeleton class - */ - private void writeConstructorJavaSkeleton(String newSkelClass, String intface) { - - println("public " + newSkelClass + "(" + intface + " _mainObj, int _port) throws Exception {"); - println("mainObj = _mainObj;"); - println("rmiObj = new IoTRMIObject(_port);"); - // Generate permission control initialization - writeConstructorJavaPermission(intface); - println("___waitRequestInvokeMethod();"); - println("}\n"); - } + println("public " + newSkelClass + "(" + intface + " _mainObj, IoTRMIComm _rmiComm, int _objectId) throws Exception {"); + println("mainObj = _mainObj;"); + println("rmiComm = _rmiComm;"); + println("objectId = _objectId;"); + // Generate permission control initialization + writeConstructorJavaPermission(intface); + writeStructPermissionJavaSkeleton(methods, intDecl, intface); + println("didAlreadyInitWaitInvoke = new AtomicBoolean(false);"); + println("methodReceived = new AtomicBoolean(false);"); + println("rmiComm.registerSkeleton(objectId, methodReceived);"); + println("}\n"); + } /** @@ -1225,28 +1339,10 @@ public class IoTCompiler { } - /** - * HELPER: writeInitCallbackJavaSkeleton() writes the init callback method for skeleton class - */ - private void writeInitCallbackJavaSkeleton(boolean callbackSkeleton) { - - // This is a callback skeleton generation - if (callbackSkeleton) - println("public void ___regCB(IoTRMIObject rmiObj) throws IOException {"); - else - println("public void ___regCB() throws IOException {"); - println("Object[] paramObj = rmiObj.getMethodParams(new Class[] { int.class, String.class, int.class },"); - println("\tnew Class[] { null, null, null });"); - println("rmiCall = new IoTRMICall((int) paramObj[0], (String) paramObj[1], (int) paramObj[2]);"); - println("}\n"); - } - - /** * HELPER: writeMethodJavaSkeleton() writes the method of the skeleton class */ - private void writeMethodJavaSkeleton(Collection methods, InterfaceDecl intDecl, Set callbackClasses, - boolean callbackSkeleton) { + private void writeMethodJavaSkeleton(Collection methods, InterfaceDecl intDecl) { for (String method : methods) { @@ -1254,16 +1350,10 @@ public class IoTCompiler { List methPrmTypes = intDecl.getMethodParamTypes(method); String methodId = intDecl.getMethodId(method); print("public " + intDecl.getMethodType(method) + " " + methodId + "("); - boolean isCallbackMethod = false; - String callbackType = null; for (int i = 0; i < methParams.size(); i++) { String origParamType = methPrmTypes.get(i); String paramType = checkAndGetParamClass(origParamType); - if (callbackClasses.contains(origParamType)) { // Check if this has callback object - isCallbackMethod = true; - callbackType = origParamType; - } print(paramType + " " + methParams.get(i)); // Check if this is the last element (don't print a comma) if (i != methParams.size() - 1) { @@ -1274,53 +1364,74 @@ public class IoTCompiler { // Now, write the body of skeleton! writeStdMethodBodyJavaSkeleton(methParams, methodId, intDecl.getMethodType(method)); println("}\n"); - if (isCallbackMethod) - writeInitCallbackJavaSkeleton(callbackSkeleton); } } + /** + * HELPER: writeCallbackInstantiationJavaStubGeneration() writes the instantiation of callback stubs + */ + private void writeCallbackInstantiationJavaStubGeneration(String exchParamType, int counter) { + + println(exchParamType + " newStub" + counter + " = null;"); + println("if(!IoTRMIUtil.mapStub.containsKey(objIdRecv" + counter + ")) {"); + println("newStub" + counter + " = new " + exchParamType + "_Stub(rmiComm, objIdRecv" + counter + ");"); + println("IoTRMIUtil.mapStub.put(objIdRecv" + counter + ", newStub" + counter + ");"); + println("rmiComm.setObjectIdCounter(objIdRecv" + counter + ");"); + println("rmiComm.decrementObjectIdCounter();"); + println("}"); + println("else {"); + println("newStub" + counter + " = (" + exchParamType + "_Stub) IoTRMIUtil.mapStub.get(objIdRecv" + counter + ");"); + println("}"); + } + + /** * HELPER: writeCallbackJavaStubGeneration() writes the callback stub generation part */ private Map writeCallbackJavaStubGeneration(List methParams, List methPrmTypes, - String callbackType) { + Set callbackType, boolean isStructMethod) { Map mapStubParam = new HashMap(); + String offsetPfx = ""; + if (isStructMethod) + offsetPfx = "offset"; // Iterate over callback objects 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("try {"); - String exchParamType = checkAndGetParamClass(paramType); + String exchParamType = checkAndGetParamClass(getGenericType(paramType)); // Print array if this is array or list if this is a list of callback objects - if (isArray(param)) { - println("int numStubs" + i + " = (int) paramObj[" + i + "];"); + println("int[] stubIdArray" + i + " = (int[]) paramObj[" + offsetPfx + i + "];"); + if (isArray(param)) { + println("int numStubs" + i + " = stubIdArray" + i + ".length;"); println(exchParamType + "[] stub" + i + " = new " + exchParamType + "[numStubs" + i + "];"); } else if (isList(paramType)) { - println("int numStubs" + i + " = (int) paramObj[" + i + "];"); + println("int numStubs" + i + " = stubIdArray" + i + ".length;"); println("List<" + exchParamType + "> stub" + i + " = new ArrayList<" + exchParamType + ">();"); } else { - println(exchParamType + " stub" + i + " = new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt);"); - println("objIdCnt++;"); + println("int objIdRecv" + i + " = stubIdArray" + i + "[0];"); + writeCallbackInstantiationJavaStubGeneration(exchParamType, i); } } // Generate a loop if needed if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - String exchParamType = checkAndGetParamClass(paramType); + String exchParamType = checkAndGetParamClass(getGenericType(paramType)); if (isArray(param)) { - println("for (int objId = 0; objId < numStubs" + i + "; objId++) {"); - println("stub" + i + "[objId] = new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt);"); - println("objIdCnt++;"); + println("for (int i = 0; i < numStubs" + i + "; i++) {"); + println("int objIdRecv" + i + " = stubIdArray" + i + "[i];"); + writeCallbackInstantiationJavaStubGeneration(exchParamType, i); + println("stub" + i + "[i] = newStub" + i + ";"); println("}"); } else if (isList(paramType)) { - println("for (int objId = 0; objId < numStubs" + i + "; objId++) {"); - println("stub" + i + ".add(new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt));"); - println("objIdCnt++;"); + println("for (int i = 0; i < numStubs" + i + "; i++) {"); + println("int objIdRecv" + i + " = stubIdArray" + i + "[i];"); + writeCallbackInstantiationJavaStubGeneration(exchParamType, i); + println("stub" + i + ".add(newStub" + i + ");"); println("}"); - } + } else + println(exchParamType + " stub" + i + " = newStub" + i + ";"); mapStubParam.put(i, "stub" + i); // List of all stub parameters } } @@ -1331,28 +1442,35 @@ public class IoTCompiler { /** * HELPER: checkAndWriteEnumTypeJavaSkeleton() writes the enum type (convert from enum to int) */ - private void checkAndWriteEnumTypeJavaSkeleton(List methParams, List methPrmTypes) { + private void checkAndWriteEnumTypeJavaSkeleton(List methParams, List methPrmTypes, boolean isStructMethod) { + String offsetPfx = ""; + if (isStructMethod) + offsetPfx = "offset"; // Iterate and find enum declarations + boolean printed = false; for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isEnumClass(simpleType)) { // Check if this is enum type - println("int paramInt" + i + "[] = (int[]) paramObj[" + i + "];"); - println(simpleType + "[] enumVals = " + simpleType + ".values();"); + println("int paramInt" + i + "[] = (int[]) paramObj[" + offsetPfx + i + "];"); + if (!printed) { + println(simpleType + "[] enumVals = " + simpleType + ".values();"); + printed = true; + } if (isArray(param)) { // An array println("int len" + i + " = paramInt" + i + ".length;"); - println(simpleType + "[] paramEnum = new " + simpleType + "[len];"); + println(simpleType + "[] paramEnum" + i + " = new " + simpleType + "[len" + i + "];"); println("for (int i = 0; i < len" + i + "; i++) {"); - println("paramEnum[i] = enumVals[paramInt" + i + "[i]];"); + println("paramEnum" + i + "[i] = enumVals[paramInt" + i + "[i]];"); println("}"); } else if (isList(paramType)) { // A list println("int len" + i + " = paramInt" + i + ".length;"); - println("List<" + simpleType + "> paramEnum = new ArrayList<" + simpleType + ">();"); + println("List<" + simpleType + "> paramEnum" + i + " = new ArrayList<" + simpleType + ">();"); println("for (int i = 0; i < len" + i + "; i++) {"); - println("paramEnum.add(enumVals[paramInt" + i + "[i]]);"); + println("paramEnum" + i + ".add(enumVals[paramInt" + i + "[i]]);"); println("}"); } else { // Just one element println(simpleType + " paramEnum" + i + " = enumVals[paramInt" + i + "[0]];"); @@ -1368,10 +1486,10 @@ public class IoTCompiler { private void checkAndWriteEnumRetTypeJavaSkeleton(String retType, String methodId) { // Strips off array "[]" for return type - String pureType = getSimpleArrayType(getSimpleType(retType)); + String pureType = getSimpleArrayType(getGenericType(retType)); // Take the inner type of generic if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(retType)[0]; + pureType = getGenericType(retType); if (isEnumClass(pureType)) { // Check if this is enum type // Enum decoder @@ -1392,10 +1510,10 @@ public class IoTCompiler { private void checkAndWriteEnumRetConvJavaSkeleton(String retType) { // Strips off array "[]" for return type - String pureType = getSimpleArrayType(getSimpleType(retType)); + String pureType = getSimpleArrayType(getGenericType(retType)); // Take the inner type of generic if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(retType)[0]; + pureType = getGenericType(retType); if (isEnumClass(pureType)) { // Check if this is enum type if (isArray(retType)) { // An array @@ -1406,9 +1524,9 @@ public class IoTCompiler { println("}"); } else if (isList(retType)) { // A list println("int retLen = retEnum.size();"); - println("List<" + pureType + "> retEnumVal = new ArrayList<" + pureType + ">();"); + println("int[] retEnumVal = new int[retLen];"); println("for (int i = 0; i < retLen; i++) {"); - println("retEnumVal.add(retEnum[i].ordinal());"); + println("retEnumVal[i] = retEnum.get(i).ordinal();"); println("}"); } else { // Just one element println("int[] retEnumVal = new int[1];"); @@ -1454,14 +1572,12 @@ public class IoTCompiler { StructDecl structDecl = getStructDecl(simpleType); List memTypes = structDecl.getMemberTypes(simpleType); List members = structDecl.getMembers(simpleType); - if (isArrayOrList(param, paramType)) { // An array or list + if (isArrayOrList(paramType, param)) { // An array or list int methodNumId = intDecl.getMethodNumId(method); String counter = "struct" + methodNumId + "Size" + iVar; println("for(int i = 0; i < " + counter + "; i++) {"); } - println("int pos = 0;"); - if (isArrayOrList(param, paramType)) { // An array or list - println("for(int i = 0; i < retLen; i++) {"); + if (isArrayOrList(paramType, param)) { // An array or list for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); @@ -1484,6 +1600,7 @@ public class IoTCompiler { private void writeStructMembersInitJavaSkeleton(InterfaceDecl intDecl, List methParams, List methPrmTypes, String method) { + println("int objPos = 0;"); for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); @@ -1501,12 +1618,11 @@ public class IoTCompiler { println("List<" + simpleType + "> paramStruct" + i + " = new ArrayList<" + simpleType + ">();"); } else println(simpleType + " paramStruct" + i + " = new " + simpleType + "();"); - println("int objPos = 0;"); // Initialize members StructDecl structDecl = getStructDecl(simpleType); List members = structDecl.getMembers(simpleType); List memTypes = structDecl.getMemberTypes(simpleType); - if (isArrayOrList(param, paramType)) { // An array or list + if (isArrayOrList(paramType, param)) { // An array or list println("for(int i = 0; i < " + counter + "; i++) {"); } if (isArray(param)) { // An array @@ -1534,7 +1650,7 @@ public class IoTCompiler { } } else { // Take offsets of parameters - println("int offset" + i +" = objPos;"); + println("int offset" + i +" = objPos++;"); } } } @@ -1553,7 +1669,7 @@ public class IoTCompiler { else // Just single struct object println("int retLen = 1;"); println("Object retLenObj = retLen;"); - println("rmiObj.sendReturnObj(retLenObj);"); + println("rmiComm.sendReturnObj(retLenObj, localMethodBytes);"); int numMem = getNumOfMembers(simpleType); println("Class[] retCls = new Class[" + numMem + "*retLen];"); println("Object[] retObj = new Object[" + numMem + "*retLen];"); @@ -1562,7 +1678,7 @@ public class IoTCompiler { StructDecl structDecl = getStructDecl(simpleType); List memTypes = structDecl.getMemberTypes(simpleType); List members = structDecl.getMembers(simpleType); - if (isArrayOrList(retType, retType)) { // An array or list + if (isArray(retType)) { // An array or list println("for(int i = 0; i < retLen; i++) {"); for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); @@ -1572,6 +1688,16 @@ public class IoTCompiler { println(";"); } println("}"); + } else if (isList(retType)) { // An array or list + println("for(int i = 0; i < retLen; i++) {"); + for (int i = 0; i < members.size(); i++) { + String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); + println("retCls[retPos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); + print("retObj[retPos++] = retStruct.get(i)."); + print(getEnumParam(memTypes.get(i), getSimpleIdentifier(members.get(i)), i)); + println(";"); + } + println("}"); } else { // Just one struct element for (int i = 0; i < members.size(); i++) { String prmType = checkAndGetArray(memTypes.get(i), members.get(i)); @@ -1589,34 +1715,37 @@ public class IoTCompiler { * HELPER: writeMethodHelperReturnJavaSkeleton() writes return statement part in skeleton */ private void writeMethodHelperReturnJavaSkeleton(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method, boolean isCallbackMethod, String callbackType, + List methPrmTypes, String method, boolean isCallbackMethod, Set callbackType, boolean isStructMethod) { - checkAndWriteEnumTypeJavaSkeleton(methParams, methPrmTypes); + checkAndWriteEnumTypeJavaSkeleton(methParams, methPrmTypes, isStructMethod); Map mapStubParam = null; - if (isCallbackMethod) - mapStubParam = writeCallbackJavaStubGeneration(methParams, methPrmTypes, callbackType); + if (isCallbackMethod) { + println("try {"); + mapStubParam = writeCallbackJavaStubGeneration(methParams, methPrmTypes, callbackType, isStructMethod); + } // Check if this is "void" String retType = intDecl.getMethodType(method); if (retType.equals("void")) { print(intDecl.getMethodId(method) + "("); - } else if (isEnumClass(getSimpleArrayType(getSimpleType(retType)))) { // Enum type + } else if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) { // Enum type checkAndWriteEnumRetTypeJavaSkeleton(retType, intDecl.getMethodId(method)); - } else if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) { // Struct type + } else if (isStructClass(getSimpleArrayType(getGenericType(retType)))) { // Struct type print(retType + " retStruct = " + intDecl.getMethodId(method) + "("); } else { // We do have a return value print("Object retObj = " + intDecl.getMethodId(method) + "("); } for (int i = 0; i < methParams.size(); i++) { - if (isCallbackMethod) { + String paramType = methPrmTypes.get(i); + if (isCallbackMethod && checkCallbackType(paramType, callbackType)) { print(mapStubParam.get(i)); // Get the callback parameter - } else if (isEnumClass(getSimpleType(methPrmTypes.get(i)))) { // Enum class - print(getEnumParam(methPrmTypes.get(i), methParams.get(i), i)); - } else if (isStructClass(getSimpleType(methPrmTypes.get(i)))) { + } else if (isEnumClass(getGenericType(paramType))) { // Enum class + print(getEnumParam(paramType, methParams.get(i), i)); + } else if (isStructClass(getGenericType(paramType))) { print("paramStruct" + i); } else { - String prmType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); + String prmType = checkAndGetArray(paramType, methParams.get(i)); if (isStructMethod) print("(" + prmType + ") paramObj[offset" + i + "]"); else @@ -1627,17 +1756,18 @@ public class IoTCompiler { } println(");"); if (!retType.equals("void")) { - if (isEnumClass(getSimpleArrayType(getSimpleType(retType)))) { // Enum type + if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) { // Enum type checkAndWriteEnumRetConvJavaSkeleton(retType); - println("rmiObj.sendReturnObj(retObj);"); - } else if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) { // Struct type - writeStructReturnJavaSkeleton(getSimpleArrayType(getSimpleType(retType)), retType); - println("rmiObj.sendReturnObj(retCls, retObj);"); + println("rmiComm.sendReturnObj(retObj, localMethodBytes);"); + } else if (isStructClass(getSimpleArrayType(getGenericType(retType)))) { // Struct type + writeStructReturnJavaSkeleton(getSimpleArrayType(getGenericType(retType)), retType); + println("rmiComm.sendReturnObj(retCls, retObj, localMethodBytes);"); } else - println("rmiObj.sendReturnObj(retObj);"); + println("rmiComm.sendReturnObj(retObj, localMethodBytes);"); } if (isCallbackMethod) { // Catch exception if this is callback - println("} catch(Exception ex) {"); + print("}"); + println(" catch(Exception ex) {"); println("ex.printStackTrace();"); println("throw new Error(\"Exception from callback object instantiation!\");"); println("}"); @@ -1653,12 +1783,15 @@ public class IoTCompiler { // Generate array of parameter objects boolean isCallbackMethod = false; - String callbackType = null; + Set callbackType = new HashSet(); + println("byte[] localMethodBytes = methodBytes;"); + println("rmiComm.setGetMethodBytes();"); print("int paramLen = "); writeLengthStructParamClassSkeleton(methParams, methPrmTypes, method, intDecl); println(";"); println("Class[] paramCls = new Class[paramLen];"); println("Class[] paramClsGen = new Class[paramLen];"); + println("int pos = 0;"); // Iterate again over the parameters for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); @@ -1670,8 +1803,9 @@ public class IoTCompiler { String prmType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(prmType)) { isCallbackMethod = true; - callbackType = prmType; - println("paramCls[pos] = int.class;"); + //callbackType = prmType; + callbackType.add(prmType); + println("paramCls[pos] = int[].class;"); println("paramClsGen[pos++] = null;"); } else { // Generate normal classes if it's not a callback object String paramTypeOth = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); @@ -1685,7 +1819,7 @@ public class IoTCompiler { } } } - println("Object[] paramObj = rmiObj.getMethodParams(paramCls, paramClsGen);"); + println("Object[] paramObj = rmiComm.getMethodParams(paramCls, paramClsGen, localMethodBytes);"); writeStructMembersInitJavaSkeleton(intDecl, methParams, methPrmTypes, method); // Write the return value part writeMethodHelperReturnJavaSkeleton(intDecl, methParams, methPrmTypes, method, isCallbackMethod, callbackType, true); @@ -1700,15 +1834,17 @@ public class IoTCompiler { // Generate array of parameter objects boolean isCallbackMethod = false; - String callbackType = null; - print("Object[] paramObj = rmiObj.getMethodParams(new Class[] { "); + Set callbackType = new HashSet(); + println("byte[] localMethodBytes = methodBytes;"); + println("rmiComm.setGetMethodBytes();"); + print("Object[] paramObj = rmiComm.getMethodParams(new Class[] { "); for (int i = 0; i < methParams.size(); i++) { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(paramType)) { isCallbackMethod = true; - callbackType = paramType; - print("int.class"); + callbackType.add(paramType); + print("int[].class"); } else { // Generate normal classes if it's not a callback object String prmType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); print(getSimpleType(getEnumType(prmType)) + ".class"); @@ -1716,19 +1852,20 @@ public class IoTCompiler { if (i != methParams.size() - 1) print(", "); } - println(" }, "); // Generate generic class if it's a generic type.. null otherwise - print("new Class[] { "); + print(" }, new Class[] { "); for (int i = 0; i < methParams.size(); i++) { String prmType = methPrmTypes.get(i); - if (getParamCategory(prmType) == ParamCategory.NONPRIMITIVES) - print(getTypeOfGeneric(prmType)[0] + ".class"); + if ((getParamCategory(prmType) == ParamCategory.NONPRIMITIVES) && + !isEnumClass(getGenericType(prmType)) && + !callbackClasses.contains(getGenericType(prmType))) + print(getGenericType(prmType) + ".class"); else print("null"); if (i != methParams.size() - 1) print(", "); } - println(" });"); + println(" }, localMethodBytes);"); // Write the return value part writeMethodHelperReturnJavaSkeleton(intDecl, methParams, methPrmTypes, method, isCallbackMethod, callbackType, false); } @@ -1759,11 +1896,12 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { // Print size variables String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { - if (!begin) { // Generate comma for not the beginning variable - print(", "); begin = false; - } + if (!begin) // Generate comma for not the beginning variable + print(", "); + else + begin = false; int methodNumId = intDecl.getMethodNumId(method); print("int struct" + methodNumId + "Size" + i); } @@ -1814,14 +1952,16 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); print("public int ___"); String helperMethod = methodNumId + "struct" + i; println(helperMethod + "() {"); // Now, write the helper body of skeleton! - println("Object[] paramObj = rmiObj.getMethodParams(new Class[] { int.class }, new Class[] { null });"); + println("byte[] localMethodBytes = methodBytes;"); + println("rmiComm.setGetMethodBytes();"); + println("Object[] paramObj = rmiComm.getMethodParams(new Class[] { int.class }, new Class[] { null }, localMethodBytes);"); println("return (int) paramObj[0];"); println("}\n"); } @@ -1845,14 +1985,14 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); print("public int ___"); String helperMethod = methodNumId + "struct" + i; println(helperMethod + "(IoTRMIObject rmiObj) {"); // Now, write the helper body of skeleton! - println("Object[] paramObj = rmiObj.getMethodParams(new Class[] { int.class }, new Class[] { null });"); + println("Object[] paramObj = rmiComm.getMethodParams(new Class[] { int.class }, new Class[] { null });"); println("return (int) paramObj[0];"); println("}\n"); } @@ -1875,7 +2015,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); println("int struct" + methodNumId + "Size" + i + " = 0;"); @@ -1884,26 +2024,55 @@ public class IoTCompiler { } } + + /** + * HELPER: writeInputCountVarStructJavaSkeleton() writes input counter variable of struct for skeleton + */ + private boolean writeInputCountVarStructJavaSkeleton(String method, InterfaceDecl intDecl) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + boolean structExist = false; + boolean begin = true; + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + structExist = true; + if (!begin) + print(", "); + else + begin = false; + int methodNumId = intDecl.getMethodNumId(method); + print("struct" + methodNumId + "Size" + i + "Final"); + } + } + return structExist; + } + /** - * HELPER: writeInputCountVarStructSkeleton() writes input counter variable of struct for skeleton + * HELPER: writeInputCountVarStructCplusSkeleton() writes input counter variable of struct for skeleton */ - private boolean writeInputCountVarStructSkeleton(String method, InterfaceDecl intDecl) { + private boolean writeInputCountVarStructCplusSkeleton(String method, InterfaceDecl intDecl) { List methParams = intDecl.getMethodParams(method); List methPrmTypes = intDecl.getMethodParamTypes(method); boolean structExist = false; + boolean begin = true; // Check for params with structs for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); - boolean begin = true; + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { structExist = true; - if (!begin) { - print(", "); begin = false; - } + if (!begin) + print(", "); + else + begin = false; int methodNumId = intDecl.getMethodNumId(method); print("struct" + methodNumId + "Size" + i); } @@ -1913,9 +2082,9 @@ public class IoTCompiler { /** - * HELPER: writeMethodCallStructSkeleton() writes method call for wait invoke in skeleton + * HELPER: writeMethodCallStructJavaSkeleton() writes method call for wait invoke in skeleton */ - private void writeMethodCallStructSkeleton(Collection methods, InterfaceDecl intDecl) { + private void writeMethodCallStructJavaSkeleton(Collection methods, InterfaceDecl intDecl) { // Use this set to handle two same methodIds for (String method : methods) { @@ -1926,7 +2095,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); print("case "); @@ -1941,6 +2110,35 @@ public class IoTCompiler { } + /** + * HELPER: writeMethodCallStructCplusSkeleton() writes method call for wait invoke in skeleton + */ + private void writeMethodCallStructCplusSkeleton(Collection methods, InterfaceDecl intDecl) { + + // Use this set to handle two same methodIds + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + int methodNumId = intDecl.getMethodNumId(method); + print("case "); + String helperMethod = methodNumId + "struct" + i; + String tempVar = "struct" + methodNumId + "Size" + i; + print(intDecl.getHelperMethodNumId(helperMethod) + ": "); + print(tempVar + " = ___"); + println(helperMethod + "(skel); break;"); + } + } + } + } + + /** * HELPER: writeMethodCallStructCallbackSkeleton() writes method call for wait invoke in skeleton */ @@ -1955,7 +2153,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); print("case "); @@ -1979,33 +2177,63 @@ public class IoTCompiler { Map> mapNewIntMethods = mapInt2NewInts.get(intface); for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("if (_objectId == object" + newObjectId + "Id) {"); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("if (_objectId == objectId) {"); println("if (!set" + newObjectId + "Allowed.contains(methodId)) {"); println("throw new Error(\"Object with object Id: \" + _objectId + \" is not allowed to access method: \" + methodId);"); println("}"); println("}"); println("else {"); - println("throw new Error(\"Object Id: \" + _objectId + \" not recognized!\");"); + println("continue;"); println("}"); } } + /** + * HELPER: writeFinalInputCountVarStructSkeleton() writes the final version of input counter variable of struct for skeleton + */ + private boolean writeFinalInputCountVarStructSkeleton(String method, InterfaceDecl intDecl) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + boolean structExist = false; + boolean begin = true; + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + structExist = true; + int methodNumId = intDecl.getMethodNumId(method); + println("final int struct" + methodNumId + "Size" + i + + "Final = struct" + methodNumId + "Size" + i + ";"); + } + } + return structExist; + } + + /** * HELPER: writeJavaWaitRequestInvokeMethod() writes the main loop of the skeleton class */ - private void writeJavaWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, boolean callbackExist, String intface) { + private void writeJavaWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, String intface) { // Use this set to handle two same methodIds Set uniqueMethodIds = new HashSet(); - println("private void ___waitRequestInvokeMethod() throws IOException {"); + println("public void ___waitRequestInvokeMethod() throws IOException {"); // Write variables here if we have callbacks or enums or structs writeCountVarStructSkeleton(methods, intDecl); + println("didAlreadyInitWaitInvoke.compareAndSet(false, true);"); println("while (true) {"); - println("rmiObj.getMethodBytes();"); - println("int _objectId = rmiObj.getObjectId();"); - println("int methodId = rmiObj.getMethodId();"); + println("if (!methodReceived.get()) {"); + println("continue;"); + println("}"); + println("methodBytes = rmiComm.getMethodBytes();"); + println("methodReceived.set(false);"); + println("int _objectId = IoTRMIComm.getObjectId(methodBytes);"); + println("int methodId = IoTRMIComm.getMethodId(methodBytes);"); // Generate permission check writeJavaMethodPermission(intface); println("switch (methodId) {"); @@ -2013,23 +2241,31 @@ public class IoTCompiler { for (String method : methods) { String methodId = intDecl.getMethodId(method); int methodNumId = intDecl.getMethodNumId(method); - print("case " + methodNumId + ": ___"); + println("case " + methodNumId + ":"); + // Check for stuct counters + writeFinalInputCountVarStructSkeleton(method, intDecl); + println("new Thread() {"); + println("public void run() {"); + println("try {"); + print("___"); String helperMethod = methodId; if (uniqueMethodIds.contains(methodId)) helperMethod = helperMethod + methodNumId; else uniqueMethodIds.add(methodId); print(helperMethod + "("); - writeInputCountVarStructSkeleton(method, intDecl); - println("); break;"); + writeInputCountVarStructJavaSkeleton(method, intDecl); + println(");"); + println("}"); + println("catch (Exception ex) {"); + println("ex.printStackTrace();"); + println("}"); + println("}"); + println("}.start();"); + println("break;"); } String method = "___initCallBack()"; - // Print case -9999 (callback handler) if callback exists - if (callbackExist) { - int methodId = intDecl.getHelperMethodNumId(method); - println("case " + methodId + ": ___regCB(); break;"); - } - writeMethodCallStructSkeleton(methods, intDecl); + writeMethodCallStructJavaSkeleton(methods, intDecl); println("default: "); println("throw new Error(\"Method Id \" + methodId + \" not recognized!\");"); println("}"); @@ -2039,262 +2275,120 @@ public class IoTCompiler { /** - * generateJavaSkeletonClass() generate skeletons based on the methods list in Java + * HELPER: writeReturnDidAlreadyInitWaitInvoke() writes the function to return didAlreadyInitWaitInvoke */ - public void generateJavaSkeletonClass() throws IOException { + private void writeReturnDidAlreadyInitWaitInvoke() { - // Create a new directory - String path = createDirectories(dir, subdir); - for (String intface : mapIntfacePTH.keySet()) { - // Open a new file to write into - String newSkelClass = intface + "_Skeleton"; - FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".java"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Pass in set of methods and get import classes - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - List methods = intDecl.getMethods(); - Set importClasses = getImportClasses(methods, intDecl); - List stdImportClasses = getStandardJavaImportClasses(); - List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); - printImportStatements(allImportClasses); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write class header - println(""); - println("public class " + newSkelClass + " implements " + intface + " {\n"); - // Write properties - writePropertiesJavaSkeleton(intface, callbackExist, intDecl); - // Write constructor - writeConstructorJavaSkeleton(newSkelClass, intface); - // Write methods - writeMethodJavaSkeleton(methods, intDecl, callbackClasses, false); - // Write method helper - writeMethodHelperJavaSkeleton(methods, intDecl, callbackClasses); - // Write waitRequestInvokeMethod() - main loop - writeJavaWaitRequestInvokeMethod(methods, intDecl, callbackExist, intface); - println("}"); - pw.close(); - System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".java..."); - } + println("public boolean didAlreadyInitWaitInvoke() {"); + println("return didAlreadyInitWaitInvoke.get();"); + println("}\n"); } /** - * HELPER: writePropertiesJavaCallbackSkeleton() writes the properties of the callback skeleton class + * generateJavaSkeletonClass() generate skeletons based on the methods list in Java */ - private void writePropertiesJavaCallbackSkeleton(String intface, boolean callbackExist) { + public void generateJavaSkeletonClass() throws IOException { - println("private " + intface + " mainObj;"); - // For callback skeletons, this is its own object Id - println("private static int objectId = 0;"); - // Callback - if (callbackExist) { - println("private static int objIdCnt = 0;"); - println("private IoTRMICall rmiCall;"); + // Create a new directory + String path = createDirectories(dir, subdir); + for (String intface : mapIntfacePTH.keySet()) { + + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + // Get driver class + String driverClass = drvList.get(i); + // Open a new file to write into + String newSkelClass = intface + "_Skeleton"; + String packageClass = null; + // Check if this interface is a callback class + if(isCallbackClass(intface)) { + packageClass = controllerClass; + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + } else { + packageClass = CODE_PREFIX + "." + driverClass; + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + } + FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".java"); + pw = new PrintWriter(new BufferedWriter(fw)); + // Pass in set of methods and get import classes + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + List methods = intDecl.getMethods(); + Set importClasses = getImportClasses(methods, intDecl); + List stdImportClasses = getStandardJavaImportClasses(); + List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); + // Find out if there are callback objects + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); + println("package " + packageClass + ";\n"); + printImportStatements(allImportClasses); + println("\nimport " + INTERFACE_PACKAGE + ".*;\n"); + // Write class header + println("public class " + newSkelClass + " implements " + intface + " {\n"); + // Write properties + writePropertiesJavaSkeleton(intface, intDecl); + // Write constructor + writeConstructorJavaSkeleton(newSkelClass, intface, intDecl, methods, callbackExist); + // Write constructor that is called when this object is a callback object + writeCallbackConstructorJavaSkeleton(newSkelClass, intface, intDecl, methods, callbackExist); + // Write function to return didAlreadyInitWaitInvoke + writeReturnDidAlreadyInitWaitInvoke(); + // Write methods + writeMethodJavaSkeleton(methods, intDecl); + // Write method helper + writeMethodHelperJavaSkeleton(methods, intDecl, callbackClasses); + // Write waitRequestInvokeMethod() - main loop + writeJavaWaitRequestInvokeMethod(methods, intDecl, intface); + println("}"); + pw.close(); + System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".java..."); + } } - println("\n"); } + +/*================================================================================ + * + * C++ generation + * + *================================================================================/ /** - * HELPER: writeConstructorJavaCallbackSkeleton() writes the constructor of the skeleton class + * HELPER: writeMethodCplusLocalInterface() writes the method of the local interface */ - private void writeConstructorJavaCallbackSkeleton(String newSkelClass, String intface) { + private void writeMethodCplusLocalInterface(Collection methods, InterfaceDecl intDecl) { - println("public " + newSkelClass + "(" + intface + " _mainObj, int _objectId) throws Exception {"); - println("mainObj = _mainObj;"); - println("objectId = _objectId;"); - println("}\n"); + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + print("virtual " + checkAndGetCplusType(intDecl.getMethodType(method)) + " " + + intDecl.getMethodId(method) + "("); + for (int i = 0; i < methParams.size(); i++) { + // Check for params with driver class types and exchange it + // with its remote interface + String paramType = checkAndGetParamClass(methPrmTypes.get(i)); + paramType = checkAndGetCplusType(paramType); + // Check for arrays - translate into vector in C++ + String paramComplete = checkAndGetCplusArray(paramType, methParams.get(i)); + print(paramComplete); + // Check if this is the last element (don't print a comma) + if (i != methParams.size() - 1) { + print(", "); + } + } + println(") = 0;"); + } } /** - * HELPER: writeMethodHelperJavaCallbackSkeleton() writes the method helper of the callback skeleton class + * HELPER: writeMethodCplusInterface() writes the method of the interface */ - private void writeMethodHelperJavaCallbackSkeleton(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { - - // Use this set to handle two same methodIds - Set uniqueMethodIds = new HashSet(); - for (String method : methods) { - - List methParams = intDecl.getMethodParams(method); - List methPrmTypes = intDecl.getMethodParamTypes(method); - if (isStructPresent(methParams, methPrmTypes)) { // Treat struct differently - String methodId = intDecl.getMethodId(method); - print("public void ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + intDecl.getMethodNumId(method); - else - uniqueMethodIds.add(methodId); - String retType = intDecl.getMethodType(method); - print(helperMethod + "("); - boolean begin = true; - for (int i = 0; i < methParams.size(); i++) { // Print size variables - String paramType = methPrmTypes.get(i); - String param = methParams.get(i); - String simpleType = getSimpleType(paramType); - if (isStructClass(simpleType)) { - if (!begin) { // Generate comma for not the beginning variable - print(", "); begin = false; - } - int methodNumId = intDecl.getMethodNumId(method); - print("int struct" + methodNumId + "Size" + i); - } - } - // Check if this is "void" - if (retType.equals("void")) - println(", IoTRMIObject rmiObj) {"); - else - println(", IoTRMIObject rmiObj) throws IOException {"); - writeMethodHelperStructJavaSkeleton(intDecl, methParams, methPrmTypes, method, callbackClasses); - println("}\n"); - } else { - String methodId = intDecl.getMethodId(method); - print("public void ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + intDecl.getMethodNumId(method); - else - uniqueMethodIds.add(methodId); - // Check if this is "void" - String retType = intDecl.getMethodType(method); - if (retType.equals("void")) - println(helperMethod + "(IoTRMIObject rmiObj) {"); - else - println(helperMethod + "(IoTRMIObject rmiObj) throws IOException {"); - // Now, write the helper body of skeleton! - writeStdMethodHelperBodyJavaSkeleton(intDecl, methParams, methPrmTypes, method, callbackClasses); - println("}\n"); - } - } - // Write method helper for structs - writeMethodHelperStructSetupJavaCallbackSkeleton(methods, intDecl); - } - - - /** - * HELPER: writeJavaCallbackWaitRequestInvokeMethod() writes the request invoke method of the callback skeleton class - */ - private void writeJavaCallbackWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, boolean callbackExist) { - - // Use this set to handle two same methodIds - Set uniqueMethodIds = new HashSet(); - println("public void invokeMethod(IoTRMIObject rmiObj) throws IOException {"); - // Write variables here if we have callbacks or enums or structs - writeCountVarStructSkeleton(methods, intDecl); - // Write variables here if we have callbacks or enums or structs - println("int methodId = rmiObj.getMethodId();"); - // TODO: code the permission check here! - println("switch (methodId) {"); - // Print methods and method Ids - for (String method : methods) { - String methodId = intDecl.getMethodId(method); - int methodNumId = intDecl.getMethodNumId(method); - print("case " + methodNumId + ": ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + methodNumId; - else - uniqueMethodIds.add(methodId); - print(helperMethod + "("); - if (writeInputCountVarStructSkeleton(method, intDecl)) - println(", rmiObj); break;"); - else - println("rmiObj); break;"); - } - String method = "___initCallBack()"; - // Print case -9999 (callback handler) if callback exists - if (callbackExist) { - int methodId = intDecl.getHelperMethodNumId(method); - println("case " + methodId + ": ___regCB(rmiObj); break;"); - } - writeMethodCallStructCallbackSkeleton(methods, intDecl); - println("default: "); - println("throw new Error(\"Method Id \" + methodId + \" not recognized!\");"); - println("}"); - println("}\n"); - } - - - /** - * generateJavaCallbackSkeletonClass() generate callback skeletons based on the methods list in Java - */ - public void generateJavaCallbackSkeletonClass() throws IOException { - - // Create a new directory - String path = createDirectories(dir, subdir); - for (String intface : mapIntfacePTH.keySet()) { - // Open a new file to write into - String newSkelClass = intface + "_CallbackSkeleton"; - FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".java"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Pass in set of methods and get import classes - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - List methods = intDecl.getMethods(); - Set importClasses = getImportClasses(methods, intDecl); - List stdImportClasses = getStandardJavaImportClasses(); - List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); - printImportStatements(allImportClasses); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write class header - println(""); - println("public class " + newSkelClass + " implements " + intface + " {\n"); - // Write properties - writePropertiesJavaCallbackSkeleton(intface, callbackExist); - // Write constructor - writeConstructorJavaCallbackSkeleton(newSkelClass, intface); - // Write methods - writeMethodJavaSkeleton(methods, intDecl, callbackClasses, true); - // Write method helper - writeMethodHelperJavaCallbackSkeleton(methods, intDecl, callbackClasses); - // Write waitRequestInvokeMethod() - main loop - writeJavaCallbackWaitRequestInvokeMethod(methods, intDecl, callbackExist); - println("}"); - pw.close(); - System.out.println("IoTCompiler: Generated callback skeleton class " + newSkelClass + ".java..."); - } - } - - - /** - * HELPER: writeMethodCplusLocalInterface() writes the method of the local interface - */ - private void writeMethodCplusLocalInterface(Collection methods, InterfaceDecl intDecl) { - - for (String method : methods) { - - List methParams = intDecl.getMethodParams(method); - List methPrmTypes = intDecl.getMethodParamTypes(method); - print("virtual " + checkAndGetCplusType(intDecl.getMethodType(method)) + " " + - intDecl.getMethodId(method) + "("); - for (int i = 0; i < methParams.size(); i++) { - // Check for params with driver class types and exchange it - // with its remote interface - String paramType = checkAndGetParamClass(methPrmTypes.get(i)); - paramType = checkAndGetCplusType(paramType); - // Check for arrays - translate into vector in C++ - String paramComplete = checkAndGetCplusArray(paramType, methParams.get(i)); - print(paramComplete); - // Check if this is the last element (don't print a comma) - if (i != methParams.size() - 1) { - print(", "); - } - } - println(") = 0;"); - } - } - - - /** - * HELPER: writeMethodCplusInterface() writes the method of the interface - */ - private void writeMethodCplusInterface(Collection methods, InterfaceDecl intDecl) { + private void writeMethodCplusInterface(Collection methods, InterfaceDecl intDecl) { for (String method : methods) { @@ -2327,6 +2421,7 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, VIRTUALS_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Get the right StructDecl DeclarationHandler decHandler = mapIntDeclHand.get(intface); @@ -2335,7 +2430,7 @@ public class IoTCompiler { // Iterate over enum declarations for (String enType : enumTypes) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + enType + ".hpp"); + FileWriter fw = new FileWriter(path + "/" + enType + ".hpp"); pw = new PrintWriter(new BufferedWriter(fw)); // Write file headers println("#ifndef _" + enType.toUpperCase() + "_HPP__"); @@ -2368,6 +2463,7 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, VIRTUALS_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Get the right StructDecl DeclarationHandler decHandler = mapIntDeclHand.get(intface); @@ -2376,11 +2472,12 @@ public class IoTCompiler { // Iterate over enum declarations for (String stType : structTypes) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + stType + ".hpp"); + FileWriter fw = new FileWriter(path + "/" + stType + ".hpp"); pw = new PrintWriter(new BufferedWriter(fw)); // Write file headers println("#ifndef _" + stType.toUpperCase() + "_HPP__"); println("#define _" + stType.toUpperCase() + "_HPP__"); + println("using namespace std;"); println("struct " + stType + " {"); List structMemberTypes = structDecl.getMemberTypes(stType); List structMembers = structDecl.getMembers(stType); @@ -2413,9 +2510,10 @@ public class IoTCompiler { // Create a new directory createDirectory(dir); + String path = createDirectories(dir, VIRTUALS_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { // Open a new file to write into - FileWriter fw = new FileWriter(dir + "/" + intface + ".hpp"); + FileWriter fw = new FileWriter(path + "/" + intface + ".hpp"); pw = new PrintWriter(new BufferedWriter(fw)); // Write file headers println("#ifndef _" + intface.toUpperCase() + "_HPP__"); @@ -2428,7 +2526,9 @@ public class IoTCompiler { Set includeClasses = getIncludeClasses(methods, intDecl, intface, true); printIncludeStatements(includeClasses); println(""); println("using namespace std;\n"); - //writeStructCplus(structDecl); + Set callbackClasses = getCallbackClasses(methods, intDecl); + if (!intface.equals(mainClass)) // Forward declare if not main class + writeMethodCplusInterfaceForwardDecl(methods, intDecl, callbackClasses, true); println("class " + intface); println("{"); println("public:"); // Write methods @@ -2441,6 +2541,33 @@ public class IoTCompiler { } + /** + * HELPER: writeMethodCplusInterfaceForwardDecl() writes the forward declaration of the interface + */ + private void writeMethodCplusInterfaceForwardDecl(Collection methods, InterfaceDecl intDecl, Set callbackClasses, boolean needNewIntface) { + + Set isDefined = new HashSet(); + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + for (int i = 0; i < methParams.size(); i++) { + String paramType = returnGenericCallbackType(methPrmTypes.get(i)); + // Check if this has callback object + if (callbackClasses.contains(paramType)) { + if (!isDefined.contains(paramType)) { + if (needNewIntface) + println("class " + getStubInterface(paramType) + ";\n"); + else + println("class " + paramType + ";\n"); + isDefined.add(paramType); + } + } + } + } + } + + /** * generateCPlusInterfaces() generate stub interfaces based on the methods list in C++ *

@@ -2450,6 +2577,7 @@ public class IoTCompiler { // Create a new directory String path = createDirectories(dir, subdir); + path = createDirectories(dir + "/" + subdir, VIRTUALS_DIRECTORY); for (String intface : mapIntfacePTH.keySet()) { Map> mapNewIntMethods = mapInt2NewInts.get(intface); @@ -2465,17 +2593,19 @@ public class IoTCompiler { println("#ifndef _" + newIntface.toUpperCase() + "_HPP__"); println("#define _" + newIntface.toUpperCase() + "_HPP__"); println("#include "); + updateIntfaceObjIdMap(intface, newIntface); // Pass in set of methods and get import classes - Set includeClasses = getIncludeClasses(intMeth.getValue(), intDecl, intface, false); - List stdIncludeClasses = getStandardCplusIncludeClasses(); - List allIncludeClasses = getAllLibClasses(stdIncludeClasses, includeClasses); - printIncludeStatements(allIncludeClasses); println(""); + Set methods = intMeth.getValue(); + Set includeClasses = getIncludeClasses(methods, intDecl, intface, false); + printIncludeStatements(includeClasses); println(""); println("using namespace std;\n"); + Set callbackClasses = getCallbackClasses(methods, intDecl); + writeMethodCplusInterfaceForwardDecl(methods, intDecl, callbackClasses, false); println("class " + newIntface); println("{"); println("public:"); // Write methods - writeMethodCplusInterface(intMeth.getValue(), intDecl); + writeMethodCplusInterface(methods, intDecl); println("};"); println("#endif"); pw.close(); @@ -2486,9 +2616,9 @@ public class IoTCompiler { /** - * HELPER: writeMethodCplusStub() writes the methods of the stub + * HELPER: writeMethodDeclCplusStub() writes the method declarations of the stub */ - private void writeMethodCplusStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { + private void writeMethodDeclCplusStub(Collection methods, InterfaceDecl intDecl) { for (String method : methods) { @@ -2496,15 +2626,47 @@ public class IoTCompiler { List methPrmTypes = intDecl.getMethodParamTypes(method); print(checkAndGetCplusType(intDecl.getMethodType(method)) + " " + intDecl.getMethodId(method) + "("); + for (int i = 0; i < methParams.size(); i++) { + + String paramType = returnGenericCallbackType(methPrmTypes.get(i)); + String methPrmType = checkAndGetCplusType(methPrmTypes.get(i)); + String methParamComplete = checkAndGetCplusArray(methPrmType, methParams.get(i)); + print(methParamComplete); + // Check if this is the last element (don't print a comma) + if (i != methParams.size() - 1) { + print(", "); + } + } + println(");"); + } + } + + + /** + * HELPER: writeMethodCplusStub() writes the methods of the stub + */ + private void writeMethodCplusStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses, String newStubClass) { + + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + // Print the mutex lock first + int methodNumId = intDecl.getMethodNumId(method); + String mutexVar = "mtx" + newStubClass + "MethodExec" + methodNumId; + println("mutex " + mutexVar + ";"); + print(checkAndGetCplusType(intDecl.getMethodType(method)) + " " + newStubClass + "::" + + intDecl.getMethodId(method) + "("); boolean isCallbackMethod = false; - String callbackType = null; + Set callbackType = new HashSet(); for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); + String paramType = returnGenericCallbackType(methPrmTypes.get(i)); // Check if this has callback object if (callbackClasses.contains(paramType)) { isCallbackMethod = true; - callbackType = paramType; + //callbackType = paramType; + callbackType.add(paramType); // Even if there're 2 callback arguments, we expect them to be of the same interface } String methPrmType = checkAndGetCplusType(methPrmTypes.get(i)); @@ -2516,100 +2678,69 @@ public class IoTCompiler { } } println(") { "); + println("lock_guard guard(" + mutexVar + ");"); if (isCallbackMethod) writeCallbackMethodBodyCplusStub(intDecl, methParams, methPrmTypes, method, callbackType); - else - writeStdMethodBodyCplusStub(intDecl, methParams, methPrmTypes, method); + writeStdMethodBodyCplusStub(intDecl, methParams, methPrmTypes, method, callbackType, isCallbackMethod); println("}\n"); - // Write the init callback helper method - if (isCallbackMethod) { - writeInitCallbackCplusStub(callbackType, intDecl); - writeInitCallbackSendInfoCplusStub(intDecl); - } + } } + /** + * HELPER: writeCallbackInstantiationMethodBodyCplusStub() writes the callback object instantiation in the method of the stub class + */ + private void writeCallbackInstantiationMethodBodyCplusStub(String paramIdent, String callbackType, int counter) { + + println("auto it" + counter + " = IoTRMIUtil::mapSkel->find(" + paramIdent + ");"); + println("if (it" + counter + " == IoTRMIUtil::mapSkel->end()) {"); + println("int newObjIdSent = rmiComm->getObjectIdCounter();"); + println("objIdSent" + counter + ".push_back(newObjIdSent);"); + println("rmiComm->decrementObjectIdCounter();"); + println(callbackType + "_Skeleton* skel" + counter + " = new " + callbackType + "_Skeleton(" + paramIdent + ", rmiComm, newObjIdSent);"); + println("IoTRMIUtil::mapSkel->insert(make_pair(" + paramIdent + ", skel" + counter + "));"); + println("IoTRMIUtil::mapSkelId->insert(make_pair(" + paramIdent + ", newObjIdSent));"); + println("thread th" + counter + " (&" + callbackType + "_Skeleton::___waitRequestInvokeMethod, skel" + counter + + ", skel" + counter +");"); + println("th" + counter + ".detach();"); + println("while(!skel" + counter + "->didInitWaitInvoke());"); + println("}"); + println("else"); + println("{"); + println("auto itId = IoTRMIUtil::mapSkelId->find(" + paramIdent + ");"); + println("objIdSent" + counter + ".push_back(itId->second);"); + println("}"); + } + + /** * HELPER: writeCallbackMethodBodyCplusStub() writes the callback method of the stub class */ private void writeCallbackMethodBodyCplusStub(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method, String callbackType) { + List methPrmTypes, String method, Set callbackType) { // Check if this is single object, array, or list of objects boolean isArrayOrList = false; String callbackParam = null; for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object + println("vector objIdSent" + i + ";"); String param = methParams.get(i); - if (isArrayOrList(paramType, param)) { // Generate loop - println("for (" + paramType + "* cb : " + getSimpleIdentifier(param) + ") {"); - println(callbackType + "_CallbackSkeleton* skel = new " + callbackType + "_CallbackSkeleton(cb, objIdCnt++);"); + if (isArrayOrList(paramType, param)) { // Generate loop + println("for (" + getGenericType(paramType) + "* cb : " + getSimpleIdentifier(param) + ") {"); + writeCallbackInstantiationMethodBodyCplusStub("cb", returnGenericCallbackType(paramType), i); isArrayOrList = true; callbackParam = getSimpleIdentifier(param); - } else - println(callbackType + "_CallbackSkeleton* skel = new " + callbackType + "_CallbackSkeleton(" + - getSimpleIdentifier(param) + ", objIdCnt++);"); - println("vecCallbackObj.push_back(skel);"); - if (isArrayOrList(paramType, param)) + } else { + writeCallbackInstantiationMethodBodyCplusStub(getSimpleIdentifier(param), returnGenericCallbackType(paramType), i); + } + if (isArrayOrList) println("}"); + println("vector ___paramCB" + i + " = objIdSent" + i + ";"); } } - println("int numParam = " + methParams.size() + ";"); - println("int methodId = " + intDecl.getMethodNumId(method) + ";"); - String retType = intDecl.getMethodType(method); - //String retTypeC = checkAndGetCplusType(retType); - //println("string retType = \"" + checkAndGetCplusArrayType(retTypeC) + "\";"); - println("string retType = \"" + retType + "\";"); - // Generate array of parameter types - print("string paramCls[] = { "); - for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); - if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - print("\"int\""); - } else { // Generate normal classes if it's not a callback object - //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i)); - //String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i)); - String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - String prmType = getSimpleType(getEnumType(paramTypeC)); - print("\"" + prmType + "\""); - } - if (i != methParams.size() - 1) // Check if this is the last element - print(", "); - } - println(" };"); - print("int ___paramCB = "); - if (isArrayOrList) - println(callbackParam + ".size();"); - else - println("1;"); - // Generate array of parameter objects - print("void* paramObj[] = { "); - for (int i = 0; i < methParams.size(); i++) { - String paramType = methPrmTypes.get(i); - if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - print("&___paramCB"); - } else - print(getSimpleIdentifier(methParams.get(i))); - if (i != methParams.size() - 1) - print(", "); - } - println(" };"); - // Check if this is "void" - if (retType.equals("void")) { - println("void* retObj = NULL;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); - } else { // We do have a return value - if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - println(checkAndGetCplusType(retType) + " retVal;"); - else - println(checkAndGetCplusType(retType) + " retVal = " + generateCplusInitializer(retType) + ";"); - println("void* retObj = &retVal;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); - println("return retVal;"); - } } @@ -2622,14 +2753,13 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); - if (isEnumClass(simpleType)) { + if (isEnumClass(getGenericType(paramType))) { // Check if this is enum type if (isArrayOrList(paramType, param)) { // An array or vector - println("int len" + i + " = " + param + ".size();"); - println("vector paramEnum" + i + "(len);"); + println("int len" + i + " = " + getSimpleIdentifier(param) + ".size();"); + println("vector paramEnum" + i + "(len" + i + ");"); println("for (int i = 0; i < len" + i + "; i++) {"); - println("paramEnum" + i + "[i] = (int) " + param + "[i];"); + println("paramEnum" + i + "[i] = (int) " + getSimpleIdentifier(param) + "[i];"); println("}"); } else { // Just one element println("vector paramEnum" + i + "(1);"); @@ -2643,18 +2773,19 @@ public class IoTCompiler { /** * HELPER: checkAndWriteEnumRetTypeCplusStub() writes the enum return type (convert from enum to int) */ - private void checkAndWriteEnumRetTypeCplusStub(String retType) { + private void checkAndWriteEnumRetTypeCplusStub(String retType, String method, InterfaceDecl intDecl) { // Strips off array "[]" for return type - String pureType = getSimpleArrayType(getSimpleType(retType)); + String pureType = getSimpleArrayType(getGenericType(retType)); // Take the inner type of generic if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(retType)[0]; + pureType = getGenericType(retType); if (isEnumClass(pureType)) { // Check if this is enum type println("vector retEnumInt;"); println("void* retObj = &retEnumInt;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); + println("rmiComm->remoteCall(objectId, methodId, paramCls, paramObj, numParam);"); + writeWaitForReturnValueCplus(method, intDecl, "rmiComm->getReturnValue(retType, retObj);"); if (isArrayOrList(retType, retType)) { // An array or vector println("int retLen = retEnumInt.size();"); println("vector<" + pureType + "> retVal(retLen);"); @@ -2679,26 +2810,25 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { // Check if this is enum type println("int numParam" + i + " = 1;"); int methodNumId = intDecl.getMethodNumId(method); String helperMethod = methodNumId + "struct" + i; println("int methodIdStruct" + i + " = " + intDecl.getHelperMethodNumId(helperMethod) + ";"); - println("string retTypeStruct" + i + " = \"void\";"); + //println("string retTypeStruct" + i + " = \"void\";"); println("string paramClsStruct" + i + "[] = { \"int\" };"); print("int structLen" + i + " = "); - if (isArrayOrList(param, paramType)) { // An array + if (isArrayOrList(paramType, param)) { // An array println(getSimpleArrayType(param) + ".size();"); } else { // Just one element println("1;"); } println("void* paramObjStruct" + i + "[] = { &structLen" + i + " };"); - println("void* retStructLen" + i + " = NULL;"); - println("rmiCall->remoteCall(objectId, methodIdStruct" + i + - ", retTypeStruct" + i + ", paramClsStruct" + i + ", paramObjStruct" + i + - ", numParam" + i + ", retStructLen" + i + ");\n"); + println("rmiComm->remoteCall(objectId, methodIdStruct" + i + + ", paramClsStruct" + i + ", paramObjStruct" + i + + ", numParam" + i + ");\n"); } } } @@ -2716,8 +2846,8 @@ public class IoTCompiler { String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int members = getNumOfMembers(simpleType); - if (isArrayOrList(param, paramType)) { // An array - String structLen = param + ".size()"; + if (isArrayOrList(paramType, param)) { // An array or list + String structLen = getSimpleIdentifier(param) + ".size()"; print(members + "*" + structLen); } else print(Integer.toString(members)); @@ -2739,24 +2869,22 @@ public class IoTCompiler { StructDecl structDecl = getStructDecl(simpleType); List memTypes = structDecl.getMemberTypes(simpleType); List members = structDecl.getMembers(simpleType); - if (isArrayOrList(param, paramType)) { // An array or list - println("for(int i = 0; i < " + param + ".size(); i++) {"); + if (isArrayOrList(paramType, param)) { // An array or list + println("for(int i = 0; i < " + getSimpleIdentifier(param) + ".size(); i++) {"); } - if (isArrayOrList(param, paramType)) { // An array or list + if (isArrayOrList(paramType, param)) { // An array or list for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("paramCls[pos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); - print("paramObj[pos++] = &" + param + "[i]."); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); + print("paramObj[pos++] = &" + getSimpleIdentifier(param) + "[i]."); print(getSimpleIdentifier(members.get(i))); println(";"); } println("}"); } else { // Just one struct element for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("paramCls[pos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); print("paramObj[pos++] = &" + param + "."); print(getSimpleIdentifier(members.get(i))); println(";"); @@ -2768,7 +2896,7 @@ public class IoTCompiler { /** * HELPER: writeStructParamClassCplusStub() writes member parameters of struct */ - private void writeStructParamClassCplusStub(List methParams, List methPrmTypes) { + private void writeStructParamClassCplusStub(List methParams, List methPrmTypes, Set callbackType) { print("int numParam = "); writeLengthStructParamClassCplusStub(methParams, methPrmTypes); @@ -2783,10 +2911,12 @@ public class IoTCompiler { String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { writeStructMembersCplusStub(simpleType, paramType, param); + } else if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object + println("paramCls[pos] = \"int\";"); + println("paramObj[pos++] = &___paramCB" + i + ";"); } else { - String prmTypeC = checkAndGetCplusType(methPrmTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, methParams.get(i)); - println("paramCls[pos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); print("paramObj[pos++] = &"); print(getEnumParam(methPrmTypes.get(i), getSimpleIdentifier(methParams.get(i)), i)); println(";"); @@ -2829,13 +2959,14 @@ public class IoTCompiler { /** * HELPER: writeStructReturnCplusStub() writes member parameters of struct for return statement */ - private void writeStructReturnCplusStub(String simpleType, String retType) { + private void writeStructReturnCplusStub(String simpleType, String retType, String method, InterfaceDecl intDecl) { // Minimum retLen is 1 if this is a single struct object println("int retLen = 0;"); println("void* retLenObj = { &retLen };"); // Handle the returned struct!!! - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retLenObj);"); + println("rmiComm->remoteCall(objectId, methodId, paramCls, paramObj, numParam);"); + writeWaitForReturnValueCplus(method, intDecl, "rmiComm->getReturnValue(retType, retLenObj);"); int numMem = getNumOfMembers(simpleType); println("int numRet = " + numMem + "*retLen;"); println("string retCls[numRet];"); @@ -2862,21 +2993,19 @@ public class IoTCompiler { if (isArrayOrList(retType, retType)) { // An array or list println("for(int i = 0; i < retLen; i++) {"); for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("retCls[retPos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("retCls[retPos] = \"" + prmTypeC + "\";"); println("retObj[retPos++] = &retParam" + i + "[i];"); } println("}"); } else { // Just one struct element for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("retCls[retPos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("retCls[retPos] = \"" + prmTypeC + "\";"); println("retObj[retPos++] = &retParam" + i + ";"); } } - println("rmiCall->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);"); } else @@ -2885,42 +3014,59 @@ public class IoTCompiler { } + /** + * HELPER: writeWaitForReturnValueCplus() writes the synchronization part for return values + */ + private void writeWaitForReturnValueCplus(String method, InterfaceDecl intDecl, String getReturnValue) { + + println("// Waiting for return value"); + int methodNumId = intDecl.getMethodNumId(method); + println("while (!retValueReceived" + methodNumId + ");"); + println(getReturnValue); + println("retValueReceived" + methodNumId + " = false;"); + println("didGetReturnBytes.exchange(true);\n"); + } + + /** * HELPER: writeStdMethodBodyCplusStub() writes the standard method body in the stub class */ private void writeStdMethodBodyCplusStub(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method) { + List methPrmTypes, String method, Set callbackType, boolean isCallbackMethod) { checkAndWriteStructSetupCplusStub(methParams, methPrmTypes, intDecl, method); println("int methodId = " + intDecl.getMethodNumId(method) + ";"); String retType = intDecl.getMethodType(method); - //String retTypeC = checkAndGetCplusType(retType); - //println("string retType = \"" + checkAndGetCplusArrayType(getStructType(getEnumType(retTypeC))) + "\";"); - println("string retType = \"" + retType + "\";"); + println("string retType = \"" + checkAndGetCplusRetClsType(getStructType(getEnumType(retType))) + "\";"); + checkAndWriteEnumTypeCplusStub(methParams, methPrmTypes); // Generate array of parameter types if (isStructPresent(methParams, methPrmTypes)) { - writeStructParamClassCplusStub(methParams, methPrmTypes); + writeStructParamClassCplusStub(methParams, methPrmTypes, callbackType); } else { println("int numParam = " + methParams.size() + ";"); print("string paramCls[] = { "); for (int i = 0; i < methParams.size(); i++) { - //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i)); - //String paramType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i)); - //print("\"" + getEnumType(paramType) + "\""); - String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - String prmType = getSimpleType(getEnumType(paramTypeC)); - print("\"" + prmType + "\""); + String paramType = returnGenericCallbackType(methPrmTypes.get(i)); + if (checkCallbackType(paramType, callbackType)) { + print("\"int*\""); + } else { + String paramTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); + print("\"" + paramTypeC + "\""); + } // Check if this is the last element (don't print a comma) if (i != methParams.size() - 1) { print(", "); } } println(" };"); - checkAndWriteEnumTypeCplusStub(methParams, methPrmTypes); // Generate array of parameter objects print("void* paramObj[] = { "); for (int i = 0; i < methParams.size(); i++) { - print("&" + getEnumParam(methPrmTypes.get(i), getSimpleIdentifier(methParams.get(i)), i)); + String paramType = returnGenericCallbackType(methPrmTypes.get(i)); + if (checkCallbackType(paramType, callbackType)) // Check if this has callback object + print("&___paramCB" + i); + else + print("&" + getEnumParam(methPrmTypes.get(i), getSimpleIdentifier(methParams.get(i)), i)); // Check if this is the last element (don't print a comma) if (i != methParams.size() - 1) { print(", "); @@ -2930,23 +3076,25 @@ public class IoTCompiler { } // Check if this is "void" if (retType.equals("void")) { - println("void* retObj = NULL;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); + println("rmiComm->remoteCall(objectId, methodId, paramCls, paramObj, numParam);"); } else { // We do have a return value // Generate array of parameter types if (isStructClass(getGenericType(getSimpleArrayType(retType)))) { - writeStructReturnCplusStub(getGenericType(getSimpleArrayType(retType)), retType); + writeStructReturnCplusStub(getGenericType(getSimpleArrayType(retType)), retType, method, intDecl); } else { // Check if the return value NONPRIMITIVES - if (getParamCategory(retType) == ParamCategory.ENUM) { - checkAndWriteEnumRetTypeCplusStub(retType); + if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) { + checkAndWriteEnumRetTypeCplusStub(retType, method, intDecl); } else { - if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) + //if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) + if (isArrayOrList(retType,retType)) println(checkAndGetCplusType(retType) + " retVal;"); - else + else { println(checkAndGetCplusType(retType) + " retVal = " + generateCplusInitializer(retType) + ";"); + } println("void* retObj = &retVal;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); + println("rmiComm->remoteCall(objectId, methodId, paramCls, paramObj, numParam);"); + writeWaitForReturnValueCplus(method, intDecl, "rmiComm->getReturnValue(retType, retObj);"); println("return retVal;"); } } @@ -2955,43 +3103,36 @@ public class IoTCompiler { /** - * HELPER: writePropertiesCplusStub() writes the properties of the stub class + * HELPER: writePropertiesCplusPermission() writes the properties of the stub class */ private void writePropertiesCplusPermission(String intface) { Map> mapNewIntMethods = mapInt2NewInts.get(intface); for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("const static int object" + newObjectId + "Id = " + newObjectId + ";"); - println("const static set set" + newObjectId + "Allowed;"); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("static set set" + newObjectId + "Allowed;"); } } /** * HELPER: writePropertiesCplusStub() writes the properties of the stub class */ - private void writePropertiesCplusStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { + private void writePropertiesCplusStub(String intface, String newIntface, boolean callbackExist, + Set callbackClasses, Set methods, InterfaceDecl intDecl) { - println("IoTRMICall *rmiCall;"); - //println("IoTRMIObject\t\t\t*rmiObj;"); - println("string address;"); - println("vector ports;\n"); + println("IoTRMIComm *rmiComm;"); // Get the object Id Integer objId = mapIntfaceObjId.get(intface); - println("const static int objectId = " + objId + ";"); - mapNewIntfaceObjId.put(newIntface, objId); - mapIntfaceObjId.put(intface, objId++); - if (callbackExist) { - // We assume that each class only has one callback interface for now - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("// Callback properties"); - println("IoTRMIObject *rmiObj;"); - println("vector<" + callbackType + "*> vecCallbackObj;"); - println("static int objIdCnt;"); - // Generate permission stuff for callback stubs - writePropertiesCplusPermission(callbackType); + println("int objectId = " + objId + ";"); + println("// Synchronization variables"); + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("bool retValueReceived" + methodNumId + " = false;"); + } } println("\n"); } @@ -3000,259 +3141,205 @@ public class IoTCompiler { /** * HELPER: writeConstructorCplusStub() writes the constructor of the stub class */ - private void writeConstructorCplusStub(String newStubClass, boolean callbackExist, Set callbackClasses) { - - println(newStubClass + - "(int _port, const char* _address, int _rev, bool* _bResult, vector _ports) {"); - println("address = _address;"); - println("ports = _ports;"); - println("rmiCall = new IoTRMICall(_port, _address, _rev, _bResult);"); - if (callbackExist) { - println("objIdCnt = 0;"); - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("thread th1 (&" + newStubClass + "::___initCallBack, this);"); - println("th1.detach();"); - println("___regCB();"); - } - println("}\n"); - } - + private void writeConstructorCplusStub(String newStubClass, boolean callbackExist, + Set callbackClasses, Set methods, InterfaceDecl intDecl) { - /** - * HELPER: writeDeconstructorCplusStub() writes the deconstructor of the stub class - */ - private void writeDeconstructorCplusStub(String newStubClass, boolean callbackExist, Set callbackClasses) { - - println("~" + newStubClass + "() {"); - println("if (rmiCall != NULL) {"); - println("delete rmiCall;"); - println("rmiCall = NULL;"); - println("}"); - if (callbackExist) { - // We assume that each class only has one callback interface for now - println("if (rmiObj != NULL) {"); - println("delete rmiObj;"); - println("rmiObj = NULL;"); - println("}"); - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("for(" + callbackType + "* cb : vecCallbackObj) {"); - println("delete cb;"); - println("cb = NULL;"); - println("}"); + println(newStubClass + "::" + newStubClass + + "(int _portSend, int _portRecv, const char* _skeletonAddress, int _rev, bool* _bResult) {"); + println("rmiComm = new IoTRMICommClient(_portSend, _portRecv, _skeletonAddress, _rev, _bResult);"); + // Register the AtomicBoolean variables + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("rmiComm->registerStub(objectId, " + methodNumId + ", &retValueReceived" + methodNumId + ");"); + } } - println("}"); - println(""); + println("IoTRMIUtil::mapStub->insert(make_pair(objectId, this));"); + println("}\n"); } /** - * HELPER: writeCplusMethodCallbackPermission() writes permission checks in stub for callbacks + * HELPER: writeCallbackConstructorCplusStub() writes the callback constructor of the stub class */ - private void writeCplusMethodCallbackPermission(String intface) { + private void writeCallbackConstructorCplusStub(String newStubClass, boolean callbackExist, + Set callbackClasses, Set methods, InterfaceDecl intDecl) { - println("int methodId = IoTRMIObject::getMethodId(method);"); - // Get all the different stubs - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("if (set" + newObjectId + "Allowed.find(methodId) == set" + newObjectId + "Allowed.end()) {"); - println("cerr << \"Callback object for " + intface + " is not allowed to access method: \" << methodId;"); - println("exit(-1);"); - println("}"); + println(newStubClass + "::" + newStubClass + "(IoTRMIComm* _rmiComm, int _objectId) {"); + println("rmiComm = _rmiComm;"); + println("objectId = _objectId;"); + // Register the AtomicBoolean variables + for (String method : methods) { + // Generate AtomicBooleans for methods that have return values + String returnType = intDecl.getMethodType(method); + int methodNumId = intDecl.getMethodNumId(method); + if (!returnType.equals("void")) { + println("rmiComm->registerStub(objectId, " + methodNumId + ", &retValueReceived" + methodNumId + ");"); + } } + println("}\n"); } /** - * HELPER: writeInitCallbackCplusStub() writes the initialization of callback + * HELPER: writeDeconstructorCplusStub() writes the deconstructor of the stub class */ - private void writeInitCallbackCplusStub(String intface, InterfaceDecl intDecl) { + private void writeDeconstructorCplusStub(String newStubClass, boolean callbackExist, Set callbackClasses) { - println("void ___initCallBack() {"); - println("bool bResult = false;"); - println("rmiObj = new IoTRMIObject(ports[0], &bResult);"); - println("while (true) {"); - println("char* method = rmiObj->getMethodBytes();"); - writeCplusMethodCallbackPermission(intface); - println("int objId = IoTRMIObject::getObjectId(method);"); - println("if (objId < vecCallbackObj.size()) { // Check if still within range"); - println(intface + "_CallbackSkeleton* skel = dynamic_cast<" + intface + - "_CallbackSkeleton*> (vecCallbackObj.at(objId));"); - println("skel->invokeMethod(rmiObj);"); - println("} else {"); - println("cerr << \"Illegal object Id: \" << to_string(objId);"); - // TODO: perhaps need to change this into "throw" to make it cleaner (allow stack unfolding) - println("exit(-1);"); + println(newStubClass + "::~" + newStubClass + "() {"); + println("if (rmiComm != NULL) {"); + println("delete rmiComm;"); + println("rmiComm = NULL;"); println("}"); println("}"); - println("}\n"); - } - - - /** - * HELPER: writeInitCallbackSendInfoCplusStub() writes the initialization (send info part) of callback - */ - private void writeInitCallbackSendInfoCplusStub(InterfaceDecl intDecl) { - - // Generate info sending part - println("void ___regCB() {"); - println("int numParam = 3;"); - String method = "___initCallBack()"; - println("int methodId = " + intDecl.getHelperMethodNumId(method) + ";"); - println("string retType = \"void\";"); - println("string paramCls[] = { \"int\", \"string\", \"int\" };"); - println("int rev = 0;"); - println("void* paramObj[] = { &ports[0], &address, &rev };"); - println("void* retObj = NULL;"); - println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); - println("}\n"); + println(""); } /** - * generateCPlusStubClasses() generate stubs based on the methods list in C++ + * generateCPlusStubClassesHpp() generate stubs based on the methods list in C++ (.hpp file) */ - public void generateCPlusStubClasses() throws IOException { + public void generateCPlusStubClassesHpp() throws IOException { // Create a new directory String path = createDirectories(dir, subdir); for (String intface : mapIntfacePTH.keySet()) { - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - // Open a new file to write into - String newIntface = intMeth.getKey(); - String newStubClass = newIntface + "_Stub"; - FileWriter fw = new FileWriter(path + "/" + newStubClass + ".hpp"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Write file headers - println("#ifndef _" + newStubClass.toUpperCase() + "_HPP__"); - println("#define _" + newStubClass.toUpperCase() + "_HPP__"); - println("#include "); - // Find out if there are callback objects - Set methods = intMeth.getValue(); - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - if (callbackExist) // Need thread library if this has callback + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + String driverClass = drvList.get(i); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + // Open a new file to write into + String newIntface = intMeth.getKey(); + String newStubClass = newIntface + "_Stub"; + // Check if this interface is a callback class + if(isCallbackClass(intface)) + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + else + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + FileWriter fw = new FileWriter(path + "/" + newStubClass + ".hpp"); + pw = new PrintWriter(new BufferedWriter(fw)); + // Write file headers + println("#ifndef _" + newStubClass.toUpperCase() + "_HPP__"); + println("#define _" + newStubClass.toUpperCase() + "_HPP__"); + println("#include "); + // Find out if there are callback objects + Set methods = intMeth.getValue(); + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); println("#include "); - println("#include \"" + newIntface + ".hpp\""); println(""); - println("using namespace std;"); println(""); - println("class " + newStubClass + " : public " + newIntface); println("{"); - println("private:\n"); - writePropertiesCplusStub(intface, newIntface, callbackExist, callbackClasses); - println("public:\n"); - // Add default constructor and destructor - println(newStubClass + "() { }"); println(""); - writeConstructorCplusStub(newStubClass, callbackExist, callbackClasses); - writeDeconstructorCplusStub(newStubClass, callbackExist, callbackClasses); - // Write methods - writeMethodCplusStub(methods, intDecl, callbackClasses); - print("}"); println(";"); - if (callbackExist) - writePermissionInitializationCplus(intface, newStubClass, intDecl); - println("#endif"); - pw.close(); - System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".hpp..."); + println("#include "); + List stdIncludeClasses = getStandardCplusIncludeClasses(); + printIncludeStatements(stdIncludeClasses); println(""); + println("#include \"" + newIntface + ".hpp\""); println(""); + println("using namespace std;"); println(""); + println("class " + newStubClass + " : public " + newIntface); println("{"); + println("private:\n"); + writePropertiesCplusStub(intface, newIntface, callbackExist, callbackClasses, methods, intDecl); + println("public:\n"); + // Add default constructor and destructor + println(newStubClass + "();"); + // Declarations + println(newStubClass + "(int _portSend, int _portRecv, const char* _skeletonAddress, int _rev, bool* _bResult);"); + println(newStubClass + "(IoTRMIComm* _rmiComm, int _objectId);"); + println("~" + newStubClass + "();"); + // Write methods + writeMethodDeclCplusStub(methods, intDecl); + print("}"); println(";"); + println("#endif"); + pw.close(); + System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".hpp..."); + } } } } /** - * HELPER: writePropertiesCplusCallbackStub() writes the properties of the stub class + * writeStubExternalCFunctions() generate external functions for .so file */ - private void writePropertiesCplusCallbackStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { + public void writeStubExternalCFunctions(String newStubClass) throws IOException { - println("IoTRMICall *rmiCall;"); - // Get the object Id - println("static int objectId;"); - if (callbackExist) { - // We assume that each class only has one callback interface for now - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("// Callback properties"); - println("IoTRMIObject *rmiObj;"); - println("vector<" + callbackType + "*> vecCallbackObj;"); - println("static int objIdCnt;"); - // TODO: Need to initialize address and ports if we want to have callback-in-callback - println("string address;"); - println("vector ports;\n"); - writePropertiesCplusPermission(callbackType); - } - println("\n"); - } - - - /** - * HELPER: writeConstructorCplusCallbackStub() writes the constructor of the stub class - */ - private void writeConstructorCplusCallbackStub(String newStubClass, boolean callbackExist, Set callbackClasses) { - - println(newStubClass + "(IoTRMICall* _rmiCall, int _objectId) {"); - println("objectId = _objectId;"); - println("rmiCall = _rmiCall;"); - if (callbackExist) { - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - println("thread th1 (&" + newStubClass + "::___initCallBack, this);"); - println("th1.detach();"); - println("___regCB();"); - } + println("extern \"C\" void* create" + newStubClass + "(void** params) {"); + println("// Args: int _portSend, int _portRecv, const char* _skeletonAddress, int _rev, bool* _bResult"); + println("return new " + newStubClass + "(*((int*) params[0]), *((int*) params[1]), ((string*) params[2])->c_str(), " + + "*((int*) params[3]), (bool*) params[4]);"); + println("}\n"); + println("extern \"C\" void destroy" + newStubClass + "(void* t) {"); + println(newStubClass + "* obj = (" + newStubClass + "*) t;"); + println("delete obj;"); + println("}\n"); + println("extern \"C\" void init" + newStubClass + "(void* t) {"); println("}\n"); } /** - * generateCPlusCallbackStubClasses() generate callback stubs based on the methods list in C++ + * generateCPlusStubClassesCpp() generate stubs based on the methods list in C++ (.cpp file) */ - public void generateCPlusCallbackStubClasses() throws IOException { + public void generateCPlusStubClassesCpp() throws IOException { // Create a new directory String path = createDirectories(dir, subdir); for (String intface : mapIntfacePTH.keySet()) { - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - // Open a new file to write into - String newIntface = intMeth.getKey(); - String newStubClass = newIntface + "_CallbackStub"; - FileWriter fw = new FileWriter(path + "/" + newStubClass + ".hpp"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Find out if there are callback objects - Set methods = intMeth.getValue(); - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write file headers - println("#ifndef _" + newStubClass.toUpperCase() + "_HPP__"); - println("#define _" + newStubClass.toUpperCase() + "_HPP__"); - println("#include "); - if (callbackExist) - println("#include "); - println("#include \"" + newIntface + ".hpp\""); println(""); - println("using namespace std;"); println(""); - println("class " + newStubClass + " : public " + newIntface); println("{"); - println("private:\n"); - writePropertiesCplusCallbackStub(intface, newIntface, callbackExist, callbackClasses); - println("public:\n"); - // Add default constructor and destructor - println(newStubClass + "() { }"); println(""); - writeConstructorCplusCallbackStub(newStubClass, callbackExist, callbackClasses); - writeDeconstructorCplusStub(newStubClass, callbackExist, callbackClasses); - // Write methods - writeMethodCplusStub(methods, intDecl, callbackClasses); - println("};"); - if (callbackExist) - writePermissionInitializationCplus(intface, newStubClass, intDecl); - println("#endif"); - pw.close(); - System.out.println("IoTCompiler: Generated callback stub class " + newIntface + ".hpp..."); + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + String driverClass = drvList.get(i); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + // Open a new file to write into + String newIntface = intMeth.getKey(); + String newStubClass = newIntface + "_Stub"; + // Check if this interface is a callback class + if(isCallbackClass(intface)) + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + else + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + FileWriter fw = new FileWriter(path + "/" + newStubClass + ".cpp"); + pw = new PrintWriter(new BufferedWriter(fw)); + // Write file headers + println("#include "); + // Find out if there are callback objects + Set methods = intMeth.getValue(); + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); + println("#include \"" + newStubClass + ".hpp\""); println(""); + for(String str: callbackClasses) { + if (intface.equals(mainClass)) + println("#include \"" + str + "_Skeleton.cpp\"\n"); + else + println("#include \"" + str + "_Skeleton.hpp\"\n"); + } + println("using namespace std;"); println(""); + // Add default constructor and destructor + writeConstructorCplusStub(newStubClass, callbackExist, callbackClasses, methods, intDecl); + writeCallbackConstructorCplusStub(newStubClass, callbackExist, callbackClasses, methods, intDecl); + writeDeconstructorCplusStub(newStubClass, callbackExist, callbackClasses); + // Write methods + writeMethodCplusStub(methods, intDecl, callbackClasses, newStubClass); + // Write external functions for .so file + writeStubExternalCFunctions(newStubClass); + // TODO: Remove this later + if (intface.equals(mainClass)) { + println("int main() {"); + println("return 0;"); + println("}"); + } + pw.close(); + System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".cpp..."); + } } } } @@ -3264,23 +3351,30 @@ public class IoTCompiler { private void writePropertiesCplusSkeleton(String intface, boolean callbackExist, Set callbackClasses) { println(intface + " *mainObj;"); - // Callback - if (callbackExist) { - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - String exchangeType = checkAndGetParamClass(callbackType); - println("// Callback properties"); - println("static int objIdCnt;"); - println("vector<" + exchangeType + "*> vecCallbackObj;"); - println("IoTRMICall *rmiCall;"); - } - println("IoTRMIObject *rmiObj;\n"); + println("IoTRMIComm *rmiComm;"); + println("char* methodBytes;"); + println("int methodLen;"); + Integer objId = mapIntfaceObjId.get(intface); + println("int objectId = " + objId + ";"); // Keep track of object Ids of all stubs registered to this interface writePropertiesCplusPermission(intface); + println("// Synchronization variables"); + println("bool methodReceived = false;"); + println("bool didAlreadyInitWaitInvoke = false;"); println("\n"); } + /** + * HELPER: writeObjectIdCountInitializationCplus() writes the initialization of objIdCnt variable + */ + private void writeObjectIdCountInitializationCplus(String newSkelClass, boolean callbackExist) { + + if (callbackExist) + println("int " + newSkelClass + "::objIdCnt = 0;"); + } + + /** * HELPER: writePermissionInitializationCplus() writes the initialization of permission set */ @@ -3290,8 +3384,8 @@ public class IoTCompiler { Map> mapNewIntMethods = mapInt2NewInts.get(intface); for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - print("const set " + newSkelClass + "::set" + newObjectId + "Allowed {"); + int newObjectId = getNewIntfaceObjectId(newIntface); + print("set " + newSkelClass + "::set" + newObjectId + "Allowed { "); Set methodIds = intMeth.getValue(); int i = 0; for (String methodId : methodIds) { @@ -3309,20 +3403,67 @@ public class IoTCompiler { /** - * HELPER: writeConstructorCplusSkeleton() writes the constructor of the skeleton class + * HELPER: writeStructPermissionCplusSkeleton() writes permission for struct helper + */ + private void writeStructPermissionCplusSkeleton(Collection methods, InterfaceDecl intDecl, String intface) { + + // Use this set to handle two same methodIds + for (String method : methods) { + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + int methodNumId = intDecl.getMethodNumId(method); + String helperMethod = methodNumId + "struct" + i; + int helperMethodNumId = intDecl.getHelperMethodNumId(helperMethod); + // Iterate over interfaces to give permissions to + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + String newIntface = intMeth.getKey(); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("set" + newObjectId + "Allowed.insert(" + helperMethodNumId + ");"); + } + } + } + } + } + + + /** + * HELPER: writeConstructorCplusSkeleton() writes the constructor of the skeleton class + */ + private void writeConstructorCplusSkeleton(String newSkelClass, String intface, boolean callbackExist, InterfaceDecl intDecl, Collection methods) { + + println(newSkelClass + "::" + newSkelClass + "(" + intface + " *_mainObj, int _portSend, int _portRecv) {"); + println("bool _bResult = false;"); + println("mainObj = _mainObj;"); + println("rmiComm = new IoTRMICommServer(_portSend, _portRecv, &_bResult);"); + println("IoTRMIUtil::mapSkel->insert(make_pair(_mainObj, this));"); + println("IoTRMIUtil::mapSkelId->insert(make_pair(_mainObj, objectId));"); + println("rmiComm->registerSkeleton(objectId, &methodReceived);"); + writeStructPermissionCplusSkeleton(methods, intDecl, intface); + println("thread th1 (&" + newSkelClass + "::___waitRequestInvokeMethod, this, this);"); + println("th1.join();"); + println("}\n"); + } + + + /** + * HELPER: writeCallbackConstructorCplusSkeleton() writes the callback constructor of the skeleton class */ - private void writeConstructorCplusSkeleton(String newSkelClass, String intface, boolean callbackExist) { + private void writeCallbackConstructorCplusSkeleton(String newSkelClass, String intface, boolean callbackExist, InterfaceDecl intDecl, Collection methods) { - println(newSkelClass + "(" + intface + " *_mainObj, int _port) {"); + println(newSkelClass + "::" + newSkelClass + "(" + intface + " *_mainObj, IoTRMIComm *_rmiComm, int _objectId) {"); println("bool _bResult = false;"); println("mainObj = _mainObj;"); - println("rmiObj = new IoTRMIObject(_port, &_bResult);"); - // Callback - if (callbackExist) { - println("objIdCnt = 0;"); - } - //println("set0Allowed = Arrays.asList(object0Permission);"); - println("___waitRequestInvokeMethod();"); + println("rmiComm = _rmiComm;"); + println("objectId = _objectId;"); + println("rmiComm->registerSkeleton(objectId, &methodReceived);"); + writeStructPermissionCplusSkeleton(methods, intDecl, intface); println("}\n"); } @@ -3332,25 +3473,11 @@ public class IoTCompiler { */ private void writeDeconstructorCplusSkeleton(String newSkelClass, boolean callbackExist, Set callbackClasses) { - println("~" + newSkelClass + "() {"); - println("if (rmiObj != NULL) {"); - println("delete rmiObj;"); - println("rmiObj = NULL;"); + println(newSkelClass + "::~" + newSkelClass + "() {"); + println("if (rmiComm != NULL) {"); + println("delete rmiComm;"); + println("rmiComm = NULL;"); println("}"); - if (callbackExist) { - // We assume that each class only has one callback interface for now - println("if (rmiCall != NULL) {"); - println("delete rmiCall;"); - println("rmiCall = NULL;"); - println("}"); - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - String exchangeType = checkAndGetParamClass(callbackType); - println("for(" + exchangeType + "* cb : vecCallbackObj) {"); - println("delete cb;"); - println("cb = NULL;"); - println("}"); - } println("}"); println(""); } @@ -3378,31 +3505,10 @@ public class IoTCompiler { /** - * HELPER: writeInitCallbackCplusSkeleton() writes the init callback method for skeleton class - */ - private void writeInitCallbackCplusSkeleton(boolean callbackSkeleton) { - - // This is a callback skeleton generation - if (callbackSkeleton) - println("void ___regCB(IoTRMIObject* rmiObj) {"); - else - println("void ___regCB() {"); - println("int numParam = 3;"); - println("int param1 = 0;"); - println("string param2 = \"\";"); - println("int param3 = 0;"); - println("void* paramObj[] = { ¶m1, ¶m2, ¶m3 };"); - println("bool bResult = false;"); - println("rmiCall = new IoTRMICall(param1, param2.c_str(), param3, &bResult);"); - println("}\n"); - } - - - /** - * HELPER: writeMethodCplusSkeleton() writes the method of the skeleton class + * HELPER: writeMethodDeclCplusSkeleton() writes the method declaration of the skeleton class */ - private void writeMethodCplusSkeleton(Collection methods, InterfaceDecl intDecl, - Set callbackClasses, boolean callbackSkeleton) { + private void writeMethodDeclCplusSkeleton(Collection methods, InterfaceDecl intDecl, + Set callbackClasses) { for (String method : methods) { @@ -3429,12 +3535,39 @@ public class IoTCompiler { print(", "); } } + println(");"); + } + } + + + /** + * HELPER: writeMethodCplusSkeleton() writes the method of the skeleton class + */ + private void writeMethodCplusSkeleton(Collection methods, InterfaceDecl intDecl, String newSkelClass) { + + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + String methodId = intDecl.getMethodId(method); + String methodType = checkAndGetCplusType(intDecl.getMethodType(method)); + print(methodType + " " + newSkelClass + "::" + methodId + "("); + for (int i = 0; i < methParams.size(); i++) { + + String origParamType = methPrmTypes.get(i); + String paramType = checkAndGetParamClass(methPrmTypes.get(i)); + String methPrmType = checkAndGetCplusType(paramType); + String methParamComplete = checkAndGetCplusArray(methPrmType, methParams.get(i)); + print(methParamComplete); + // Check if this is the last element (don't print a comma) + if (i != methParams.size() - 1) { + print(", "); + } + } println(") {"); // Now, write the body of skeleton! writeStdMethodBodyCplusSkeleton(methParams, methodId, intDecl.getMethodType(method)); println("}\n"); - if (isCallbackMethod) - writeInitCallbackCplusSkeleton(callbackSkeleton); } } @@ -3442,25 +3575,40 @@ public class IoTCompiler { /** * HELPER: writeCallbackCplusNumStubs() writes the numStubs variable */ - private void writeCallbackCplusNumStubs(List methParams, List methPrmTypes, String callbackType) { + private void writeCallbackCplusNumStubs(List methParams, List methPrmTypes, Set callbackType) { 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 - String exchParamType = checkAndGetParamClass(paramType); - // Print array if this is array or list if this is a list of callback objects - println("int numStubs" + i + " = 0;"); - } + if (checkCallbackType(paramType, callbackType)) // Check if this has callback object + println("vector numStubIdArray" + i + ";"); } } + /** + * HELPER: writeCallbackInstantiationCplusStubGeneration() writes the instantiation of callback stubs + */ + private void writeCallbackInstantiationCplusStubGeneration(String exchParamType, int counter) { + + println(exchParamType + "* newStub" + counter + " = NULL;"); + println("auto it" + counter + " = IoTRMIUtil::mapStub->find(objIdRecv" + counter + ");"); + println("if (it" + counter + " == IoTRMIUtil::mapStub->end()) {"); + println("newStub" + counter + " = new " + exchParamType + "_Stub(rmiComm, objIdRecv" + counter + ");"); + println("IoTRMIUtil::mapStub->insert(make_pair(objIdRecv" + counter + ", newStub" + counter + "));"); + println("rmiComm->setObjectIdCounter(objIdRecv" + counter + ");"); + println("rmiComm->decrementObjectIdCounter();"); + println("}"); + println("else {"); + println("newStub" + counter + " = (" + exchParamType + "_Stub*) it" + counter + "->second;"); + println("}"); + } + + /** * HELPER: writeCallbackCplusStubGeneration() writes the callback stub generation part */ - private void writeCallbackCplusStubGeneration(List methParams, List methPrmTypes, String callbackType) { + private void writeCallbackCplusStubGeneration(List methParams, List methPrmTypes, Set callbackType) { // Iterate over callback objects for (int i = 0; i < methParams.size(); i++) { @@ -3468,19 +3616,18 @@ public class IoTCompiler { String param = methParams.get(i); // Generate a loop if needed if (checkCallbackType(paramType, callbackType)) { // Check if this has callback object - String exchParamType = checkAndGetParamClass(paramType); + String exchParamType = checkAndGetParamClass(getGenericType(paramType)); if (isArrayOrList(paramType, param)) { - println("vector<" + exchParamType + "> stub;"); - println("for (int objId = 0; objId < numStubs" + i + "; objId++) {"); - println(exchParamType + "* cb" + i + " = new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt);"); - println("stub" + i + ".push_back(cb);"); - println("vecCallbackObj.push_back(cb);"); - println("objIdCnt++;"); + println("vector<" + exchParamType + "*> stub" + i + ";"); + println("for (int i = 0; i < numStubIdArray" + i + ".size(); i++) {"); + println("int objIdRecv" + i + " = numStubIdArray" + i + "[i];"); + writeCallbackInstantiationCplusStubGeneration(exchParamType, i); + println("stub" + i + ".push_back(newStub" + i + ");"); println("}"); } else { - println(exchParamType + "* stub" + i + " = new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt);"); - println("vecCallbackObj.push_back(stub" + i + ");"); - println("objIdCnt++;"); + println("int objIdRecv" + i + " = numStubIdArray" + i + "[0];"); + writeCallbackInstantiationCplusStubGeneration(exchParamType, i); + println(exchParamType + "* stub" + i + " = newStub" + i + ";"); } } } @@ -3496,7 +3643,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isEnumClass(simpleType)) { // Check if this is enum type if (isArrayOrList(paramType, param)) { // An array @@ -3520,10 +3667,10 @@ public class IoTCompiler { private void checkAndWriteEnumRetTypeCplusSkeleton(String retType) { // Strips off array "[]" for return type - String pureType = getSimpleArrayType(getSimpleType(retType)); + String pureType = getSimpleArrayType(getGenericType(retType)); // Take the inner type of generic if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(retType)[0]; + pureType = getGenericType(retType); if (isEnumClass(pureType)) { // Check if this is enum type // Enum decoder @@ -3542,7 +3689,7 @@ public class IoTCompiler { /** - * HELPER: writeMethodHelperReturnCplusSkeleton() writes the return statement part in skeleton + * HELPER: writeMethodInputParameters() writes the parameter variables for C++ skeleton */ private void writeMethodInputParameters(List methParams, List methPrmTypes, Set callbackClasses, String methodId) { @@ -3552,9 +3699,9 @@ public class IoTCompiler { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(paramType)) print("stub" + i); - else if (isEnumClass(getSimpleType(paramType))) // Check if this is enum type + else if (isEnumClass(getGenericType(paramType))) // Check if this is enum type print("paramEnum" + i); - else if (isStructClass(getSimpleType(paramType))) // Struct type + else if (isStructClass(getGenericType(paramType))) // Struct type print("paramStruct" + i); else print(getSimpleIdentifier(methParams.get(i))); @@ -3570,10 +3717,10 @@ public class IoTCompiler { * HELPER: writeMethodHelperReturnCplusSkeleton() writes the return statement part in skeleton */ private void writeMethodHelperReturnCplusSkeleton(InterfaceDecl intDecl, List methParams, - List methPrmTypes, String method, boolean isCallbackMethod, String callbackType, + List methPrmTypes, String method, boolean isCallbackMethod, Set callbackType, String methodId, Set callbackClasses) { - println("rmiObj->getMethodParams(paramCls, numParam, paramObj);"); + println("rmiComm->getMethodParams(paramCls, numParam, paramObj, localMethodBytes);"); if (isCallbackMethod) writeCallbackCplusStubGeneration(methParams, methPrmTypes, callbackType); checkAndWriteEnumTypeCplusSkeleton(methParams, methPrmTypes); @@ -3584,27 +3731,26 @@ public class IoTCompiler { if (retType.equals("void")) { writeMethodInputParameters(methParams, methPrmTypes, callbackClasses, methodId); } else { // We do have a return value - if (isEnumClass(getSimpleArrayType(getSimpleType(retType)))) // Enum type + if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) // Enum type print(checkAndGetCplusType(retType) + " retEnum = "); - else if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) // Struct type + else if (isStructClass(getSimpleArrayType(getGenericType(retType)))) // Struct type print(checkAndGetCplusType(retType) + " retStruct = "); else print(checkAndGetCplusType(retType) + " retVal = "); writeMethodInputParameters(methParams, methPrmTypes, callbackClasses, methodId); checkAndWriteEnumRetTypeCplusSkeleton(retType); - if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) // Struct type - writeStructReturnCplusSkeleton(getSimpleArrayType(getSimpleType(retType)), retType); - if (isEnumClass(getSimpleArrayType(getSimpleType(retType)))) // Enum type + if (isStructClass(getSimpleArrayType(getGenericType(retType)))) // Struct type + writeStructReturnCplusSkeleton(getSimpleArrayType(getGenericType(retType)), retType); + if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) // Enum type println("void* retObj = &retEnumInt;"); else - if (!isStructClass(getSimpleArrayType(getSimpleType(retType)))) // Struct type + if (!isStructClass(getSimpleArrayType(getGenericType(retType)))) // Struct type println("void* retObj = &retVal;"); String retTypeC = checkAndGetCplusType(retType); - if (isStructClass(getSimpleArrayType(getSimpleType(retType)))) // Struct type - println("rmiObj->sendReturnObj(retObj, retCls, numRetObj);"); + if (isStructClass(getSimpleArrayType(getGenericType(retType)))) // Struct type + println("rmiComm->sendReturnObj(retObj, retCls, numRetObj, localMethodBytes);"); else - //println("rmiObj->sendReturnObj(retObj, \"" + getEnumType(checkAndGetCplusArrayType(retTypeC)) + "\");"); - println("rmiObj->sendReturnObj(retObj, \"" + getEnumType(retType) + "\");"); + println("rmiComm->sendReturnObj(retObj, \"" + checkAndGetCplusRetClsType(getEnumType(retType)) + "\", localMethodBytes);"); } } @@ -3617,21 +3763,17 @@ public class IoTCompiler { // Generate array of parameter types boolean isCallbackMethod = false; - String callbackType = null; + Set callbackType = new HashSet(); 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; - print("\"int\""); + callbackType.add(paramType); + print("\"int*\""); } else { // Generate normal classes if it's not a callback object - //String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i)); - //String prmType = checkAndGetCplusArrayType(paramTypeC, methParams.get(i)); - //print("\"" + getEnumType(prmType) + "\""); - String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - String prmType = getSimpleType(getEnumType(paramTypeC)); - print("\"" + prmType + "\""); + String paramTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); + print("\"" + paramTypeC + "\""); } if (i != methParams.size() - 1) { print(", "); @@ -3645,12 +3787,13 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); if (!callbackClasses.contains(paramType)) { - String methPrmType = checkAndGetCplusType(methPrmTypes.get(i)); - if (isEnumClass(getSimpleType(methPrmType))) { // Check if this is enum type + String methParamType = methPrmTypes.get(i); + if (isEnumClass(getSimpleArrayType(getGenericType(methParamType)))) { + // Check if this is enum type println("vector paramEnumInt" + i + ";"); } else { + String methPrmType = checkAndGetCplusType(methParamType); String methParamComplete = checkAndGetCplusArray(methPrmType, methParams.get(i)); - //println(methParamComplete + " = " + generateCplusInitializer(methPrmType) + ";"); println(methParamComplete + ";"); } } @@ -3660,8 +3803,8 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(paramType)) - print("&numStubs" + i); - else if (isEnumClass(getSimpleType(paramType))) // Check if this is enum type + print("&numStubIdArray" + i); + else if (isEnumClass(getGenericType(paramType))) // Check if this is enum type print("¶mEnumInt" + i); else print("&" + getSimpleIdentifier(methParams.get(i))); @@ -3688,39 +3831,35 @@ public class IoTCompiler { List members = structDecl.getMembers(simpleType); int methodNumId = intDecl.getMethodNumId(method); String counter = "struct" + methodNumId + "Size" + iVar; - if (isArrayOrList(param, paramType)) { // An array or list - println("for(int i = 0; i < " + counter + "; i++) {"); - } // Set up variables - if (isArrayOrList(param, paramType)) { // An array or list + if (isArrayOrList(paramType, param)) { // An array or list for (int i = 0; i < members.size(); i++) { String prmTypeC = checkAndGetCplusType(memTypes.get(i)); String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println(getSimpleType(getEnumType(prmType)) + " param" + i + "[" + counter + "];"); + println(getSimpleType(getEnumType(prmType)) + " param" + iVar + i + "[" + counter + "];"); } } else { // Just one struct element for (int i = 0; i < members.size(); i++) { String prmTypeC = checkAndGetCplusType(memTypes.get(i)); String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println(getSimpleType(getEnumType(prmType)) + " param" + i + ";"); + println(getSimpleType(getEnumType(prmType)) + " param" + iVar + i + ";"); } } - println("int pos = 0;"); - if (isArrayOrList(param, paramType)) { // An array or list - println("for(int i = 0; i < retLen; i++) {"); + if (isArrayOrList(paramType, param)) { // An array or list + println("for(int i = 0; i < " + counter + "; i++) {"); + } + if (isArrayOrList(paramType, param)) { // An array or list for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("paramCls[pos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); - println("paramObj[pos++] = ¶m" + i + "[i];"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); + println("paramObj[pos++] = ¶m" + iVar + i + "[i];"); } println("}"); } else { // Just one struct element for (int i = 0; i < members.size(); i++) { - String prmTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(prmTypeC, members.get(i)); - println("paramCls[pos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); - println("paramObj[pos++] = ¶m" + i + ";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); + println("paramObj[pos++] = ¶m" + iVar + i + ";"); } } } @@ -3740,25 +3879,25 @@ public class IoTCompiler { int methodNumId = intDecl.getMethodNumId(method); String counter = "struct" + methodNumId + "Size" + i; // Declaration - if (isArrayOrList(param, paramType)) { // An array or list - println("vector<" + simpleType + "> paramStruct" + i + ";"); + if (isArrayOrList(paramType, param)) { // An array or list + println("vector<" + simpleType + "> paramStruct" + i + "(" + counter + ");"); } else println(simpleType + " paramStruct" + i + ";"); // Initialize members StructDecl structDecl = getStructDecl(simpleType); List members = structDecl.getMembers(simpleType); List memTypes = structDecl.getMemberTypes(simpleType); - if (isArrayOrList(param, paramType)) { // An array or list + if (isArrayOrList(paramType, param)) { // An array or list println("for(int i = 0; i < " + counter + "; i++) {"); for (int j = 0; j < members.size(); j++) { print("paramStruct" + i + "[i]." + getSimpleIdentifier(members.get(j))); - println(" = param" + j + "[i];"); + println(" = param" + i + j + "[i];"); } println("}"); } else { // Just one struct element for (int j = 0; j < members.size(); j++) { print("paramStruct" + i + "." + getSimpleIdentifier(members.get(j))); - println(" = param" + j + ";"); + println(" = param" + i + j + ";"); } } } @@ -3777,7 +3916,7 @@ public class IoTCompiler { else // Just single struct object println("int retLen = 1;"); println("void* retLenObj = &retLen;"); - println("rmiObj->sendReturnObj(retLenObj, \"int\");"); + println("rmiComm->sendReturnObj(retLenObj, \"int\", localMethodBytes);"); int numMem = getNumOfMembers(simpleType); println("int numRetObj = " + numMem + "*retLen;"); println("string retCls[numRetObj];"); @@ -3790,9 +3929,8 @@ public class IoTCompiler { if (isArrayOrList(retType, retType)) { // An array or list println("for(int i = 0; i < retLen; i++) {"); for (int i = 0; i < members.size(); i++) { - String paramTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(paramTypeC, members.get(i)); - println("retCls[retPos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("retCls[retPos] = \"" + prmTypeC + "\";"); print("retObj[retPos++] = &retStruct[i]."); print(getEnumParam(memTypes.get(i), getSimpleIdentifier(members.get(i)), i)); println(";"); @@ -3800,9 +3938,8 @@ public class IoTCompiler { println("}"); } else { // Just one struct element for (int i = 0; i < members.size(); i++) { - String paramTypeC = checkAndGetCplusType(memTypes.get(i)); - String prmType = checkAndGetCplusArrayType(paramTypeC, members.get(i)); - println("retCls[retPos] = \"" + getSimpleType(getEnumType(prmType)) + "\";"); + String prmTypeC = checkAndGetCplusArgClsType(memTypes.get(i), members.get(i)); + println("retCls[retPos] = \"" + prmTypeC + "\";"); print("retObj[retPos++] = &retStruct."); print(getEnumParam(memTypes.get(i), getSimpleIdentifier(members.get(i)), i)); println(";"); @@ -3820,12 +3957,13 @@ public class IoTCompiler { // Generate array of parameter objects boolean isCallbackMethod = false; - String callbackType = null; + Set callbackType = new HashSet(); print("int numParam = "); writeLengthStructParamClassSkeleton(methParams, methPrmTypes, method, intDecl); println(";"); println("string paramCls[numParam];"); println("void* paramObj[numParam];"); + println("int pos = 0;"); // Iterate again over the parameters for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); @@ -3837,22 +3975,22 @@ public class IoTCompiler { String prmType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(prmType)) { isCallbackMethod = true; - callbackType = paramType; - writeCallbackCplusNumStubs(methParams, methPrmTypes, callbackType); - println("paramCls[pos] = \"int\";"); - println("paramObj[pos++] = &numStubs" + i + ";"); + callbackType.add(prmType); + println("vector numStubIdArray" + i + ";"); + println("paramCls[pos] = \"int*\";"); + println("paramObj[pos++] = &numStubIdArray" + i + ";"); } else { // Generate normal classes if it's not a callback object String paramTypeC = checkAndGetCplusType(methPrmTypes.get(i)); - String prmTypeC = checkAndGetCplusArrayType(paramTypeC, methParams.get(i)); - if (isEnumClass(getSimpleType(paramTypeC))) { // Check if this is enum type + if (isEnumClass(getGenericType(paramTypeC))) { // Check if this is enum type println("vector paramEnumInt" + i + ";"); } else { String methParamComplete = checkAndGetCplusArray(paramTypeC, methParams.get(i)); println(methParamComplete + ";"); } - println("paramCls[pos] = \"" + getEnumType(prmTypeC) + "\";"); - if (isEnumClass(getSimpleType(paramType))) // Check if this is enum type - println("paramObj[pos++] = ¶mEnumInt" + i); + String prmTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); + println("paramCls[pos] = \"" + prmTypeC + "\";"); + if (isEnumClass(getGenericType(paramType))) // Check if this is enum type + println("paramObj[pos++] = ¶mEnumInt" + i + ";"); else println("paramObj[pos++] = &" + getSimpleIdentifier(methParams.get(i)) + ";"); } @@ -3865,9 +4003,9 @@ public class IoTCompiler { /** - * HELPER: writeMethodHelperCplusSkeleton() writes the method helper of the skeleton class + * HELPER: writeMethodHelperDeclCplusSkeleton() writes the method helper declarations of the skeleton class */ - private void writeMethodHelperCplusSkeleton(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { + private void writeMethodHelperDeclCplusSkeleton(Collection methods, InterfaceDecl intDecl, String newSkelClass) { // Use this set to handle two same methodIds Set uniqueMethodIds = new HashSet(); @@ -3889,21 +4027,117 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { // Print size variables String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { - if (!begin) { // Generate comma for not the beginning variable - print(", "); begin = false; - } + if (!begin) // Generate comma for not the beginning variable + print(", "); + else + begin = false; + int methodNumId = intDecl.getMethodNumId(method); + print("int struct" + methodNumId + "Size" + i); + } + } + println(", " + newSkelClass + "* skel);"); + } else { + String methodId = intDecl.getMethodId(method); + print("void ___"); + String helperMethod = methodId; + if (uniqueMethodIds.contains(methodId)) + helperMethod = helperMethod + intDecl.getMethodNumId(method); + else + uniqueMethodIds.add(methodId); + // Check if this is "void" + String retType = intDecl.getMethodType(method); + println(helperMethod + "(" + newSkelClass + "* skel);"); + } + } + // Write method helper for structs + writeMethodHelperStructDeclSetupCplusSkeleton(methods, intDecl, newSkelClass); + } + + + /** + * HELPER: writeMethodHelperStructDeclSetupCplusSkeleton() writes the struct method helper declaration in skeleton class + */ + private void writeMethodHelperStructDeclSetupCplusSkeleton(Collection methods, + InterfaceDecl intDecl, String newSkelClass) { + + // Use this set to handle two same methodIds + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + // Check for params with structs + for (int i = 0; i < methParams.size(); i++) { + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + int methodNumId = intDecl.getMethodNumId(method); + print("int ___"); + String helperMethod = methodNumId + "struct" + i; + println(helperMethod + "(" + newSkelClass + "* skel);"); + } + } + } + } + + + /** + * HELPER: writeMethodBytesCopy() writes the methodBytes copy part in C++ skeleton + */ + private void writeMethodBytesCopy() { + + println("char* localMethodBytes = new char[methodLen];"); + println("memcpy(localMethodBytes, skel->methodBytes, methodLen);"); + println("didGetMethodBytes.exchange(true);"); + } + + + /** + * HELPER: writeMethodHelperCplusSkeleton() writes the method helper of the skeleton class + */ + private void writeMethodHelperCplusSkeleton(Collection methods, InterfaceDecl intDecl, + Set callbackClasses, String newSkelClass) { + + // Use this set to handle two same methodIds + Set uniqueMethodIds = new HashSet(); + for (String method : methods) { + + List methParams = intDecl.getMethodParams(method); + List methPrmTypes = intDecl.getMethodParamTypes(method); + if (isStructPresent(methParams, methPrmTypes)) { // Treat struct differently + String methodId = intDecl.getMethodId(method); + print("void " + newSkelClass + "::___"); + String helperMethod = methodId; + if (uniqueMethodIds.contains(methodId)) + helperMethod = helperMethod + intDecl.getMethodNumId(method); + else + uniqueMethodIds.add(methodId); + String retType = intDecl.getMethodType(method); + print(helperMethod + "("); + boolean begin = true; + for (int i = 0; i < methParams.size(); i++) { // Print size variables + String paramType = methPrmTypes.get(i); + String param = methParams.get(i); + String simpleType = getGenericType(paramType); + if (isStructClass(simpleType)) { + if (!begin) // Generate comma for not the beginning variable + print(", "); + else + begin = false; int methodNumId = intDecl.getMethodNumId(method); print("int struct" + methodNumId + "Size" + i); } } - println(") {"); + println(", " + newSkelClass + "* skel) {"); + writeMethodBytesCopy(); writeMethodHelperStructCplusSkeleton(intDecl, methParams, methPrmTypes, method, methodId, callbackClasses); + println("delete[] localMethodBytes;"); println("}\n"); } else { String methodId = intDecl.getMethodId(method); - print("void ___"); + print("void " + newSkelClass + "::___"); String helperMethod = methodId; if (uniqueMethodIds.contains(methodId)) helperMethod = helperMethod + intDecl.getMethodNumId(method); @@ -3911,14 +4145,16 @@ public class IoTCompiler { uniqueMethodIds.add(methodId); // Check if this is "void" String retType = intDecl.getMethodType(method); - println(helperMethod + "() {"); + println(helperMethod + "(" + newSkelClass + "* skel) {"); + writeMethodBytesCopy(); // Now, write the helper body of skeleton! writeStdMethodHelperBodyCplusSkeleton(intDecl, methParams, methPrmTypes, method, methodId, callbackClasses); + println("delete[] localMethodBytes;"); println("}\n"); } } // Write method helper for structs - writeMethodHelperStructSetupCplusSkeleton(methods, intDecl); + writeMethodHelperStructSetupCplusSkeleton(methods, intDecl, newSkelClass); } @@ -3926,7 +4162,7 @@ public class IoTCompiler { * HELPER: writeMethodHelperStructSetupCplusSkeleton() writes the method helper of struct in skeleton class */ private void writeMethodHelperStructSetupCplusSkeleton(Collection methods, - InterfaceDecl intDecl) { + InterfaceDecl intDecl, String newSkelClass) { // Use this set to handle two same methodIds for (String method : methods) { @@ -3937,19 +4173,21 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); - print("int ___"); + print("int " + newSkelClass + "::___"); String helperMethod = methodNumId + "struct" + i; - println(helperMethod + "() {"); + println(helperMethod + "(" + newSkelClass + "* skel) {"); // Now, write the helper body of skeleton! + writeMethodBytesCopy(); println("string paramCls[] = { \"int\" };"); println("int numParam = 1;"); println("int param0 = 0;"); println("void* paramObj[] = { ¶m0 };"); - println("rmiObj->getMethodParams(paramCls, numParam, paramObj);"); + println("rmiComm->getMethodParams(paramCls, numParam, paramObj, localMethodBytes);"); println("return param0;"); + println("delete[] localMethodBytes;"); println("}\n"); } } @@ -3972,7 +4210,7 @@ public class IoTCompiler { for (int i = 0; i < methParams.size(); i++) { String paramType = methPrmTypes.get(i); String param = methParams.get(i); - String simpleType = getSimpleType(paramType); + String simpleType = getGenericType(paramType); if (isStructClass(simpleType)) { int methodNumId = intDecl.getMethodNumId(method); print("int ___"); @@ -3983,358 +4221,253 @@ public class IoTCompiler { println("int numParam = 1;"); println("int param0 = 0;"); println("void* paramObj[] = { ¶m0 };"); - println("rmiObj->getMethodParams(paramCls, numParam, paramObj);"); + println("rmiComm->getMethodParams(paramCls, numParam, paramObj, localMethodBytes);"); println("return param0;"); - println("}\n"); - } - } - } - } - - - /** - * HELPER: writeCplusMethodPermission() writes permission checks in skeleton - */ - private void writeCplusMethodPermission(String intface) { - - // Get all the different stubs - Map> mapNewIntMethods = mapInt2NewInts.get(intface); - for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { - String newIntface = intMeth.getKey(); - int newObjectId = mapNewIntfaceObjId.get(newIntface); - println("if (_objectId == object" + newObjectId + "Id) {"); - println("if (set" + newObjectId + "Allowed.find(methodId) == set" + newObjectId + "Allowed.end()) {"); - println("cerr << \"Object with object Id: \" << _objectId << \" is not allowed to access method: \" << methodId << endl;"); - println("exit(-1);"); - println("}"); - println("}"); - println("else {"); - println("cerr << \"Object Id: \" << _objectId << \" not recognized!\" << endl;"); - println("exit(-1);"); - println("}"); - } - } - - - /** - * HELPER: writeCplusWaitRequestInvokeMethod() writes the main loop of the skeleton class - */ - private void writeCplusWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, boolean callbackExist, String intface) { - - // Use this set to handle two same methodIds - Set uniqueMethodIds = new HashSet(); - println("void ___waitRequestInvokeMethod() {"); - // Write variables here if we have callbacks or enums or structs - writeCountVarStructSkeleton(methods, intDecl); - println("while (true) {"); - println("rmiObj->getMethodBytes();"); - println("int _objectId = rmiObj->getObjectId();"); - println("int methodId = rmiObj->getMethodId();"); - // Generate permission check - writeCplusMethodPermission(intface); - println("switch (methodId) {"); - // Print methods and method Ids - for (String method : methods) { - String methodId = intDecl.getMethodId(method); - int methodNumId = intDecl.getMethodNumId(method); - print("case " + methodNumId + ": ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + methodNumId; - else - uniqueMethodIds.add(methodId); - print(helperMethod + "("); - writeInputCountVarStructSkeleton(method, intDecl); - println("); break;"); - } - String method = "___initCallBack()"; - // Print case -9999 (callback handler) if callback exists - if (callbackExist) { - int methodId = intDecl.getHelperMethodNumId(method); - println("case " + methodId + ": ___regCB(); break;"); - } - writeMethodCallStructSkeleton(methods, intDecl); - println("default: "); - println("cerr << \"Method Id \" << methodId << \" not recognized!\" << endl;"); - println("throw exception();"); - println("}"); - println("}"); - println("}\n"); - } - - - /** - * generateCplusSkeletonClass() generate skeletons based on the methods list in C++ - */ - public void generateCplusSkeletonClass() throws IOException { - - // Create a new directory - String path = createDirectories(dir, subdir); - for (String intface : mapIntfacePTH.keySet()) { - // Open a new file to write into - String newSkelClass = intface + "_Skeleton"; - FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".hpp"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Write file headers - println("#ifndef _" + newSkelClass.toUpperCase() + "_HPP__"); - println("#define _" + newSkelClass.toUpperCase() + "_HPP__"); - println("#include "); - println("#include \"" + intface + ".hpp\"\n"); - // Pass in set of methods and get import classes - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - List methods = intDecl.getMethods(); - Set includeClasses = getIncludeClasses(methods, intDecl, intface, true); - List stdIncludeClasses = getStandardCplusIncludeClasses(); - List allIncludeClasses = getAllLibClasses(stdIncludeClasses, includeClasses); - printIncludeStatements(allIncludeClasses); println(""); - println("using namespace std;\n"); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - // Write class header - println("class " + newSkelClass + " : public " + intface); println("{"); - println("private:\n"); - // Write properties - writePropertiesCplusSkeleton(intface, callbackExist, callbackClasses); - println("public:\n"); - // Write constructor - writeConstructorCplusSkeleton(newSkelClass, intface, callbackExist); - // Write deconstructor - writeDeconstructorCplusSkeleton(newSkelClass, callbackExist, callbackClasses); - // Write methods - writeMethodCplusSkeleton(methods, intDecl, callbackClasses, false); - // Write method helper - writeMethodHelperCplusSkeleton(methods, intDecl, callbackClasses); - // Write waitRequestInvokeMethod() - main loop - writeCplusWaitRequestInvokeMethod(methods, intDecl, callbackExist, intface); - println("};"); - writePermissionInitializationCplus(intface, newSkelClass, intDecl); - println("#endif"); - pw.close(); - System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".hpp..."); - } - } - - - /** - * HELPER: writePropertiesCplusCallbackSkeleton() writes the properties of the callback skeleton class - */ - private void writePropertiesCplusCallbackSkeleton(String intface, boolean callbackExist, Set callbackClasses) { - - println(intface + " *mainObj;"); - // Keep track of object Ids of all stubs registered to this interface - println("static int objectId;"); - // Callback - if (callbackExist) { - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - String exchangeType = checkAndGetParamClass(callbackType); - println("// Callback properties"); - println("IoTRMICall* rmiCall;"); - println("vector<" + exchangeType + "*> vecCallbackObj;"); - println("static int objIdCnt;"); - } - println("\n"); - } - - - /** - * HELPER: writeConstructorCplusCallbackSkeleton() writes the constructor of the skeleton class - */ - private void writeConstructorCplusCallbackSkeleton(String newSkelClass, String intface, boolean callbackExist) { - - println(newSkelClass + "(" + intface + " *_mainObj, int _objectId) {"); - println("mainObj = _mainObj;"); - println("objectId = _objectId;"); - // Callback - if (callbackExist) { - println("objIdCnt = 0;"); + println("}\n"); + } + } } - println("}\n"); } /** - * HELPER: writeDeconstructorCplusStub() writes the deconstructor of the stub class + * HELPER: writeCplusMethodPermission() writes permission checks in skeleton */ - private void writeDeconstructorCplusCallbackSkeleton(String newStubClass, boolean callbackExist, - Set callbackClasses) { + private void writeCplusMethodPermission(String intface) { - println("~" + newStubClass + "() {"); - if (callbackExist) { - // We assume that each class only has one callback interface for now - println("if (rmiCall != NULL) {"); - println("delete rmiCall;"); - println("rmiCall = NULL;"); + // Get all the different stubs + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + String newIntface = intMeth.getKey(); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("if (_objectId == objectId) {"); + println("if (set" + newObjectId + "Allowed.find(methodId) == set" + newObjectId + "Allowed.end()) {"); + println("cerr << \"Object with object Id: \" << _objectId << \" is not allowed to access method: \" << methodId << endl;"); + println("return;"); println("}"); - Iterator it = callbackClasses.iterator(); - String callbackType = (String) it.next(); - String exchangeType = checkAndGetParamClass(callbackType); - println("for(" + exchangeType + "* cb : vecCallbackObj) {"); - println("delete cb;"); - println("cb = NULL;"); + println("}"); + println("else {"); + println("continue;"); println("}"); } - println("}"); - println(""); - } - - - /** - * HELPER: writeMethodHelperCplusCallbackSkeleton() writes the method helper of callback skeleton class - */ - private void writeMethodHelperCplusCallbackSkeleton(Collection methods, InterfaceDecl intDecl, - Set callbackClasses) { - - // Use this set to handle two same methodIds - Set uniqueMethodIds = new HashSet(); - for (String method : methods) { - - List methParams = intDecl.getMethodParams(method); - List methPrmTypes = intDecl.getMethodParamTypes(method); - if (isStructPresent(methParams, methPrmTypes)) { // Treat struct differently - String methodId = intDecl.getMethodId(method); - print("void ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + intDecl.getMethodNumId(method); - else - uniqueMethodIds.add(methodId); - String retType = intDecl.getMethodType(method); - print(helperMethod + "("); - boolean begin = true; - for (int i = 0; i < methParams.size(); i++) { // Print size variables - String paramType = methPrmTypes.get(i); - String param = methParams.get(i); - String simpleType = getSimpleType(paramType); - if (isStructClass(simpleType)) { - if (!begin) { // Generate comma for not the beginning variable - print(", "); begin = false; - } - int methodNumId = intDecl.getMethodNumId(method); - print("int struct" + methodNumId + "Size" + i); - } - } - println(", IoTRMIObject* rmiObj) {"); - writeMethodHelperStructCplusSkeleton(intDecl, methParams, methPrmTypes, method, methodId, callbackClasses); - println("}\n"); - } else { - String methodId = intDecl.getMethodId(method); - print("void ___"); - String helperMethod = methodId; - if (uniqueMethodIds.contains(methodId)) - helperMethod = helperMethod + intDecl.getMethodNumId(method); - else - uniqueMethodIds.add(methodId); - // Check if this is "void" - String retType = intDecl.getMethodType(method); - println(helperMethod + "(IoTRMIObject* rmiObj) {"); - // Now, write the helper body of skeleton! - writeStdMethodHelperBodyCplusSkeleton(intDecl, methParams, methPrmTypes, method, methodId, callbackClasses); - println("}\n"); - } - } - // Write method helper for structs - writeMethodHelperStructSetupCplusCallbackSkeleton(methods, intDecl); } /** - * HELPER: writeCplusCallbackWaitRequestInvokeMethod() writes the request invoke method of the skeleton callback class + * HELPER: writeCplusWaitRequestInvokeMethod() writes the main loop of the skeleton class */ - private void writeCplusCallbackWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, - boolean callbackExist) { + private void writeCplusWaitRequestInvokeMethod(Collection methods, InterfaceDecl intDecl, + boolean callbackExist, String intface, String newSkelClass) { // Use this set to handle two same methodIds Set uniqueMethodIds = new HashSet(); - println("void invokeMethod(IoTRMIObject* rmiObj) {"); + println("void " + newSkelClass + "::___waitRequestInvokeMethod(" + newSkelClass + "* skel) {"); // Write variables here if we have callbacks or enums or structs writeCountVarStructSkeleton(methods, intDecl); - // Write variables here if we have callbacks or enums or structs - println("int methodId = rmiObj->getMethodId();"); - // TODO: code the permission check here! + println("skel->didAlreadyInitWaitInvoke = true;"); + println("while (true) {"); + println("if (!methodReceived) {"); + println("continue;"); + println("}"); + println("skel->methodBytes = skel->rmiComm->getMethodBytes();"); + println("skel->methodLen = skel->rmiComm->getMethodLength();"); + println("methodReceived = false;"); + println("int _objectId = skel->rmiComm->getObjectId(skel->methodBytes);"); + println("int methodId = skel->rmiComm->getMethodId(skel->methodBytes);"); + // Generate permission check + writeCplusMethodPermission(intface); println("switch (methodId) {"); // Print methods and method Ids for (String method : methods) { String methodId = intDecl.getMethodId(method); int methodNumId = intDecl.getMethodNumId(method); - print("case " + methodNumId + ": ___"); + println("case " + methodNumId + ": {"); + print("thread th" + methodNumId + " (&" + newSkelClass + "::___"); String helperMethod = methodId; if (uniqueMethodIds.contains(methodId)) helperMethod = helperMethod + methodNumId; else uniqueMethodIds.add(methodId); - print(helperMethod + "("); - if (writeInputCountVarStructSkeleton(method, intDecl)) - println(", rmiObj); break;"); - else - println("rmiObj); break;"); - } - String method = "___initCallBack()"; - // Print case -9999 (callback handler) if callback exists - if (callbackExist) { - int methodId = intDecl.getHelperMethodNumId(method); - println("case " + methodId + ": ___regCB(rmiObj); break;"); + print(helperMethod + ", skel, "); + boolean structExists = writeInputCountVarStructCplusSkeleton(method, intDecl); + if (structExists) + print(", "); + println("skel);"); + println("th" + methodNumId + ".detach(); break;"); + println("}"); } - writeMethodCallStructCallbackSkeleton(methods, intDecl); + writeMethodCallStructCplusSkeleton(methods, intDecl); println("default: "); println("cerr << \"Method Id \" << methodId << \" not recognized!\" << endl;"); - println("throw exception();"); + println("return;"); + println("}"); println("}"); println("}\n"); } /** - * generateCplusCallbackSkeletonClass() generate callback skeletons based on the methods list in C++ + * generateCplusSkeletonClassHpp() generate skeletons based on the methods list in C++ (.hpp file) */ - public void generateCplusCallbackSkeletonClass() throws IOException { + public void generateCplusSkeletonClassHpp() throws IOException { // Create a new directory String path = createDirectories(dir, subdir); for (String intface : mapIntfacePTH.keySet()) { - // Open a new file to write into - String newSkelClass = intface + "_CallbackSkeleton"; - FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".hpp"); - pw = new PrintWriter(new BufferedWriter(fw)); - // Write file headers - println("#ifndef _" + newSkelClass.toUpperCase() + "_HPP__"); - println("#define _" + newSkelClass.toUpperCase() + "_HPP__"); - println("#include "); - println("#include \"" + intface + ".hpp\"\n"); - // Pass in set of methods and get import classes - DeclarationHandler decHandler = mapIntDeclHand.get(intface); - InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); - List methods = intDecl.getMethods(); - Set includeClasses = getIncludeClasses(methods, intDecl, intface, true); - List stdIncludeClasses = getStandardCplusIncludeClasses(); - List allIncludeClasses = getAllLibClasses(stdIncludeClasses, includeClasses); - printIncludeStatements(allIncludeClasses); println(""); - // Find out if there are callback objects - Set callbackClasses = getCallbackClasses(methods, intDecl); - boolean callbackExist = !callbackClasses.isEmpty(); - println("using namespace std;\n"); - // Write class header - println("class " + newSkelClass + " : public " + intface); println("{"); - println("private:\n"); - // Write properties - writePropertiesCplusCallbackSkeleton(intface, callbackExist, callbackClasses); - println("public:\n"); - // Write constructor - writeConstructorCplusCallbackSkeleton(newSkelClass, intface, callbackExist); - // Write deconstructor - writeDeconstructorCplusCallbackSkeleton(newSkelClass, callbackExist, callbackClasses); - // Write methods - writeMethodCplusSkeleton(methods, intDecl, callbackClasses, true); - // Write method helper - writeMethodHelperCplusCallbackSkeleton(methods, intDecl, callbackClasses); - // Write waitRequestInvokeMethod() - main loop - writeCplusCallbackWaitRequestInvokeMethod(methods, intDecl, callbackExist); - println("};"); - println("#endif"); - pw.close(); - System.out.println("IoTCompiler: Generated callback skeleton class " + newSkelClass + ".hpp..."); + + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + // Open a new file to write into + String newSkelClass = intface + "_Skeleton"; + // Get driver class + String driverClass = drvList.get(i); + // Check if this interface is a callback class + if(isCallbackClass(intface)) + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + else + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".hpp"); + pw = new PrintWriter(new BufferedWriter(fw)); + // Write file headers + println("#ifndef _" + newSkelClass.toUpperCase() + "_HPP__"); + println("#define _" + newSkelClass.toUpperCase() + "_HPP__"); + println("#include "); + println("#include \"" + intface + ".hpp\"\n"); + // Pass in set of methods and get import classes + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + List methods = intDecl.getMethods(); + List stdIncludeClasses = getStandardCplusIncludeClasses(); + printIncludeStatements(stdIncludeClasses); println(""); + println("using namespace std;\n"); + // Find out if there are callback objects + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); + // Write class header + println("class " + newSkelClass + " : public " + intface); println("{"); + println("private:\n"); + // Write properties + writePropertiesCplusSkeleton(intface, callbackExist, callbackClasses); + println("public:\n"); + // Write constructors + println(newSkelClass + "();"); + println(newSkelClass + "(" + intface + "*_mainObj, int _portSend, int _portRecv);"); + println(newSkelClass + "(" + intface + "*_mainObj, IoTRMIComm *rmiComm, int _objectId);"); + // Write deconstructor + println("~" + newSkelClass + "();"); + // Write method declarations + println("bool didInitWaitInvoke();"); + writeMethodDeclCplusSkeleton(methods, intDecl, callbackClasses); + // Write method helper declarations + writeMethodHelperDeclCplusSkeleton(methods, intDecl, newSkelClass); + // Write waitRequestInvokeMethod() declaration - main loop + println("void ___waitRequestInvokeMethod(" + newSkelClass + "* skel);"); + println("};"); + writePermissionInitializationCplus(intface, newSkelClass, intDecl); + println("#endif"); + pw.close(); + System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".hpp..."); + } + } + } + + /** + * HELPER: writeReturnDidAlreadyInitWaitInvoke() writes the function to return didAlreadyInitWaitInvoke + */ + private void writeReturnDidAlreadyInitWaitInvoke(String newSkelClass) { + + println("bool " + newSkelClass + "::didInitWaitInvoke() {"); + println("return didAlreadyInitWaitInvoke;"); + println("}\n"); + } + + + /** + * writeSkelExternalCFunctions() generate external functions for .so file + */ + public void writeSkelExternalCFunctions(String newSkelClass, String intface) throws IOException { + + println("extern \"C\" void* create" + newSkelClass + "(void** params) {"); + println("// Args: *_mainObj, int _portSend, int _portRecv"); + println("return new " + newSkelClass + "((" + intface + "*) params[0], *((int*) params[1]), *((int*) params[2]));"); + println("}\n"); + println("extern \"C\" void destroy" + newSkelClass + "(void* t) {"); + println(newSkelClass + "* obj = (" + newSkelClass + "*) t;"); + println("delete obj;"); + println("}\n"); + println("extern \"C\" void init" + newSkelClass + "(void* t) {"); + println("}\n"); + } + + + /** + * generateCplusSkeletonClassCpp() generate skeletons based on the methods list in C++ (.cpp file) + */ + public void generateCplusSkeletonClassCpp() throws IOException { + + // Create a new directory + String path = createDirectories(dir, subdir); + for (String intface : mapIntfacePTH.keySet()) { + + // Check if there is more than 1 class that uses the same interface + List drvList = mapInt2Drv.get(intface); + for(int i = 0; i < drvList.size(); i++) { + + // Open a new file to write into + String newSkelClass = intface + "_Skeleton"; + // Get driver class + String driverClass = drvList.get(i); + // Check if this interface is a callback class + if(isCallbackClass(intface)) + path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass); + else + path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass); + FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".cpp"); + pw = new PrintWriter(new BufferedWriter(fw)); + // Write file headers + println("#include "); + println("#include \"" + newSkelClass + ".hpp\"\n"); + // Pass in set of methods and get import classes + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + List methods = intDecl.getMethods(); + // Find out if there are callback objects + Set callbackClasses = getCallbackClasses(methods, intDecl); + boolean callbackExist = !callbackClasses.isEmpty(); + for(String str: callbackClasses) { + if (intface.equals(mainClass)) + println("#include \"" + getStubInterface(str) + "_Stub.cpp\"\n"); + else + println("#include \"" + getStubInterface(str) + "_Stub.hpp\"\n"); + } + println("using namespace std;\n"); + // Write constructor + writeConstructorCplusSkeleton(newSkelClass, intface, callbackExist, intDecl, methods); + // Write callback constructor + writeCallbackConstructorCplusSkeleton(newSkelClass, intface, callbackExist, intDecl, methods); + // Write deconstructor + writeDeconstructorCplusSkeleton(newSkelClass, callbackExist, callbackClasses); + // Write didInitWaitInvoke() to return bool + writeReturnDidAlreadyInitWaitInvoke(newSkelClass); + // Write methods + writeMethodCplusSkeleton(methods, intDecl, newSkelClass); + // Write method helper + writeMethodHelperCplusSkeleton(methods, intDecl, callbackClasses, newSkelClass); + // Write waitRequestInvokeMethod() - main loop + writeCplusWaitRequestInvokeMethod(methods, intDecl, callbackExist, intface, newSkelClass); + // Write external functions for .so file + writeSkelExternalCFunctions(newSkelClass, intface); + // TODO: Remove this later + if (intface.equals(mainClass)) { + println("int main() {"); + println("return 0;"); + println("}"); + } + pw.close(); + System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".cpp..."); + } } } @@ -4384,7 +4517,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:"); @@ -4394,8 +4527,14 @@ public class IoTCompiler { System.out.println("\tjava IoTCompiler [ ] [options]\n"); System.out.println("\t\tTake one or more pairs of main-req policy files, and generate Java and/or C++ files\n"); System.out.println("Options:"); - System.out.println("\t-java\t\tGenerate Java stub files"); - System.out.println("\t-cplus\t\tGenerate C++ stub files"); + System.out.println("\t-cont\t\tSpecify controller class name"); + System.out.println("\t-drv\t\t\tSpecify driver class name"); + System.out.println("\t\t(place this option right after a pair of .pol and .req files)"); + System.out.println("\t-objid\t\t\tSpecify object Id for stub/skeleton used in multiple apps"); + System.out.println("\t\t(place this option right after -drv option)"); + System.out.println("\t-cplus\t\t\tGenerate C++ stub files"); + System.out.println("\t-java\t\t\tGenerate Java stub files\n"); + System.out.println("\t\tNote: The options -cont and -drv have to be defined before -cplus and -java"); System.out.println(); } @@ -4414,7 +4553,7 @@ public class IoTCompiler { pn = (ParseNode) parse.parse().value; } catch (Exception e) { e.printStackTrace(); - throw new Error("IoTCompiler: ERROR parsing policy file or wrong command line option: " + file); + throw new Error("IoTCompiler: ERROR parsing policy file or wrong command line option: " + file + "\n"); } return pn; @@ -4445,9 +4584,12 @@ public class IoTCompiler { /** * This function converts Java to C++ type for compilation */ - private String convertType(String jType) { + private String convertType(String type) { - return mapPrimitives.get(jType); + if (mapPrimitives.containsKey(type)) + return mapPrimitives.get(type); + else + return type; } @@ -4524,6 +4666,16 @@ public class IoTCompiler { } + // Check and find object Id for new interface in mapNewIntfaceObjId (callbacks) + // Throw an error if the new interface is not found! + // Basically the compiler needs to parse the policy (and requires) files for callback class first + private int getNewIntfaceObjectId(String newIntface) { + + int retObjId = mapNewIntfaceObjId.get(newIntface); + return retObjId; + } + + // Return parameter category, i.e. PRIMITIVES, NONPRIMITIVES, USERDEFINED, ENUM, or STRUCT private ParamCategory getParamCategory(String paramType) { @@ -4570,6 +4722,18 @@ public class IoTCompiler { } + // Generate a set of standard classes for import statements + private List getStandardJavaIntfaceImportClasses() { + + List importClasses = new ArrayList(); + // Add the standard list first + importClasses.add("java.util.List"); + importClasses.add("java.util.ArrayList"); + + return importClasses; + } + + // Generate a set of standard classes for import statements private List getStandardJavaImportClasses() { @@ -4579,8 +4743,13 @@ public class IoTCompiler { importClasses.add("java.util.List"); importClasses.add("java.util.ArrayList"); importClasses.add("java.util.Arrays"); - importClasses.add("iotrmi.Java.IoTRMICall"); - importClasses.add("iotrmi.Java.IoTRMIObject"); + importClasses.add("java.util.Map"); + importClasses.add("java.util.HashMap"); + importClasses.add("java.util.concurrent.atomic.AtomicBoolean"); + importClasses.add("iotrmi.Java.IoTRMIComm"); + importClasses.add("iotrmi.Java.IoTRMICommClient"); + importClasses.add("iotrmi.Java.IoTRMICommServer"); + importClasses.add("iotrmi.Java.IoTRMIUtil"); return importClasses; } @@ -4593,8 +4762,9 @@ public class IoTCompiler { // Add the standard list first importClasses.add(""); importClasses.add(""); - importClasses.add("\"IoTRMICall.hpp\""); - importClasses.add("\"IoTRMIObject.hpp\""); + importClasses.add("\"IoTRMIComm.hpp\""); + importClasses.add("\"IoTRMICommClient.hpp\""); + importClasses.add("\"IoTRMICommServer.hpp\""); return importClasses; } @@ -4673,7 +4843,7 @@ public class IoTCompiler { String pureType = getSimpleArrayType(type); // Take the inner type of generic if (getParamCategory(type) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(type)[0]; + pureType = getGenericType(type); if (isEnumClass(pureType)) { String enumType = "int[]"; return enumType; @@ -4681,6 +4851,21 @@ public class IoTCompiler { return type; } + // Handle and return the correct enum declaration translate into int* for C + private String getEnumCplusClsType(String type) { + + // Strips off array "[]" for return type + String pureType = getSimpleArrayType(type); + // Take the inner type of generic + if (getParamCategory(type) == ParamCategory.NONPRIMITIVES) + pureType = getGenericType(type); + if (isEnumClass(pureType)) { + String enumType = "int*"; + return enumType; + } else + return type; + } + // Handle and return the correct struct declaration private String getStructType(String type) { @@ -4689,7 +4874,7 @@ public class IoTCompiler { String pureType = getSimpleArrayType(type); // Take the inner type of generic if (getParamCategory(type) == ParamCategory.NONPRIMITIVES) - pureType = getTypeOfGeneric(type)[0]; + pureType = getGenericType(type); if (isStructClass(pureType)) { String structType = "int"; return structType; @@ -4768,24 +4953,30 @@ public class IoTCompiler { List methParams = intDecl.getMethodParams(method); for (int i = 0; i < methPrmTypes.size(); i++) { + String genericType = getGenericType(methPrmTypes.get(i)); String simpleType = getSimpleType(methPrmTypes.get(i)); String param = methParams.get(i); if (getParamCategory(simpleType) == ParamCategory.NONPRIMITIVES) { includeClasses.add("<" + getNonPrimitiveCplusClass(simpleType) + ">"); - } else if (getParamCategory(simpleType) == ParamCategory.USERDEFINED) { + //} else if (getParamCategory(simpleType) == ParamCategory.USERDEFINED) { + } + if (getParamCategory(getSimpleArrayType(genericType)) == ParamCategory.USERDEFINED) { // For original interface, we need it exchanged... not for stub interfaces if (needExchange) { - includeClasses.add("\"" + exchangeParamType(simpleType) + ".hpp\""); - includeClasses.add("\"" + exchangeParamType(simpleType) + "_CallbackStub.hpp\""); + //includeClasses.add("\"" + exchangeParamType(simpleType) + ".hpp\""); + includeClasses.add("\"" + exchangeParamType(getSimpleArrayType(genericType)) + ".hpp\""); } else { - includeClasses.add("\"" + simpleType + ".hpp\""); - includeClasses.add("\"" + simpleType + "_CallbackSkeleton.hpp\""); + //includeClasses.add("\"" + simpleType + ".hpp\""); + includeClasses.add("\"" + getSimpleArrayType(genericType) + ".hpp\""); } - } else if (getParamCategory(getSimpleArrayType(simpleType)) == ParamCategory.ENUM) { - includeClasses.add("\"" + simpleType + ".hpp\""); - } else if (getParamCategory(getSimpleArrayType(simpleType)) == ParamCategory.STRUCT) { - includeClasses.add("\"" + simpleType + ".hpp\""); - } else if (param.contains("[]")) { + } + if (getParamCategory(getSimpleArrayType(genericType)) == ParamCategory.ENUM) { + includeClasses.add("\"" + genericType + ".hpp\""); + } + if (getParamCategory(getSimpleArrayType(genericType)) == ParamCategory.STRUCT) { + includeClasses.add("\"" + genericType + ".hpp\""); + } + if (param.contains("[]")) { // Check if this is array for C++; translate into vector includeClasses.add(""); } @@ -4819,6 +5010,45 @@ public class IoTCompiler { } return callbackClasses; } + + + // Check if this is a callback class + private boolean isCallbackClass(String className) { + + Set intfaceSet = mapIntDeclHand.keySet(); + for(String intface : intfaceSet) { + + DeclarationHandler decHandler = mapIntDeclHand.get(intface); + InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + Set methods = intMeth.getValue(); + for (String method : methods) { + + List methPrmTypes = intDecl.getMethodParamTypes(method); + List methParams = intDecl.getMethodParams(method); + for (int i = 0; i < methPrmTypes.size(); i++) { + + String type = methPrmTypes.get(i); + if (getParamCategory(type) == ParamCategory.USERDEFINED) { + // Final check to see if this is the searched class + if (type.equals(className)) + return true; + } else if (getParamCategory(type) == ParamCategory.NONPRIMITIVES) { + // Can be a List<...> of callback objects ... + String genericType = getTypeOfGeneric(type)[0]; + if (getParamCategory(type) == ParamCategory.USERDEFINED) { + if (type.equals(className)) + return true; + } + } + } + } + } + } + + return false; + } // Print import statements into file @@ -4897,26 +5127,25 @@ public class IoTCompiler { if (paramType.contains("<") && paramType.contains(">")) { String genericClass = getSimpleType(paramType); - String[] genericType = getTypeOfGeneric(paramType); + String genericType = getGenericType(paramType); String cplusTemplate = null; - if (genericType.length == 1) // Generic/template with one type - cplusTemplate = getNonPrimitiveCplusClass(genericClass) + - "<" + convertType(genericType[0]) + ">"; - else // Generic/template with two types - cplusTemplate = getNonPrimitiveCplusClass(genericClass) + - "<" + convertType(genericType[0]) + "," + convertType(genericType[1]) + ">"; + cplusTemplate = getNonPrimitiveCplusClass(genericClass); + if(getParamCategory(getGenericType(paramType)) == ParamCategory.USERDEFINED) { + cplusTemplate = cplusTemplate + "<" + genericType + "*>"; + } else { + cplusTemplate = cplusTemplate + "<" + convertType(genericType) + ">"; + } return cplusTemplate; } else return getNonPrimitiveCplusClass(paramType); } else if(paramType.contains("[]")) { // Array type (used for return type only) - String cArray = "vector<" + getSimpleArrayType(paramType) + ">"; + String cArray = "vector<" + convertType(getSimpleArrayType(paramType)) + ">"; return cArray; } else if(getParamCategory(paramType) == ParamCategory.USERDEFINED) { return paramType + "*"; } else // Just return it as is if it's not non-primitives return paramType; - //return checkAndGetParamClass(paramType, true); } @@ -4977,6 +5206,52 @@ public class IoTCompiler { } + // Return the class type for class resolution (for return value) + // - Check and return C++ array class, e.g. int A[] into int* + // - Check and return C++ vector class, e.g. List A into vector + private String checkAndGetCplusRetClsType(String paramType) { + + String paramTypeRet = null; + // Check for array declaration + if (paramType.contains("[]")) { + String type = paramType.split("\\[\\]")[0]; + paramTypeRet = getSimpleArrayType(type) + "*"; + } else if (paramType.contains("<") && paramType.contains(">")) { + // Just return it as is if it's not an array + String type = paramType.split("<")[1].split(">")[0]; + paramTypeRet = "vector<" + getGenericType(type) + ">"; + } else + paramTypeRet = paramType; + + return paramTypeRet; + } + + + // Return the class type for class resolution (for method arguments) + // - Check and return C++ array class, e.g. int A[] into int* + // - Check and return C++ vector class, e.g. List A into vector + private String checkAndGetCplusArgClsType(String paramType, String param) { + + String paramTypeRet = getEnumCplusClsType(paramType); + if (!paramTypeRet.equals(paramType)) + // Just return if it is an enum type + // Type will still be the same if it's not an enum type + return paramTypeRet; + + // Check for array declaration + if (param.contains("[]")) { + paramTypeRet = getSimpleArrayType(paramType) + "*"; + } else if (paramType.contains("<") && paramType.contains(">")) { + // Just return it as is if it's not an array + String type = paramType.split("<")[1].split(">")[0]; + paramTypeRet = "vector<" + getGenericType(type) + ">"; + } else + paramTypeRet = paramType; + + return paramTypeRet; + } + + // Detect array declaration, e.g. int A[], // then generate type "int[]" private String checkAndGetArray(String paramType, String param) { @@ -5035,6 +5310,9 @@ public class IoTCompiler { // Check if this is generics if(getParamCategory(paramType) == ParamCategory.USERDEFINED) { return exchangeParamType(paramType); + } else if (isList(paramType) && + (getParamCategory(getGenericType(paramType)) == ParamCategory.USERDEFINED)) { + return "List<" + exchangeParamType(getGenericType(paramType)) + ">"; } else return paramType; } @@ -5058,7 +5336,7 @@ public class IoTCompiler { } else { throw new Error("IoTCompiler: Ambiguous stub interfaces: " + setExchInt.toString() + ". Only one new interface can be declared if the object " + intface + - " needs to be passed in as an input parameter!"); + " needs to be passed in as an input parameter!\n"); } } else { // NULL value - this means policy files missing @@ -5067,7 +5345,7 @@ public class IoTCompiler { " If this is an array please type the brackets after the variable name," + " e.g. \"String str[]\", not \"String[] str\"." + " If this is a Collections (Java) / STL (C++) type, this compiler only" + - " supports List/ArrayList (Java) or list (C++)."); + " supports List/ArrayList (Java) or list (C++).\n"); } } @@ -5075,32 +5353,53 @@ public class IoTCompiler { public static void main(String[] args) throws Exception { // If there is no argument or just "--help" or "-h", then invoke printUsage() - if ((args[0].equals("-help") || + if ((args.length == 0 || + args[0].equals("-help") || args[0].equals("--help")|| - args[0].equals("-h")) || - (args.length == 0)) { + args[0].equals("-h"))) { IoTCompiler.printUsage(); } else if (args.length > 1) { IoTCompiler comp = new IoTCompiler(); - int i = 0; + int i = 0; + boolean controllerDefined = false; do { - // Parse main policy file - ParseNode pnPol = IoTCompiler.parseFile(args[i]); - // Parse "requires" policy file - ParseNode pnReq = IoTCompiler.parseFile(args[i+1]); - // Get interface name - String intface = ParseTreeHandler.getOrigIntface(pnPol); - comp.setDataStructures(intface, pnPol, pnReq); - comp.getMethodsForIntface(intface); + if (!controllerDefined && args[i].equals("-cont")) { + comp.setControllerClass(args[i+1]); + controllerDefined = true; + i = i + 2; + } + // Parse main policy file + ParseNode pnPol = IoTCompiler.parseFile(args[i]); + // Parse "requires" policy file + ParseNode pnReq = IoTCompiler.parseFile(args[i+1]); + // Get interface name + String intface = ParseTreeHandler.getOrigIntface(pnPol); + comp.setDataStructures(intface, pnPol, pnReq); + comp.getMethodsForIntface(intface); i = i + 2; + // Driver name + if (args[i].equals("-drv")) { + comp.setDriverClass(intface, args[i+1]); + i = i + 2; + } else + throw new Error("IoTCompiler: ERROR - driver class name is needed for the interface: " + intface + "\n"); + // Object ID (for a stub/skeleton pair that is also used in other applications) + if (args[i].equals("-objid")) { + comp.setObjectId(intface, args[i+1]); + i = i + 2; + } + // 1) Check if this is the last option before "-java" or "-cplus" - // 2) Check if this is really the last option (no "-java" or "-cplus") + // 2) Check if this is really the last option } while(!args[i].equals("-java") && !args[i].equals("-cplus") && (i < args.length)); + // Controller class name needs to be defined at least once + if (!controllerDefined) + throw new Error("IoTCompiler: ERROR - controller class name has not been specified!\n"); // Generate everything if we don't see "-java" or "-cplus" if (i == args.length) { @@ -5109,29 +5408,27 @@ public class IoTCompiler { comp.generateJavaLocalInterfaces(); comp.generateJavaInterfaces(); comp.generateJavaStubClasses(); - comp.generateJavaCallbackStubClasses(); comp.generateJavaSkeletonClass(); - comp.generateJavaCallbackSkeletonClass(); comp.generateEnumCplus(); comp.generateStructCplus(); comp.generateCplusLocalInterfaces(); comp.generateCPlusInterfaces(); - comp.generateCPlusStubClasses(); - comp.generateCPlusCallbackStubClasses(); - comp.generateCplusSkeletonClass(); - comp.generateCplusCallbackSkeletonClass(); + comp.generateCPlusStubClassesHpp(); + comp.generateCPlusStubClassesCpp(); + comp.generateCplusSkeletonClassHpp(); + comp.generateCplusSkeletonClassCpp(); } else { // Check other options while(i < args.length) { // Error checking if (!args[i].equals("-java") && !args[i].equals("-cplus")) { - throw new Error("IoTCompiler: ERROR - unrecognized command line option: " + args[i]); + throw new Error("IoTCompiler: ERROR - unrecognized command line option: " + args[i] + "\n"); } else { if (i + 1 < args.length) { comp.setDirectory(args[i+1]); } else - throw new Error("IoTCompiler: ERROR - please provide after option: " + args[i]); + throw new Error("IoTCompiler: ERROR - please provide after option: " + args[i] + "\n"); if (args[i].equals("-java")) { comp.generateEnumJava(); @@ -5139,18 +5436,16 @@ public class IoTCompiler { comp.generateJavaLocalInterfaces(); comp.generateJavaInterfaces(); comp.generateJavaStubClasses(); - comp.generateJavaCallbackStubClasses(); comp.generateJavaSkeletonClass(); - comp.generateJavaCallbackSkeletonClass(); } else { comp.generateEnumCplus(); comp.generateStructCplus(); comp.generateCplusLocalInterfaces(); comp.generateCPlusInterfaces(); - comp.generateCPlusStubClasses(); - comp.generateCPlusCallbackStubClasses(); - comp.generateCplusSkeletonClass(); - comp.generateCplusCallbackSkeletonClass(); + comp.generateCPlusStubClassesHpp(); + comp.generateCPlusStubClassesCpp(); + comp.generateCplusSkeletonClassHpp(); + comp.generateCplusSkeletonClassCpp(); } } i = i + 2; @@ -5159,9 +5454,10 @@ public class IoTCompiler { } else { // Need to at least have exactly 2 parameters, i.e. main policy file and requires file IoTCompiler.printUsage(); - throw new Error("IoTCompiler: At least two arguments (main and requires policy files) have to be provided!"); + throw new Error("IoTCompiler: At least two arguments (main and requires policy files) have to be provided!\n"); } } } +