X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=blobdiff_plain;f=iotjava%2Fiotpolicy%2FIoTCompiler.java;h=0f696bec03967f6d72355335e4c41cdaaa68d1fb;hp=5af3c5ea6c98860e979ed268aa4a41fcb601dcce;hb=aeebaa13676fe92404f364e5f747766a9c2c4e6c;hpb=f4d0e8746bf8895c2f644b8c1b3ef4df6e23547d diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java index 5af3c5e..0f696be 100644 --- a/iotjava/iotpolicy/IoTCompiler.java +++ b/iotjava/iotpolicy/IoTCompiler.java @@ -361,7 +361,7 @@ public class IoTCompiler { DeclarationHandler decHandler = mapIntDeclHand.get(intface); InterfaceDecl intDecl = (InterfaceDecl) decHandler.getInterfaceDecl(intface); // Pass in set of methods and get import classes - List methods = intDecl.getMethods(); + Set methods = intMeth.getValue(); Set importClasses = getImportClasses(methods, intDecl); List stdImportClasses = getStandardJavaIntfaceImportClasses(); List allImportClasses = getAllLibClasses(stdImportClasses, importClasses); @@ -403,7 +403,7 @@ public class IoTCompiler { i++; } println(" };"); - println("private List set" + newObjectId + "Allowed;"); + println("private static List set" + newObjectId + "Allowed;"); } } @@ -414,7 +414,7 @@ public class IoTCompiler { private void writePropertiesJavaStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { println("private IoTRMICall rmiCall;"); - println("private String address;"); + println("private String callbackAddress;"); println("private int[] ports;\n"); // Get the object Id Integer objId = mapIntfaceObjId.get(intface); @@ -447,7 +447,7 @@ public class IoTCompiler { for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); int newObjectId = getNewIntfaceObjectId(newIntface); - println("set" + newObjectId + "Allowed = Arrays.asList(object" + newObjectId +"Permission);"); + println("set" + newObjectId + "Allowed = new ArrayList(Arrays.asList(object" + newObjectId +"Permission));"); } } @@ -457,10 +457,10 @@ public class IoTCompiler { */ private void writeConstructorJavaStub(String intface, String newStubClass, boolean callbackExist, Set callbackClasses) { - println("public " + newStubClass + "(int _port, String _address, int _rev, int[] _ports) throws Exception {"); - println("address = _address;"); + println("public " + newStubClass + "(int _port, String _skeletonAddress, String _callbackAddress, int _rev, int[] _ports) throws Exception {"); + println("callbackAddress = _callbackAddress;"); println("ports = _ports;"); - println("rmiCall = new IoTRMICall(_port, _address, _rev);"); + println("rmiCall = new IoTRMICall(_port, _skeletonAddress, _rev);"); if (callbackExist) { Iterator it = callbackClasses.iterator(); String callbackType = (String) it.next(); @@ -490,6 +490,24 @@ public class IoTCompiler { } + /** + * HELPER: writeJavaInitCallbackPermission() writes the permission for callback + */ + private void writeJavaInitCallbackPermission(String intface, InterfaceDecl intDecl, boolean callbackExist) { + + if (callbackExist) { + String method = "___initCallBack()"; + int methodNumId = intDecl.getHelperMethodNumId(method); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + String newIntface = intMeth.getKey(); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("set" + newObjectId + "Allowed.add(" + methodNumId + ");"); + } + } + } + + /** * HELPER: writeInitCallbackJavaStub() writes callback initialization in stub */ @@ -508,11 +526,13 @@ public class IoTCompiler { println(intface + "_CallbackSkeleton skel = (" + intface + "_CallbackSkeleton) listCallbackObj.get(objId);"); println("if (skel != null) {"); println("skel.invokeMethod(rmiObj);"); - println("} else {"); + print("}"); + println(" else {"); println("throw new Error(\"" + intface + ": Object with Id \" + objId + \" not found!\");"); println("}"); println("}"); - println("} catch (Exception ex) {"); + print("}"); + println(" catch (Exception ex) {"); println("ex.printStackTrace();"); println("throw new Error(\"Error instantiating class " + intface + "_CallbackSkeleton!\");"); println("}"); @@ -521,10 +541,11 @@ public class IoTCompiler { println("thread.start();\n"); // Generate info sending part String method = "___initCallBack()"; - println("int methodId = " + intDecl.getHelperMethodNumId(method) + ";"); + int methodNumId = intDecl.getHelperMethodNumId(method); + println("int methodId = " + methodNumId + ";"); 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("Object[] paramObj = new Object[] { ports[0], callbackAddress, 0 };"); println("rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); println("}\n"); } @@ -539,20 +560,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];"); @@ -569,10 +590,10 @@ public class IoTCompiler { private void checkAndWriteEnumRetTypeJavaStub(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 @@ -608,7 +629,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)) { // Check if this is enum type int methodNumId = intDecl.getMethodNumId(method); @@ -640,7 +661,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; } @@ -661,10 +682,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)); @@ -687,15 +708,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(";"); } @@ -704,7 +731,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(";"); } @@ -715,7 +742,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, String callbackType) { print("int paramLen = "); writeLengthStructParamClassJavaStub(methParams, methPrmTypes); @@ -730,6 +757,16 @@ 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;"); + print("paramObj[pos++] = "); + 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)"); + println(";"); } else { String prmType = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); println("paramCls[pos] = " + getSimpleType(getEnumType(prmType)) + ".class;"); @@ -832,7 +869,7 @@ public class IoTCompiler { * 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, String callbackType) { checkAndWriteStructSetupJavaStub(methParams, methPrmTypes, intDecl, method); println("int methodId = " + intDecl.getMethodNumId(method) + ";"); @@ -841,12 +878,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(", "); @@ -856,7 +898,17 @@ 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 + //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(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(", "); @@ -872,16 +924,16 @@ public class IoTCompiler { if (isStructClass(getGenericType(getSimpleArrayType(retType)))) { writeStructReturnJavaStub(getGenericType(getSimpleArrayType(retType)), retType); } 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 + if (getParamCategory(getGenericType(getSimpleArrayType(retType))) == ParamCategory.ENUM) { println("Object retObj = rmiCall.remoteCall(objectId, methodId, retType, null, paramCls, paramObj);"); checkAndWriteEnumRetTypeJavaStub(retType); + } else if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) { + // Check if the return value NONPRIMITIVES + String retGenValType = getGenericType(retType); + println("Class retGenValType = " + retGenValType + ".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;"); @@ -897,7 +949,7 @@ public class IoTCompiler { private String returnGenericCallbackType(String paramType) { if (getParamCategory(paramType) == ParamCategory.NONPRIMITIVES) - return getTypeOfGeneric(paramType)[0]; + return getGenericType(paramType); else return paramType; } @@ -909,7 +961,10 @@ public class IoTCompiler { 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); } @@ -926,70 +981,21 @@ 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("for (" + getGenericType(paramType) + " cb : " + getSimpleIdentifier(param) + ") {"); + println(callbackType + "_CallbackSkeleton skel" + i + " = new " + callbackType + "_CallbackSkeleton(cb, objIdCnt++);"); } else - println(callbackType + "_CallbackSkeleton skel = new " + callbackType + "_CallbackSkeleton(" + + println(callbackType + "_CallbackSkeleton skel" + i + " = new " + callbackType + "_CallbackSkeleton(" + getSimpleIdentifier(param) + ", objIdCnt++);"); - println("listCallbackObj.add(skel);"); + println("listCallbackObj.add(skel" + i + ");"); 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;"); - } - } } @@ -998,6 +1004,7 @@ public class IoTCompiler { */ private void writeMethodJavaStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { + boolean isDefined = false; for (String method : methods) { List methParams = intDecl.getMethodParams(method); @@ -1025,12 +1032,14 @@ public class IoTCompiler { // Now, write the body of stub! if (isCallbackMethod) writeCallbackMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType); - else - writeStdMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method); + //else + writeStdMethodBodyJavaStub(intDecl, methParams, methPrmTypes, method, callbackType); println("}\n"); // Write the init callback helper method - if (isCallbackMethod) + if (isCallbackMethod && !isDefined) { writeInitCallbackJavaStub(callbackType, intDecl); + isDefined = true; + } } } @@ -1088,7 +1097,7 @@ public class IoTCompiler { println("private String address;"); println("private int[] ports;\n"); // Get the object Id - println("private static int objectId = 0;"); + println("private int objectId = 0;"); if (callbackExist) { // We assume that each class only has one callback interface for now Iterator it = callbackClasses.iterator(); @@ -1194,16 +1203,49 @@ public class IoTCompiler { } + /** + * HELPER: writeStructPermissionJavaSkeleton() writes permission for struct helper + */ + private void writeStructPermissionJavaSkeleton(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 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) { + private void writeConstructorJavaSkeleton(String newSkelClass, String intface, InterfaceDecl intDecl, Collection methods, boolean callbackExist) { println("public " + newSkelClass + "(" + intface + " _mainObj, int _port) throws Exception {"); println("mainObj = _mainObj;"); println("rmiObj = new IoTRMIObject(_port);"); // Generate permission control initialization writeConstructorJavaPermission(intface); + writeJavaInitCallbackPermission(intface, intDecl, callbackExist); + writeStructPermissionJavaSkeleton(methods, intDecl, intface); println("___waitRequestInvokeMethod();"); println("}\n"); } @@ -1240,8 +1282,8 @@ public class IoTCompiler { 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 });"); + print("Object[] paramObj = rmiObj.getMethodParams(new Class[] { int.class, String.class, int.class },"); + println("new Class[] { null, null, null });"); println("rmiCall = new IoTRMICall((int) paramObj[0], (String) paramObj[1], (int) paramObj[2]);"); println("}\n"); } @@ -1253,6 +1295,7 @@ public class IoTCompiler { private void writeMethodJavaSkeleton(Collection methods, InterfaceDecl intDecl, Set callbackClasses, boolean callbackSkeleton) { + boolean isDefined = false; for (String method : methods) { List methParams = intDecl.getMethodParams(method); @@ -1279,8 +1322,10 @@ public class IoTCompiler { // Now, write the body of skeleton! writeStdMethodBodyJavaSkeleton(methParams, methodId, intDecl.getMethodType(method)); println("}\n"); - if (isCallbackMethod) + if (isCallbackMethod && !isDefined) { // Make sure that this function is only defined once! writeInitCallbackJavaSkeleton(callbackSkeleton); + isDefined = true; + } } } @@ -1289,23 +1334,24 @@ public class IoTCompiler { * HELPER: writeCallbackJavaStubGeneration() writes the callback stub generation part */ private Map writeCallbackJavaStubGeneration(List methParams, List methPrmTypes, - String callbackType) { + String 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 numStubs" + i + " = (int) paramObj[" + offsetPfx + i + "];"); println(exchParamType + "[] stub" + i + " = new " + exchParamType + "[numStubs" + i + "];"); } else if (isList(paramType)) { - println("int numStubs" + i + " = (int) paramObj[" + i + "];"); + println("int numStubs" + i + " = (int) paramObj[" + offsetPfx + i + "];"); println("List<" + exchParamType + "> stub" + i + " = new ArrayList<" + exchParamType + ">();"); } else { println(exchParamType + " stub" + i + " = new " + exchParamType + "_CallbackStub(rmiCall, objIdCnt);"); @@ -1314,7 +1360,7 @@ public class IoTCompiler { } // 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);"); @@ -1336,28 +1382,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]];"); @@ -1373,10 +1426,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 @@ -1397,10 +1450,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 @@ -1411,9 +1464,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];"); @@ -1459,14 +1512,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;"); @@ -1489,6 +1540,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); @@ -1506,12 +1558,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 @@ -1539,7 +1590,7 @@ public class IoTCompiler { } } else { // Take offsets of parameters - println("int offset" + i +" = objPos;"); + println("int offset" + i +" = objPos++;"); } } } @@ -1567,7 +1618,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)); @@ -1577,6 +1628,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)); @@ -1597,31 +1658,34 @@ public class IoTCompiler { List methPrmTypes, String method, boolean isCallbackMethod, String 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 @@ -1632,17 +1696,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); + } else if (isStructClass(getSimpleArrayType(getGenericType(retType)))) { // Struct type + writeStructReturnJavaSkeleton(getSimpleArrayType(getGenericType(retType)), retType); println("rmiObj.sendReturnObj(retCls, retObj);"); } else println("rmiObj.sendReturnObj(retObj);"); } 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("}"); @@ -1664,6 +1729,7 @@ public class IoTCompiler { 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); @@ -1726,8 +1792,10 @@ public class IoTCompiler { 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) @@ -1764,11 +1832,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); } @@ -1819,7 +1888,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("public int ___"); @@ -1850,7 +1919,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("public int ___"); @@ -1880,7 +1949,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;"); @@ -1898,17 +1967,18 @@ public class IoTCompiler { 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); } @@ -1931,7 +2001,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 "); @@ -1960,7 +2030,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 "); @@ -2072,7 +2142,7 @@ public class IoTCompiler { // Write properties writePropertiesJavaSkeleton(intface, callbackExist, intDecl); // Write constructor - writeConstructorJavaSkeleton(newSkelClass, intface); + writeConstructorJavaSkeleton(newSkelClass, intface, intDecl, methods, callbackExist); // Write methods writeMethodJavaSkeleton(methods, intDecl, callbackClasses, false); // Write method helper @@ -2093,7 +2163,7 @@ public class IoTCompiler { println("private " + intface + " mainObj;"); // For callback skeletons, this is its own object Id - println("private static int objectId = 0;"); + println("private int objectId = 0;"); // Callback if (callbackExist) { println("private static int objIdCnt = 0;"); @@ -2106,7 +2176,7 @@ public class IoTCompiler { /** * HELPER: writeConstructorJavaCallbackSkeleton() writes the constructor of the skeleton class */ - private void writeConstructorJavaCallbackSkeleton(String newSkelClass, String intface) { + private void writeConstructorJavaCallbackSkeleton(String newSkelClass, String intface, InterfaceDecl intDecl, Collection methods) { println("public " + newSkelClass + "(" + intface + " _mainObj, int _objectId) throws Exception {"); println("mainObj = _mainObj;"); @@ -2140,11 +2210,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); } @@ -2253,7 +2324,7 @@ public class IoTCompiler { // Write properties writePropertiesJavaCallbackSkeleton(intface, callbackExist); // Write constructor - writeConstructorJavaCallbackSkeleton(newSkelClass, intface); + writeConstructorJavaCallbackSkeleton(newSkelClass, intface, intDecl, methods); // Write methods writeMethodJavaSkeleton(methods, intDecl, callbackClasses, true); // Write method helper @@ -2386,6 +2457,7 @@ public class IoTCompiler { // 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); @@ -2471,7 +2543,8 @@ public class IoTCompiler { println("#define _" + newIntface.toUpperCase() + "_HPP__"); println("#include "); // Pass in set of methods and get import classes - Set includeClasses = getIncludeClasses(intMeth.getValue(), intDecl, intface, false); + Set methods = intMeth.getValue(); + Set includeClasses = getIncludeClasses(methods, intDecl, intface, false); List stdIncludeClasses = getStandardCplusIncludeClasses(); List allIncludeClasses = getAllLibClasses(stdIncludeClasses, includeClasses); printIncludeStatements(allIncludeClasses); println(""); @@ -2480,7 +2553,7 @@ public class IoTCompiler { println("{"); println("public:"); // Write methods - writeMethodCplusInterface(intMeth.getValue(), intDecl); + writeMethodCplusInterface(methods, intDecl); println("};"); println("#endif"); pw.close(); @@ -2495,20 +2568,18 @@ public class IoTCompiler { */ private void writeMethodCplusStub(Collection methods, InterfaceDecl intDecl, Set callbackClasses) { + boolean isDefined = false; for (String method : methods) { List methParams = intDecl.getMethodParams(method); List methPrmTypes = intDecl.getMethodParamTypes(method); - - //System.out.println("\n\nMethod return type: " + checkAndGetCplusType(intDecl.getMethodType(method)) + "\n\n"); - print(checkAndGetCplusType(intDecl.getMethodType(method)) + " " + intDecl.getMethodId(method) + "("); boolean isCallbackMethod = false; String callbackType = null; 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; @@ -2526,13 +2597,13 @@ public class IoTCompiler { println(") { "); 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) { + if (isCallbackMethod && !isDefined) { writeInitCallbackCplusStub(callbackType, intDecl); writeInitCallbackSendInfoCplusStub(intDecl); + isDefined = true; } } } @@ -2553,71 +2624,23 @@ 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("for (" + getGenericType(paramType) + "* cb : " + getSimpleIdentifier(param) + ") {"); + println(callbackType + "_CallbackSkeleton* skel" + i + " = new " + callbackType + "_CallbackSkeleton(cb, objIdCnt++);"); isArrayOrList = true; callbackParam = getSimpleIdentifier(param); } else - println(callbackType + "_CallbackSkeleton* skel = new " + callbackType + "_CallbackSkeleton(" + + println(callbackType + "_CallbackSkeleton* skel" + i + " = new " + callbackType + "_CallbackSkeleton(" + getSimpleIdentifier(param) + ", objIdCnt++);"); - println("vecCallbackObj.push_back(skel);"); - if (isArrayOrList(paramType, param)) + println("vecCallbackObj.push_back(skel" + i + ");"); + if (isArrayOrList) println("}"); + print("int ___paramCB" + i + " = "); + if (isArrayOrList) + println(callbackParam + ".size();"); + else + println("1;"); } } - println("int numParam = " + methParams.size() + ";"); - 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 = \"" + checkAndGetCplusRetClsType(getStructType(getEnumType(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 = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - //String prmType = getSimpleType(getEnumType(paramTypeC)); - String paramTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); - String prmType = 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;"); - } } @@ -2630,14 +2653,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);"); @@ -2654,10 +2676,10 @@ public class IoTCompiler { private void checkAndWriteEnumRetTypeCplusStub(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 println("vector retEnumInt;"); @@ -2687,7 +2709,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)) { // Check if this is enum type println("int numParam" + i + " = 1;"); @@ -2697,7 +2719,7 @@ public class IoTCompiler { 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;"); @@ -2724,8 +2746,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)); @@ -2747,24 +2769,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(";"); @@ -2776,7 +2796,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, String callbackType) { print("int numParam = "); writeLengthStructParamClassCplusStub(methParams, methPrmTypes); @@ -2791,10 +2811,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(";"); @@ -2870,17 +2892,15 @@ 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 + ";"); } } @@ -2897,37 +2917,41 @@ public class IoTCompiler { * 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, String 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 = \"" + 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 = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - //String prmType = getSimpleType(getEnumType(paramTypeC)); - String paramTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); - String prmType = 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(", "); @@ -2945,7 +2969,7 @@ public class IoTCompiler { writeStructReturnCplusStub(getGenericType(getSimpleArrayType(retType)), retType); } else { // Check if the return value NONPRIMITIVES - if (getParamCategory(retType) == ParamCategory.ENUM) { + if (isEnumClass(getSimpleArrayType(getGenericType(retType)))) { checkAndWriteEnumRetTypeCplusStub(retType); } else { //if (getParamCategory(retType) == ParamCategory.NONPRIMITIVES) @@ -2972,8 +2996,8 @@ public class IoTCompiler { for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); int newObjectId = getNewIntfaceObjectId(newIntface); - println("const static int object" + newObjectId + "Id = " + newObjectId + ";"); - println("const static set set" + newObjectId + "Allowed;"); + println("const static int object" + newObjectId + "Id = " + newObjectId + ";\t//" + newIntface); + println("static set set" + newObjectId + "Allowed;"); } } @@ -2983,8 +3007,7 @@ public class IoTCompiler { private void writePropertiesCplusStub(String intface, String newIntface, boolean callbackExist, Set callbackClasses) { println("IoTRMICall *rmiCall;"); - //println("IoTRMIObject\t\t\t*rmiObj;"); - println("string address;"); + println("string callbackAddress;"); println("vector ports;\n"); // Get the object Id Integer objId = mapIntfaceObjId.get(intface); @@ -3012,12 +3035,11 @@ public class IoTCompiler { 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;"); + "(int _port, const char* _skeletonAddress, const char* _callbackAddress, int _rev, bool* _bResult, vector _ports) {"); + println("callbackAddress = _callbackAddress;"); println("ports = _ports;"); - println("rmiCall = new IoTRMICall(_port, _address, _rev, _bResult);"); + println("rmiCall = new IoTRMICall(_port, _skeletonAddress, _rev, _bResult);"); if (callbackExist) { - println("objIdCnt = 0;"); Iterator it = callbackClasses.iterator(); String callbackType = (String) it.next(); println("thread th1 (&" + newStubClass + "::___initCallBack, this);"); @@ -3069,7 +3091,7 @@ public class IoTCompiler { int newObjectId = getNewIntfaceObjectId(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("return;"); println("}"); } } @@ -3091,16 +3113,35 @@ public class IoTCompiler { println(intface + "_CallbackSkeleton* skel = dynamic_cast<" + intface + "_CallbackSkeleton*> (vecCallbackObj.at(objId));"); println("skel->invokeMethod(rmiObj);"); - println("} else {"); + print("}"); + 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("return;"); println("}"); println("}"); println("}\n"); } + /** + * HELPER: writeCplusInitCallbackPermission() writes the permission for callback + */ + private void writeCplusInitCallbackPermission(String intface, InterfaceDecl intDecl, boolean callbackExist) { + + if (callbackExist) { + String method = "___initCallBack()"; + int methodNumId = intDecl.getHelperMethodNumId(method); + Map> mapNewIntMethods = mapInt2NewInts.get(intface); + for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { + String newIntface = intMeth.getKey(); + int newObjectId = getNewIntfaceObjectId(newIntface); + println("set" + newObjectId + "Allowed.insert(" + methodNumId + ");"); + } + } + } + + /** * HELPER: writeInitCallbackSendInfoCplusStub() writes the initialization (send info part) of callback */ @@ -3110,11 +3151,12 @@ public class IoTCompiler { println("void ___regCB() {"); println("int numParam = 3;"); String method = "___initCallBack()"; - println("int methodId = " + intDecl.getHelperMethodNumId(method) + ";"); + int methodNumId = intDecl.getHelperMethodNumId(method); + println("int methodId = " + methodNumId + ";"); println("string retType = \"void\";"); - println("string paramCls[] = { \"int\", \"string\", \"int\" };"); + println("string paramCls[] = { \"int\", \"String\", \"int\" };"); println("int rev = 0;"); - println("void* paramObj[] = { &ports[0], &address, &rev };"); + println("void* paramObj[] = { &ports[0], &callbackAddress, &rev };"); println("void* retObj = NULL;"); println("rmiCall->remoteCall(objectId, methodId, retType, paramCls, paramObj, numParam, retObj);"); println("}\n"); @@ -3162,8 +3204,15 @@ public class IoTCompiler { // Write methods writeMethodCplusStub(methods, intDecl, callbackClasses); print("}"); println(";"); - if (callbackExist) - writePermissionInitializationCplus(intface, newStubClass, intDecl); + if (callbackExist) { + Iterator it = callbackClasses.iterator(); + String callbackType = (String) it.next(); + // Generate permission stuff for callback stubs + DeclarationHandler decHandlerCallback = mapIntDeclHand.get(callbackType); + InterfaceDecl intDeclCallback = (InterfaceDecl) decHandlerCallback.getInterfaceDecl(callbackType); + writePermissionInitializationCplus(callbackType, newStubClass, intDeclCallback); + } + writeObjectIdCountInitializationCplus(newStubClass, callbackExist); println("#endif"); pw.close(); System.out.println("IoTCompiler: Generated stub class " + newStubClass + ".hpp..."); @@ -3179,7 +3228,7 @@ public class IoTCompiler { println("IoTRMICall *rmiCall;"); // Get the object Id - println("static int objectId;"); + println("int objectId;"); if (callbackExist) { // We assume that each class only has one callback interface for now Iterator it = callbackClasses.iterator(); @@ -3257,8 +3306,15 @@ public class IoTCompiler { // Write methods writeMethodCplusStub(methods, intDecl, callbackClasses); println("};"); - if (callbackExist) - writePermissionInitializationCplus(intface, newStubClass, intDecl); + if (callbackExist) { + Iterator it = callbackClasses.iterator(); + String callbackType = (String) it.next(); + // Generate permission stuff for callback stubs + DeclarationHandler decHandlerCallback = mapIntDeclHand.get(callbackType); + InterfaceDecl intDeclCallback = (InterfaceDecl) decHandlerCallback.getInterfaceDecl(callbackType); + writePermissionInitializationCplus(callbackType, newStubClass, intDeclCallback); + } + writeObjectIdCountInitializationCplus(newStubClass, callbackExist); println("#endif"); pw.close(); System.out.println("IoTCompiler: Generated callback stub class " + newIntface + ".hpp..."); @@ -3290,6 +3346,16 @@ public class IoTCompiler { } + /** + * 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 */ @@ -3300,7 +3366,7 @@ public class IoTCompiler { for (Map.Entry> intMeth : mapNewIntMethods.entrySet()) { String newIntface = intMeth.getKey(); int newObjectId = getNewIntfaceObjectId(newIntface); - print("const set " + newSkelClass + "::set" + newObjectId + "Allowed {"); + print("set " + newSkelClass + "::set" + newObjectId + "Allowed { "); Set methodIds = intMeth.getValue(); int i = 0; for (String methodId : methodIds) { @@ -3317,20 +3383,48 @@ public class IoTCompiler { } + /** + * 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) { + private void writeConstructorCplusSkeleton(String newSkelClass, String intface, boolean callbackExist, InterfaceDecl intDecl, Collection methods) { println(newSkelClass + "(" + intface + " *_mainObj, int _port) {"); println("bool _bResult = false;"); println("mainObj = _mainObj;"); println("rmiObj = new IoTRMIObject(_port, &_bResult);"); - // Callback - if (callbackExist) { - println("objIdCnt = 0;"); - } - //println("set0Allowed = Arrays.asList(object0Permission);"); + writeCplusInitCallbackPermission(intface, intDecl, callbackExist); + writeStructPermissionCplusSkeleton(methods, intDecl, intface); println("___waitRequestInvokeMethod();"); println("}\n"); } @@ -3400,7 +3494,9 @@ public class IoTCompiler { println("int param1 = 0;"); println("string param2 = \"\";"); println("int param3 = 0;"); + println("string paramCls[] = { \"int\", \"String\", \"int\" };"); println("void* paramObj[] = { ¶m1, ¶m2, ¶m3 };"); + println("rmiObj->getMethodParams(paramCls, numParam, paramObj);"); println("bool bResult = false;"); println("rmiCall = new IoTRMICall(param1, param2.c_str(), param3, &bResult);"); println("}\n"); @@ -3413,6 +3509,7 @@ public class IoTCompiler { private void writeMethodCplusSkeleton(Collection methods, InterfaceDecl intDecl, Set callbackClasses, boolean callbackSkeleton) { + boolean isDefined = false; for (String method : methods) { List methParams = intDecl.getMethodParams(method); @@ -3442,8 +3539,10 @@ public class IoTCompiler { // Now, write the body of skeleton! writeStdMethodBodyCplusSkeleton(methParams, methodId, intDecl.getMethodType(method)); println("}\n"); - if (isCallbackMethod) + if (isCallbackMethod && !isDefined) { writeInitCallbackCplusSkeleton(callbackSkeleton); + isDefined = true; + } } } @@ -3457,11 +3556,8 @@ public class IoTCompiler { 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 + if (checkCallbackType(paramType, callbackType)) // Check if this has callback object println("int numStubs" + i + " = 0;"); - } } } @@ -3477,13 +3573,13 @@ 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("vector<" + exchParamType + "*> stub" + i + ";"); 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("stub" + i + ".push_back(cb" + i + ");"); + println("vecCallbackObj.push_back(cb" + i + ");"); println("objIdCnt++;"); println("}"); } else { @@ -3505,7 +3601,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 @@ -3529,10 +3625,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 @@ -3551,7 +3647,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) { @@ -3561,9 +3657,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))); @@ -3593,23 +3689,23 @@ 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 + if (isStructClass(getSimpleArrayType(getGenericType(retType)))) // Struct type println("rmiObj->sendReturnObj(retObj, retCls, numRetObj);"); else println("rmiObj->sendReturnObj(retObj, \"" + checkAndGetCplusRetClsType(getEnumType(retType)) + "\");"); @@ -3634,11 +3730,8 @@ public class IoTCompiler { callbackType = paramType; print("\"int\""); } else { // Generate normal classes if it's not a callback object - //String paramTypeC = checkAndGetArray(methPrmTypes.get(i), methParams.get(i)); - //String prmType = getSimpleType(getEnumType(paramTypeC)); String paramTypeC = checkAndGetCplusArgClsType(methPrmTypes.get(i), methParams.get(i)); - String prmType = getEnumType(paramTypeC); - print("\"" + prmType + "\""); + print("\"" + paramTypeC + "\""); } if (i != methParams.size() - 1) { print(", "); @@ -3652,10 +3745,12 @@ 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 + ";"); } @@ -3667,7 +3762,7 @@ public class IoTCompiler { String paramType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(paramType)) print("&numStubs" + i); - else if (isEnumClass(getSimpleType(paramType))) // Check if this is enum type + else if (isEnumClass(getGenericType(paramType))) // Check if this is enum type print("¶mEnumInt" + i); else print("&" + getSimpleIdentifier(methParams.get(i))); @@ -3694,39 +3789,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 + ";"); } } } @@ -3746,25 +3837,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 + ";"); } } } @@ -3796,9 +3887,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(";"); @@ -3806,9 +3896,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(";"); @@ -3832,6 +3921,7 @@ public class IoTCompiler { 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); @@ -3843,22 +3933,22 @@ public class IoTCompiler { String prmType = returnGenericCallbackType(methPrmTypes.get(i)); if (callbackClasses.contains(prmType)) { isCallbackMethod = true; - callbackType = paramType; - writeCallbackCplusNumStubs(methParams, methPrmTypes, callbackType); + callbackType = prmType; + println("int numStubs" + i + " = 0;"); println("paramCls[pos] = \"int\";"); println("paramObj[pos++] = &numStubs" + 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)) + ";"); } @@ -3895,11 +3985,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); } @@ -3943,7 +4034,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 ___"); @@ -3978,7 +4069,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 ___"); @@ -4011,12 +4102,12 @@ public class IoTCompiler { 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("return;"); println("}"); println("}"); println("else {"); println("cerr << \"Object Id: \" << _objectId << \" not recognized!\" << endl;"); - println("exit(-1);"); + println("return;"); println("}"); } } @@ -4105,7 +4196,7 @@ public class IoTCompiler { writePropertiesCplusSkeleton(intface, callbackExist, callbackClasses); println("public:\n"); // Write constructor - writeConstructorCplusSkeleton(newSkelClass, intface, callbackExist); + writeConstructorCplusSkeleton(newSkelClass, intface, callbackExist, intDecl, methods); // Write deconstructor writeDeconstructorCplusSkeleton(newSkelClass, callbackExist, callbackClasses); // Write methods @@ -4116,6 +4207,7 @@ public class IoTCompiler { writeCplusWaitRequestInvokeMethod(methods, intDecl, callbackExist, intface); println("};"); writePermissionInitializationCplus(intface, newSkelClass, intDecl); + writeObjectIdCountInitializationCplus(newSkelClass, callbackExist); println("#endif"); pw.close(); System.out.println("IoTCompiler: Generated skeleton class " + newSkelClass + ".hpp..."); @@ -4130,7 +4222,7 @@ public class IoTCompiler { println(intface + " *mainObj;"); // Keep track of object Ids of all stubs registered to this interface - println("static int objectId;"); + println("int objectId;"); // Callback if (callbackExist) { Iterator it = callbackClasses.iterator(); @@ -4148,15 +4240,11 @@ public class IoTCompiler { /** * HELPER: writeConstructorCplusCallbackSkeleton() writes the constructor of the skeleton class */ - private void writeConstructorCplusCallbackSkeleton(String newSkelClass, String intface, boolean callbackExist) { + private void writeConstructorCplusCallbackSkeleton(String newSkelClass, String intface, boolean callbackExist, InterfaceDecl intDecl, Collection methods) { println(newSkelClass + "(" + intface + " *_mainObj, int _objectId) {"); println("mainObj = _mainObj;"); println("objectId = _objectId;"); - // Callback - if (callbackExist) { - println("objIdCnt = 0;"); - } println("}\n"); } @@ -4213,11 +4301,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); } @@ -4328,7 +4417,7 @@ public class IoTCompiler { writePropertiesCplusCallbackSkeleton(intface, callbackExist, callbackClasses); println("public:\n"); // Write constructor - writeConstructorCplusCallbackSkeleton(newSkelClass, intface, callbackExist); + writeConstructorCplusCallbackSkeleton(newSkelClass, intface, callbackExist, intDecl, methods); // Write deconstructor writeDeconstructorCplusCallbackSkeleton(newSkelClass, callbackExist, callbackClasses); // Write methods @@ -4338,6 +4427,7 @@ public class IoTCompiler { // Write waitRequestInvokeMethod() - main loop writeCplusCallbackWaitRequestInvokeMethod(methods, intDecl, callbackExist); println("};"); + writeObjectIdCountInitializationCplus(newSkelClass, callbackExist); println("#endif"); pw.close(); System.out.println("IoTCompiler: Generated callback skeleton class " + newSkelClass + ".hpp..."); @@ -4451,9 +4541,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; } @@ -4706,7 +4799,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; @@ -4714,6 +4807,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) { @@ -4722,7 +4830,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; @@ -4930,14 +5038,14 @@ 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); @@ -4949,7 +5057,6 @@ public class IoTCompiler { } else // Just return it as is if it's not non-primitives return paramType; - //return checkAndGetParamClass(paramType, true); } @@ -5036,7 +5143,12 @@ public class IoTCompiler { // - Check and return C++ vector class, e.g. List A into vector private String checkAndGetCplusArgClsType(String paramType, String param) { - String paramTypeRet = null; + 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) + "*"; @@ -5109,6 +5221,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; }