First benchmark working with capability-based RMI; adjustments in callbacks, etc.

[iot2.git] / benchmarks / SmartLightsController / CameraCallback_CallbackSkeleton.java

diff --git a/benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java b/benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java
index 913092afb2af4a826c041cbfcde0e7e1b2e8a61e..4c4f592578ae545d2b7d63452c704f74c2cfd206 100644 (file)
--- a/benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java
+++ b/benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java
@@ -14,10 +14,6 @@ public class CameraCallback_CallbackSkeleton implements CameraCallback {
        private CameraCallback mainObj;
        private int objectId = 0;
        private String callbackAddress;
-       private static int objIdCnt = 0;
-       private IoTRMICall rmiCall;
-       private int[] ports;
-
        
 
        public CameraCallback_CallbackSkeleton(CameraCallback _mainObj, String _callbackAddress, int _objectId) throws Exception {
@@ -26,34 +22,20 @@ public class CameraCallback_CallbackSkeleton implements CameraCallback {
                objectId = _objectId;
        }
 
-       public void newCameraFrameAvailable(CameraSmart _camera) {
-               mainObj.newCameraFrameAvailable(_camera);
-       }
-
-       public void ___regCB(IoTRMIObject rmiObj) throws IOException {
-               Object[] paramObj = rmiObj.getMethodParams(new Class<?>[] { int[].class, String.class, int.class },new Class<?>[] { null, null, null });
-               ports = (int[]) paramObj[0];
-               rmiCall = new IoTRMICall((int) paramObj[0], (String) paramObj[1], ports[1]);
+       public void newCameraFrameAvailable(byte latestFrame[], long timeStamp) {
+               mainObj.newCameraFrameAvailable(latestFrame, timeStamp);
        }
 
        public void ___newCameraFrameAvailable(IoTRMIObject rmiObj) {
-               Object[] paramObj = rmiObj.getMethodParams(new Class<?>[] { int.class }, 
-               new Class<?>[] { null });
-               try {
-                       CameraSmart stub0 = new CameraSmart_CallbackStub(rmiCall, callbackAddress, objIdCnt, ports);
-                       objIdCnt++;
-                       newCameraFrameAvailable(stub0);
-               } catch(Exception ex) {
-                       ex.printStackTrace();
-                       throw new Error("Exception from callback object instantiation!");
-               }
+               Object[] paramObj = rmiObj.getMethodParams(new Class<?>[] { byte[].class, long.class }, 
+               new Class<?>[] { null, null });
+               newCameraFrameAvailable((byte[]) paramObj[0], (long) paramObj[1]);
        }
 
        public void invokeMethod(IoTRMIObject rmiObj) throws IOException {
                int methodId = rmiObj.getMethodId();
                switch (methodId) {
                        case 0: ___newCameraFrameAvailable(rmiObj); break;
-                       case -9999: ___regCB(rmiObj); break;
                        default: 
                        throw new Error("Method Id " + methodId + " not recognized!");
                }