Removing callback port feature from master and slave
authorrtrimana <rtrimana@uci.edu>
Wed, 22 Feb 2017 21:42:48 +0000 (13:42 -0800)
committerrtrimana <rtrimana@uci.edu>
Wed, 22 Feb 2017 21:42:48 +0000 (13:42 -0800)
iotjava/iotruntime/cpp/iotslave/IoTSlave.cpp
iotjava/iotruntime/cpp/iotslave/IoTSlave.hpp
iotjava/iotruntime/master/CommunicationHandler.java
iotjava/iotruntime/master/IoTMaster.java
iotjava/iotruntime/master/ObjectInitHandler.java
iotjava/iotruntime/master/ObjectInitInfo.java
iotjava/iotruntime/messages/MessageGetObject.java
iotjava/iotruntime/slave/IoTSlave.java
localconfig/iotruntime/IoTMaster.config

index e4d48641615895ed5514ee3e2e95c8e9e14244e6..89d99970f21ce52ec86ba529fc9761407e7432a6 100644 (file)
@@ -246,9 +246,6 @@ void IoTSlave::instantiateSkelObject() {
 
        void* params[SKELPARAMSIZE];
        params[0] = objMainCls;
-       //string callbackAddress = LOCALHOST;
-       //params[1] = &callbackAddress;
-       //params[2] = &objectStubPort;
        params[1] = &objectStubPort;
        params[2] = &objectRegPort;
        writeToFile("Skeleton Object " + objectSkelClass + " created for " + objectClassName);
@@ -264,15 +261,10 @@ void IoTSlave::instantiateStubObject() {
        params[0] = &objectStubPort;
        params[1] = &objectRegPort;
        params[2] = &hostAddress;
-       //params[0] = &objectStubPort;
-       //params[1] = &hostAddress;
-       //string callbackAddress = LOCALHOST;
-       //params[2] = &callbackAddress;
        int rev = 0;
        params[3] = &rev;
        bool result = false;
        params[4] = &result;
-       //params[5] = ports;
        writeToFile("Stub Object " + objectStubClass + " created for " + objectClassName);
        writeToFile("Success 1!");
        objStubCls = create_object(params);
@@ -489,8 +481,6 @@ void IoTSlave::createStub() {
                instantiateStubObject();
                mapObjNameStub.insert(make_pair(objectName,objStubCls));
                writeToFile("=> Map has: " + to_string(mapObjNameStub.size()) + " members");
-               // vector<int> for ports has been copied - now delete it
-               delete ports;
        }
 }
 
@@ -559,13 +549,6 @@ void IoTSlave::getIoTSetRelationObject() {
        writeToFile("=> Driver object registry port: " + to_string(objectRegPort));
        objectStubPort = recvInteger(); sendAck();
        writeToFile("=> Driver object stub port: " + to_string(objectStubPort));
-       int numOfPorts = recvInteger(); sendAck();
-       ports = new vector<int>();
-       for (int i = 0; i < numOfPorts; i++) {
-               int port = recvInteger(); sendAck();
-               ports->push_back(port);
-               writeToFile("==> Got a new port: " + to_string(port));
-       }
 }
 
 
index 1d14eacb73d9ff2ae7f60d5c7245776ba3ddfd47..834580ac4705e234003c8fd46ace77a6874e7803 100644 (file)
@@ -60,7 +60,6 @@ class IoTSlave {
                // Constants
                const static int RCVBUFSIZE = 1024;                     // Size of receive buffer
                const static int SKELPARAMSIZE = 3;                     // Number of params for skeleton
-               //const static int STUBPARAMSIZE = 6;                   // Number of params for stub
                const static int STUBPARAMSIZE = 5;                     // Number of params for stub
                const static string FILEPATH;                           // File path
                const static string FILEEXT;                            // File extension
@@ -85,7 +84,6 @@ class IoTSlave {
                string objectStubClass;         // Need to send from Java IoTSlave: sMessage.getObjectStubInterfaceName() + STUB_CLASS_SUFFIX
                int objectRegPort;
                int objectStubPort;
-               vector<int>* ports;                     // Now used to contain callback ports
                string objectFieldName;                                         // Field name that is going to be initialized with IoTSet or IoTRelation
                unordered_set<void*>* isetObject;                       // Set of object
                IoTSet<void*>* iotsetObject;                            // IoTSet of object
index def3e77b653e6e723f421ad7516b1e8bcd645df9..15db69022eeaf98d0c04adcac6f2d1c8847ea8c0 100644 (file)
@@ -67,8 +67,6 @@ public final class CommunicationHandler {
        private Map<Integer, Integer> hmRMIRegPort;
        private Map<Integer, Integer> hmRMIStubPort;
        private Set<Integer> hsDevicePort;
-       private Set<Integer> hsCallbackPort;
-       private Map<Integer, Integer[]> hmCallbackPort;
        private Map<Integer, Integer> hmAdditionalPort;
        private int iNumOfObjects;
        private int iNumOfHosts;
@@ -98,8 +96,6 @@ public final class CommunicationHandler {
                hmRMIRegPort = new HashMap<Integer, Integer>();
                hmRMIStubPort = new HashMap<Integer, Integer>();
                hsDevicePort = new HashSet<Integer>();
-               hsCallbackPort = new HashSet<Integer>();
-               hmCallbackPort = new HashMap<Integer, Integer[]>();
                hmAdditionalPort = new HashMap<Integer, Integer>();
                iNumOfObjects = 0;
                iNumOfHosts = 0;
@@ -186,61 +182,6 @@ public final class CommunicationHandler {
                listObjCrtInfo.add(objCrtInfo);
        }
 
-
-       /**
-        * Method getCallbackPort()
-        * <p>
-        * Get a new port for new connections for callback objects in the program.
-        * This newly generated port number will be recorded.
-        *
-        * @return  int[]       A set of callback ports
-        */
-       public int[] getCallbackPorts(int numOfPorts) {
-
-               int[] ports = new int[numOfPorts];
-
-               for(int i = 0; i < numOfPorts; i++) {
-                       do {
-                               ports[i] = random.nextInt(INT_MAX_PORT - INT_MIN_PORT + 1) + INT_MIN_PORT;
-                               // Check port existence in HashMap
-                       } while (portIsAvailable(ports[i]) == false);
-                       hsCallbackPort.add(ports[i]);
-               }
-
-               return ports;
-       }
-
-
-       /**
-        * Method getCallbackPorts()
-        * <p>
-        * Get a set of new ports for new connections for callback objects in the program.
-        * This newly generated port number will be recorded.
-        *
-        * @return  int[]       A set of callback ports
-        */
-       public Integer[] getCallbackPorts(String sAObject, int numOfPorts) {
-
-               Integer[] ports = new Integer[numOfPorts];
-               int iNumOfObject = hmActiveObj.get(sAObject);
-
-               if (!hmCallbackPort.containsKey(iNumOfObject)) {
-                       for(int i = 0; i < numOfPorts; i++) {
-                               do {
-                                       ports[i] = random.nextInt(INT_MAX_PORT - INT_MIN_PORT + 1) + INT_MIN_PORT;
-                                       // Check port existence in HashMap
-                               } while (portIsAvailable(ports[i]) == false);
-                               hsCallbackPort.add(ports[i]);
-                       }
-                       hmCallbackPort.put(iNumOfObject, ports);
-               } else {
-                       ports = hmCallbackPort.get(iNumOfObject);
-               }
-
-               return ports;
-       }
-
-
        /**
         * Method addDevicePort()
         * <p>
@@ -302,8 +243,6 @@ public final class CommunicationHandler {
                        return false;
                } else if (hsDevicePort.contains(iPortNumber) == true) {
                        return false;
-               } else if (hsCallbackPort.contains(iPortNumber) == true) {
-                       return false;
                } else {
                        return true;
                }
@@ -523,9 +462,6 @@ public final class CommunicationHandler {
                                RuntimeOutput.print("\n", bVerbose);
                        }
                }
-               for(Integer i : hsCallbackPort)
-                       RuntimeOutput.print("RMI callback Port: " + i, bVerbose);
-               RuntimeOutput.print("\n", bVerbose);
 
                for(int iPort : hsDevicePort) {
                        RuntimeOutput.print("Device Port: " + iPort, bVerbose);
index 5fb917807b47d9183b8299100279f0434395f497..6a66039bf12ec6fd0a2f15581788c297a6b77d67 100644 (file)
@@ -96,7 +96,6 @@ public class IoTMaster {
        private static String STR_ZB_GATEWAY_ADDRESS;
        private static String STR_ZB_GATEWAY_PORT;
        private static String STR_ZB_IOTMASTER_PORT;
-       private static String STR_NUM_CALLBACK_PORTS;
        private static String STR_JVM_INIT_HEAP_SIZE;
        private static String STR_JVM_MAX_HEAP_SIZE;
        private static String STR_LANGUAGE_CONTROLLER;
@@ -188,7 +187,6 @@ public class IoTMaster {
                STR_ZB_GATEWAY_ADDRESS = null;
                STR_ZB_GATEWAY_PORT = null;
                STR_ZB_IOTMASTER_PORT = null;
-               STR_NUM_CALLBACK_PORTS = null;
                STR_JVM_INIT_HEAP_SIZE = null;
                STR_JVM_MAX_HEAP_SIZE = null;
                STR_LANGUAGE_CONTROLLER = null;
@@ -247,10 +245,8 @@ public class IoTMaster {
                STR_ZB_GATEWAY_ADDRESS = prop.getProperty("ZIGBEE_GATEWAY_ADDRESS");
                STR_ZB_GATEWAY_PORT = prop.getProperty("ZIGBEE_GATEWAY_PORT");
                STR_ZB_IOTMASTER_PORT = prop.getProperty("ZIGBEE_IOTMASTER_PORT");
-               STR_NUM_CALLBACK_PORTS = prop.getProperty("NUMBER_CALLBACK_PORTS");
                STR_JVM_INIT_HEAP_SIZE = prop.getProperty("JVM_INIT_HEAP_SIZE");
                STR_JVM_MAX_HEAP_SIZE = prop.getProperty("JVM_MAX_HEAP_SIZE");
-               //STR_LANGUAGE = prop.getProperty("LANGUAGE");
                STR_SKEL_CLASS_SUFFIX = prop.getProperty("SKEL_CLASS_SUFFIX");
                STR_STUB_CLASS_SUFFIX = prop.getProperty("STUB_CLASS_SUFFIX");
                if(prop.getProperty("VERBOSE").equals(STR_YES)) {
@@ -273,10 +269,8 @@ public class IoTMaster {
                RuntimeOutput.print("STR_ZB_GATEWAY_ADDRESS=" + STR_ZB_GATEWAY_ADDRESS, BOOL_VERBOSE);
                RuntimeOutput.print("STR_ZB_GATEWAY_PORT=" + STR_ZB_GATEWAY_PORT, BOOL_VERBOSE);
                RuntimeOutput.print("STR_ZB_IOTMASTER_PORT=" + STR_ZB_IOTMASTER_PORT, BOOL_VERBOSE);
-               RuntimeOutput.print("STR_NUM_CALLBACK_PORTS=" + STR_NUM_CALLBACK_PORTS, BOOL_VERBOSE);
                RuntimeOutput.print("STR_JVM_INIT_HEAP_SIZE=" + STR_JVM_INIT_HEAP_SIZE, BOOL_VERBOSE);
                RuntimeOutput.print("STR_JVM_MAX_HEAP_SIZE=" + STR_JVM_MAX_HEAP_SIZE, BOOL_VERBOSE);
-               //RuntimeOutput.print("STR_LANGUAGE=" + STR_LANGUAGE, BOOL_VERBOSE);
                RuntimeOutput.print("STR_SKEL_CLASS_SUFFIX=" + STR_SKEL_CLASS_SUFFIX, BOOL_VERBOSE);
                RuntimeOutput.print("STR_STUB_CLASS_SUFFIX=" + STR_STUB_CLASS_SUFFIX, BOOL_VERBOSE);
                RuntimeOutput.print("BOOL_VERBOSE=" + BOOL_VERBOSE, BOOL_VERBOSE);
@@ -628,35 +622,8 @@ public class IoTMaster {
                        STR_TCP_PROTOCOL, commHan.getRMIStubPort(strObjName));
                routerConfig.configureHostMainPolicies(strIoTSlaveObjectHostAdd, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd,
                        STR_TCP_PROTOCOL, commHan.getRMIStubPort(strObjName));
-               // Send the same set of routing policies for callback ports
-               setCallbackPortsPolicy(strObjName, STR_ROUTER_ADD, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd, STR_TCP_PROTOCOL);
        }
 
-       /**
-        * A private method to set router policies for callback ports
-        *
-        * @params  strRouterAdd                                String router address
-        * @params  strIoTSlaveControllerHostAdd        String slave controller host address
-        * @params  strIoTSlaveObjectHostAdd            String slave object host address
-        * @params      strProtocol                                             String protocol
-        * @return  iPort                                                       Integer port number
-        */
-       private void setCallbackPortsPolicy(String strObjName, String strRouterAdd, String strIoTSlaveControllerHostAdd, 
-               String strIoTSlaveObjectHostAdd, String strProtocol) {
-
-               int iNumCallbackPorts = Integer.parseInt(STR_NUM_CALLBACK_PORTS);
-               Integer[] rmiCallbackPorts = commHan.getCallbackPorts(strObjName, iNumCallbackPorts);
-
-               // Iterate over port numbers and set up policies
-               for (int i=0; i<iNumCallbackPorts; i++) {
-                       routerConfig.configureRouterMainPolicies(strRouterAdd, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd,
-                               strProtocol, rmiCallbackPorts[i]);
-                       routerConfig.configureHostMainPolicies(strIoTSlaveControllerHostAdd, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd,
-                               strProtocol, rmiCallbackPorts[i]);
-                       routerConfig.configureHostMainPolicies(strIoTSlaveObjectHostAdd, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd,
-                               strProtocol, rmiCallbackPorts[i]);
-               }
-       }
 
        /**
         * A private method to set router policies for IoTDeviceAddress objects
@@ -1151,10 +1118,9 @@ public class IoTMaster {
                        strObjClassName = setInstrumenter.fieldEntryType(strObjID);
                        // Call the method to create an object
                        instrumentObject(strObjID, strLanguage);
-                       int iNumOfPorts = Integer.parseInt(STR_NUM_CALLBACK_PORTS);
                        objInitHand.addObjectIntoField(strFieldName, strIoTSlaveObjectHostAdd, strObjName,
                                strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, commHan.getRMIRegPort(strObjName), 
-                               commHan.getRMIStubPort(strObjName), commHan.getCallbackPorts(strObjName, iNumOfPorts));
+                               commHan.getRMIStubPort(strObjName));
                }
        }
 
@@ -1185,11 +1151,9 @@ public class IoTMaster {
                        instrumentObject(strObjID, strLanguage);
                        // Get the first object controller host address
                        String strFirstIoTSlaveObjectHostAdd = strIoTSlaveObjectHostAdd;
-                       int iNumOfPorts = Integer.parseInt(STR_NUM_CALLBACK_PORTS);
                        objInitHand.addObjectIntoField(strFieldName, strIoTSlaveObjectHostAdd, strObjName,
                                strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, 
-                               commHan.getRMIRegPort(strObjName), commHan.getRMIStubPort(strObjName), 
-                               commHan.getCallbackPorts(strObjName, iNumOfPorts));
+                               commHan.getRMIRegPort(strObjName), commHan.getRMIStubPort(strObjName));
                        // Operate on the second set
                        arrFieldClasses = relationInstrumenter.secondFieldClasses(iRow);
                        arrFieldValues = relationInstrumenter.secondFieldValues(iRow);
@@ -1201,8 +1165,7 @@ public class IoTMaster {
                        String strSecondIoTSlaveObjectHostAdd = strIoTSlaveObjectHostAdd;
                        objInitHand.addSecondObjectIntoField(strFieldName, strIoTSlaveObjectHostAdd, strObjName,
                                strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, 
-                               commHan.getRMIRegPort(strObjName), commHan.getRMIStubPort(strObjName),
-                               commHan.getCallbackPorts(strObjName, iNumOfPorts));
+                               commHan.getRMIRegPort(strObjName), commHan.getRMIStubPort(strObjName));
                        // ROUTING POLICY: first and second controller objects in IoTRelation
                        routerConfig.configureRouterMainPolicies(STR_ROUTER_ADD, strFirstIoTSlaveObjectHostAdd,
                                strSecondIoTSlaveObjectHostAdd, STR_TCP_PROTOCOL);
@@ -1237,8 +1200,8 @@ public class IoTMaster {
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTSET
                                        commMasterToSlave(new MessageGetObject(IoTCommCode.GET_IOTSET_OBJECT, objInitInfo.getIoTSlaveObjectHostAdd(),
                                                objInitInfo.getObjectName(), objInitInfo.getObjectClassName(), objInitInfo.getObjectClassInterfaceName(), 
-                                               objInitInfo.getObjectStubClassInterfaceName(), objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(),
-                                               objInitInfo.getRMICallbackPorts()), "Get IoTSet object!", inStream, outStream);
+                                               objInitInfo.getObjectStubClassInterfaceName(), objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort()), 
+                                               "Get IoTSet object!", inStream, outStream);
 
                                }
                                // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO REINITIALIZE IOTSET FIELD
@@ -1256,14 +1219,14 @@ public class IoTMaster {
                                        commMasterToSlave(new MessageGetObject(IoTCommCode.GET_IOTRELATION_FIRST_OBJECT, 
                                                objInitInfo.getIoTSlaveObjectHostAdd(), objInitInfo.getObjectName(), objInitInfo.getObjectClassName(),
                                                objInitInfo.getObjectClassInterfaceName(), objInitInfo.getObjectStubClassInterfaceName(),
-                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(), objInitInfo.getRMICallbackPorts()), 
+                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort()), 
                                                "Get IoTRelation first object!", inStream, outStream);
                                        ObjectInitInfo objSecObj = (ObjectInitInfo) it.next();
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTRELATION (SECOND OBJECT)
                                        commMasterToSlave(new MessageGetObject(IoTCommCode.GET_IOTRELATION_SECOND_OBJECT,
                                                objSecObj.getIoTSlaveObjectHostAdd(), objSecObj.getObjectName(), objSecObj.getObjectClassName(),
                                                objSecObj.getObjectClassInterfaceName(), objSecObj.getObjectStubClassInterfaceName(),
-                                               objSecObj.getRMIRegistryPort(), objSecObj.getRMIStubPort(), objSecObj.getRMICallbackPorts()), 
+                                               objSecObj.getRMIRegistryPort(), objSecObj.getRMIStubPort()), 
                                                "Get IoTRelation second object!", inStream, outStream);
                                }
                                // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO REINITIALIZE IOTRELATION FIELD
@@ -1295,7 +1258,7 @@ public class IoTMaster {
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTSET
                                        getIoTSetRelationObjectCpp(IoTCommCode.GET_IOTSET_OBJECT, objInitInfo.getIoTSlaveObjectHostAdd(), objInitInfo.getObjectName(), 
                                                objInitInfo.getObjectClassName(), objInitInfo.getObjectClassInterfaceName(), objInitInfo.getObjectStubClassInterfaceName(),
-                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(), objInitInfo.getRMICallbackPorts(), outStream, inStream);
+                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(), outStream, inStream);
                                }
                                // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO REINITIALIZE IOTSET FIELD
                                reinitializeIoTSetFieldCpp(outStream, inStream);
@@ -1310,12 +1273,12 @@ public class IoTMaster {
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTRELATION (FIRST OBJECT)
                                        getIoTSetRelationObjectCpp(IoTCommCode.GET_IOTRELATION_FIRST_OBJECT, objInitInfo.getIoTSlaveObjectHostAdd(), objInitInfo.getObjectName(), 
                                                objInitInfo.getObjectClassName(), objInitInfo.getObjectClassInterfaceName(), objInitInfo.getObjectStubClassInterfaceName(),
-                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(), objInitInfo.getRMICallbackPorts(), outStream, inStream);
+                                               objInitInfo.getRMIRegistryPort(), objInitInfo.getRMIStubPort(), outStream, inStream);
                                        ObjectInitInfo objSecObj = (ObjectInitInfo) it.next();
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTRELATION (SECOND OBJECT)
                                        getIoTSetRelationObjectCpp(IoTCommCode.GET_IOTRELATION_SECOND_OBJECT, objSecObj.getIoTSlaveObjectHostAdd(), objSecObj.getObjectName(), 
                                                objSecObj.getObjectClassName(), objSecObj.getObjectClassInterfaceName(), objSecObj.getObjectStubClassInterfaceName(),
-                                               objSecObj.getRMIRegistryPort(), objSecObj.getRMIStubPort(), objSecObj.getRMICallbackPorts(), outStream, inStream);
+                                               objSecObj.getRMIRegistryPort(), objSecObj.getRMIStubPort(), outStream, inStream);
                                }
                                // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO REINITIALIZE IOTRELATION FIELD
                                reinitializeIoTRelationFieldCpp(outStream, inStream);
@@ -1813,7 +1776,7 @@ public class IoTMaster {
         */
        public void getIoTSetRelationObjectCpp(IoTCommCode iotCommCode, String strIoTSlaveHostAddress, String strObjectName, String strObjectClassName, 
                        String strObjectClassInterfaceName, String strObjectStubClassInterfaceName, int iRMIRegistryPort, int iRMIStubPort, 
-                       Integer[] iCallbackPorts, OutputStream outStream, InputStream inStream) throws IOException {
+                       OutputStream outStream, InputStream inStream) throws IOException {
 
                sendCommCode(iotCommCode, outStream, inStream);
                RuntimeOutput.print("IoTMaster: Getting IoTSet object content...", BOOL_VERBOSE);
@@ -1832,10 +1795,6 @@ public class IoTMaster {
                sendInteger(iRMIRegistryPort, outStream); recvAck(inStream);
                RuntimeOutput.print("IoTMaster: Driver object stub port: " + iRMIStubPort, BOOL_VERBOSE);
                sendInteger(iRMIStubPort, outStream); recvAck(inStream);
-               sendInteger(iCallbackPorts.length, outStream); recvAck(inStream);
-               for(Integer i : iCallbackPorts) {
-                       sendInteger(i, outStream); recvAck(inStream);
-               }
        }
 
 
index 8234e8ffb0a72de04f2c8e911ef5b885f3f03c1b..27366b6ce8185a47630fcc8aee7cd659c1fa2b7f 100644 (file)
@@ -114,12 +114,11 @@ public final class ObjectInitHandler {
         * @param   strObjClassInterfaceName    String object class interface
         * @param       iRMIRegPort                                     Integer RMI registry port
         * @param       iRMIStubPort                            Integer RMI stub port
-        * @param       iRMICallbackPorts                       Integer RMI callback ports
         * @return  void
         */
        public void addObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort, Integer[] iRMICallbackPorts) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -128,7 +127,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = listFieldToObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort, iRMICallbackPorts);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }
@@ -150,7 +149,7 @@ public final class ObjectInitHandler {
         */
        public void addSecondObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort, Integer[] iRMICallbackPorts) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -158,7 +157,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = mapFieldToSecondObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort, iRMICallbackPorts);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }
index b40ad23e54bdceb680775738b9ac3dae436265f0..39b58dcc72a239a31dcbdef9736f125171d61f6c 100644 (file)
@@ -14,7 +14,6 @@ public class ObjectInitInfo extends ObjectCreationInfo {
         */
        protected int iRMIRegPort;
        protected int iRMIStubPort;
-       protected Integer[] iRMICallbackPorts;
 
 
        /**
@@ -22,12 +21,11 @@ public class ObjectInitInfo extends ObjectCreationInfo {
         */
        public ObjectInitInfo(String _strIoTSlaveObjectHostAdd, String _strObjName, 
                String _strObjClassName, String _strObjClassInterfaceName, String _strObjStubClsIntfaceName,
-               int _iRMIRegPort, int _iRMIStubPort, Integer[] _iRMICallbackPorts) {
+               int _iRMIRegPort, int _iRMIStubPort) {
 
                super(_strIoTSlaveObjectHostAdd, _strObjName, _strObjClassName, _strObjClassInterfaceName, _strObjStubClsIntfaceName);
                iRMIRegPort = _iRMIRegPort;
                iRMIStubPort = _iRMIStubPort;
-               iRMICallbackPorts = _iRMICallbackPorts;
        }
 
        /**
@@ -43,11 +41,4 @@ public class ObjectInitInfo extends ObjectCreationInfo {
        public int getRMIStubPort() {
                return iRMIStubPort;
        }
-
-       /**
-        * Method getRMICallbackPorts()
-        */
-       public Integer[] getRMICallbackPorts() {
-               return iRMICallbackPorts;
-       }
 }
index bd8504f0f0f746c7f603f0b4751cc3cbc881b616..4a5e0454df33f7ef396265aa3832d411fc4b4b21 100644 (file)
@@ -21,7 +21,6 @@ public class MessageGetObject extends Message {
        private String sObjStubIntName;
        private int iRMIRegPort;
        private int iRMIStubPort;
-       private Integer[] iRMICallbackPorts;
        private Object[] arrObjFields;
        private Class[] arrObjFldCls;
 
@@ -29,7 +28,7 @@ public class MessageGetObject extends Message {
         * Class constructor (to tell IoTSlave controller to get objects for IoTSet/IoTRelation)
         */
        public MessageGetObject(IoTCommCode sMsg, String sHAddress, String sOName,
-               String sOClass, String sOIName, String sOSIName, int iRRPort, int iRSPort, Integer[] iCBPort) {
+               String sOClass, String sOIName, String sOSIName, int iRRPort, int iRSPort) {
 
 
                super(sMsg);
@@ -40,7 +39,6 @@ public class MessageGetObject extends Message {
                sObjStubIntName = sOSIName;
                iRMIRegPort = iRRPort;
                iRMIStubPort = iRSPort;
-               iRMICallbackPorts = iCBPort;
        }
 
        /**
@@ -108,16 +106,6 @@ public class MessageGetObject extends Message {
                return iRMIStubPort;
        }
 
-       /**
-
-        * getRMICallbackPorts() method
-        *
-        * @return  Integer[]
-        */
-       public Integer[] getRMICallbackPorts() {
-               return iRMICallbackPorts;
-       }
-
        /**
         * setHostAddress() method
         *
@@ -188,13 +176,4 @@ public class MessageGetObject extends Message {
                iRMIStubPort = iRSPort;
        }
 
-       /**
-        * setRMICallbackPorts() method
-        *
-        * @param   iCBPort  RMI callback port numbers
-        * @return  void
-        */
-       public void setRMICallbackPorts(Integer[] iCBPort) {
-               iRMICallbackPorts = iCBPort;
-       }
 }
index 0b6401dfb451b720dc93ea1353ce889e3aa2b3df..1a6fa9f30090b878f9ee64ce229536f005f6debe 100644 (file)
@@ -207,18 +207,6 @@ public class IoTSlave {
        private void createCapabBasedRMIJava(MessageCreateObject sMessage) throws 
                ClassNotFoundException, NoSuchMethodException, UnknownHostException {
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: Create capab based RMI here!");
-               System.out.println("DEBUG: sMessage host address: " + sMessage.getHostAddress());
-               System.out.println("DEBUG: sMessage object class: " + sMessage.getObjectClass());
-               System.out.println("DEBUG: sMessage object name: " + sMessage.getObjectName());
-               System.out.println("DEBUG: sMessage interface name: " + sMessage.getObjectInterfaceName());
-               System.out.println("DEBUG: sMessage reg port: " + sMessage.getRMIRegPort());
-               System.out.println("DEBUG: sMessage stub port: " + sMessage.getRMIStubPort());
-               System.out.println("DEBUG: sMessage object fields: " + Arrays.toString(sMessage.getObjectFields()));
-               System.out.println("DEBUG: sMessage object fields: " + Arrays.toString(sMessage.getObjectFldCls()));
-               System.out.println("\n\n");
-
                // Instantiate the skeleton and put in the object
                String strObjSkelName = STR_OBJ_CLS_PFX + "." + sMessage.getObjectClass() +
                                                                        "." + sMessage.getObjectInterfaceName() + SKEL_CLASS_SUFFIX;
@@ -255,9 +243,6 @@ public class IoTSlave {
                        RemoteException, AlreadyBoundException, IllegalAccessException,
                                InvocationTargetException {
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: CREATE DRIVER OBJECT!!!\n\n");
-
                // Translating into the actual Message class
                MessageCreateObject sMessage = (MessageCreateObject) sIoTMasterMsg;
                // Instantiate object using reflection
@@ -342,10 +327,6 @@ public class IoTSlave {
                // Translating into the actual Message class
                MessageCreateMainObject sMessage = (MessageCreateMainObject) sIoTMasterMsg;
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: CREATE MAIN OBJECT!!!");
-               System.out.println("DEBUG: sMessage object name: " + sMessage.getObjectName());
-
                // Getting controller class
                File file = new File(STR_JAR_FILE_PATH + sMessage.getObjectName() + STR_JAR_FILE_EXT);
                RuntimeOutput.print("IoTSlave: DEBUG print path: " + STR_JAR_FILE_PATH +
@@ -374,10 +355,6 @@ public class IoTSlave {
                // Translating into the actual Message class
                MessageCreateSetRelation sMessage = (MessageCreateSetRelation) sIoTMasterMsg;
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: CREATE NEW IOT SET!!!");
-               System.out.println("DEBUG: sMessage object field name: " + sMessage.getObjectFieldName());
-
                // Initialize field name
                strFieldName = sMessage.getObjectFieldName();
                RuntimeOutput.print("IoTSlave: Setting up field " + strFieldName, BOOL_VERBOSE);
@@ -401,10 +378,6 @@ public class IoTSlave {
                // Translating into the actual Message class
                MessageCreateSetRelation sMessage = (MessageCreateSetRelation) sIoTMasterMsg;
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: CREATE NEW IOT RELATION!!!");
-               System.out.println("DEBUG: sMessage object field name: " + sMessage.getObjectFieldName());
-
                // Initialize field name
                strFieldName = sMessage.getObjectFieldName();
                RuntimeOutput.print("IoTSlave: Setting up field " + strFieldName, BOOL_VERBOSE);
@@ -461,16 +434,6 @@ public class IoTSlave {
 
                // Translating into the actual Message class
                MessageGetObject sMessage = (MessageGetObject) sIoTMasterMsg;
-
-               System.out.println("DEBUG: sMessage host address: " + sMessage.getHostAddress());
-               System.out.println("DEBUG: sMessage object class: " + sMessage.getObjectClass());
-               System.out.println("DEBUG: sMessage object name: " + sMessage.getObjectName());
-               System.out.println("DEBUG: sMessage interface name: " + sMessage.getObjectInterfaceName());
-               System.out.println("DEBUG: sMessage reg port: " + sMessage.getRMIRegPort());
-               System.out.println("DEBUG: sMessage stub port: " + sMessage.getRMIStubPort());
-               System.out.println("DEBUG: sMessage callback ports: " + Arrays.toString(sMessage.getRMICallbackPorts()));
-               System.out.println("\n\n");
-
                Object stubObjConv = null;
                String strObjectName = sMessage.getObjectName();
                String strObjClassInterfaceName = STR_OBJ_CLS_PFX + "." + STR_INTERFACE_PFX + "." +
@@ -510,10 +473,6 @@ public class IoTSlave {
        private void getIoTSetObject() throws IOException,
                ClassNotFoundException, RemoteException, NotBoundException, NoSuchMethodException,
                InstantiationException, IllegalAccessException, InvocationTargetException {
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET IOT SET OBJECT!!!");
-
                Object objRegistry = null;
                if (CAPAB_BASED_RMI)
                        objRegistry = getObjectFromStub();
@@ -535,10 +494,6 @@ public class IoTSlave {
        private void getIoTRelationFirstObject() throws IOException,
                ClassNotFoundException, RemoteException, NotBoundException, NoSuchMethodException,
                InstantiationException, IllegalAccessException, InvocationTargetException {
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET IOT RELATION FIRST OBJECT!!!");
-
                Object objRegistry = null;
                if (CAPAB_BASED_RMI)
                        objRegistry = getObjectFromStub();
@@ -560,10 +515,6 @@ public class IoTSlave {
        private void getIoTRelationSecondObject() throws IOException,
                ClassNotFoundException, RemoteException, NotBoundException, NoSuchMethodException,
                InstantiationException, IllegalAccessException, InvocationTargetException {
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET IOT RELATION SECOND OBJECT!!!");
-
                Object objRegistry = null;
                if (CAPAB_BASED_RMI)
                        objRegistry = getObjectFromStub();
@@ -591,11 +542,6 @@ public class IoTSlave {
 
                // Reinitialize IoTSet field after getting all the objects
                iotsetObject = new IoTSet<Object>(isetObject.values());
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: REINITIALIZE IOT SET FIELD!!!");
-               System.out.println("DEBUG: Field name: " + strFieldName + "\n\n");
-
                // Private fields need getDeclaredField(), while public fields use getField()
                Field fld = clsMain.getDeclaredField(strFieldName);
                boolean bAccess = fld.isAccessible();
@@ -620,11 +566,6 @@ public class IoTSlave {
 
                // Reinitialize IoTSet field after getting all the objects
                iotrelObject = new IoTRelation<Object,Object>(irelObject.relationMap(), irelObject.size());
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: REINITIALIZE IOT RELATION FIELD!!!");
-               System.out.println("DEBUG: Field name: " + strFieldName + "\n\n");
-
                // Private fields need getDeclaredField(), while public fields use getField()
                Field fld = clsMain.getDeclaredField(strFieldName);
                boolean bAccess = fld.isAccessible();
@@ -650,15 +591,6 @@ public class IoTSlave {
 
                // Translating into the actual Message class
                MessageGetDeviceObject sMessage = (MessageGetDeviceObject) sIoTMasterMsg;
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET DEVICE IOT SET OBJECT!!!");
-               System.out.println("DEBUG: sMessage host address: " + sMessage.getHostAddress());
-               System.out.println("DEBUG: sMessage source port: " + sMessage.getSourceDeviceDriverPort());
-               System.out.println("DEBUG: sMessage destination port: " + sMessage.getDestinationDeviceDriverPort());
-               System.out.println("DEBUG: sMessage source wild card: " + sMessage.isSourcePortWildCard());
-               System.out.println("DEBUG: sMessage desination wild card: " + sMessage.isDestinationPortWildCard() + "\n\n");
-
                // Get IoTSet objects for IP address set on device driver/controller
                IoTDeviceAddress objDeviceAddress = new IoTDeviceAddress(sMessage.getHostAddress(),
                        sMessage.getSourceDeviceDriverPort(),
@@ -686,11 +618,6 @@ public class IoTSlave {
 
                // Translating into the actual Message class
                MessageGetSimpleDeviceObject sMessage = (MessageGetSimpleDeviceObject) sIoTMasterMsg;
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET ZIGBEE DEVICE IOT SET OBJECT!!!");
-               System.out.println("DEBUG: sMessage host address: " + sMessage.getHostAddress() + "\n\n");
-
                // Get IoTSet objects for IP address set on device driver/controller
                IoTZigbeeAddress objZBDevAddress = new IoTZigbeeAddress(sMessage.getHostAddress());
                RuntimeOutput.print("IoTSlave: Device address transferred: " + sMessage.getHostAddress(), BOOL_VERBOSE);
@@ -713,11 +640,6 @@ public class IoTSlave {
 
                // Translating into the actual Message class
                MessageGetSimpleDeviceObject sMessage = (MessageGetSimpleDeviceObject) sIoTMasterMsg;
-
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: GET ADD IOT SET OBJECT!!!");
-               System.out.println("DEBUG: sMessage host address: " + sMessage.getHostAddress() + "\n\n");
-
                // Get IoTSet objects for IP address set on device driver/controller
                IoTAddress objAddress = new IoTAddress(sMessage.getHostAddress());
                RuntimeOutput.print("IoTSlave: Address transferred: " + sMessage.getHostAddress(), BOOL_VERBOSE);
@@ -736,9 +658,6 @@ public class IoTSlave {
         */
        private void invokeInitMethod() throws IOException {
 
-               // TODO: DEBUG
-               System.out.println("\n\nDEBUG: INVOKE INIT METHOD!!!\n\n");
-
                new Thread() {
                        public void run() {
                                try {
index 87c9fa12a88f5327b61be77606fc14f760dd72ff..70b25d339ded8414cb1142ae14688f6c905fd2ff 100644 (file)
@@ -28,9 +28,6 @@ ZIGBEE_IOTMASTER_PORT=12345
 #Verboseness of runtime messages
 VERBOSE=Yes
 
-#Number of callback ports
-NUMBER_CALLBACK_PORTS=1
-
 #Language: C++ or Java
 LANGUAGE=Java