[REEF-136] Harmonize namespaces and folder names in Org.Apache.REEF projects
This is to harmonize namespaces and folder names in Org.Apache.REEF for most of the projects. Update folder name convention Change namespace follow the folder structure Update clr for driver name space Updated jar file used in testing Most projects have done only with a few proto related left. Will do it is a separate PR JIRA: Reef-132. (https://issues.apache.org/jira/browse/REEF-132) JIRA: Reef-135. (https://issues.apache.org/jira/browse/REEF-135) JIRA: Reef-136. (https://issues.apache.org/jira/browse/REEF-136) JIRA: Reef-137. (https://issues.apache.org/jira/browse/REEF-137) Author: Julia Wang Email: [email protected] Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/7edb8570 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/7edb8570 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/7edb8570 Branch: refs/heads/master Commit: 7edb8570e0f312f01f7cd7aedba1f49ce6d03799 Parents: 02c0ad5 Author: Julia Wang <[email protected]> Authored: Mon Feb 9 20:01:41 2015 -0800 Committer: tmajest <[email protected]> Committed: Tue Feb 10 12:02:02 2015 -0800 ---------------------------------------------------------------------- .../JavaClrBridge/ActiveContextClr2Java.cpp | 120 ++--- .../AllocatedEvaluatorClr2Java.cpp | 282 +++++------ .../JavaClrBridge/ClosedContextClr2Java.cpp | 106 ++-- .../Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h | 372 ++++++++------- .../CppBridge/JavaClrBridge/CommonUtilities.cpp | 54 ++- .../CompletedEvaluatorClr2Java.cpp | 66 +-- .../JavaClrBridge/CompletedTaskClr2Java.cpp | 84 ++-- .../JavaClrBridge/ContextMessageClr2Java.cpp | 94 ++-- .../EvaluatorRequestorClr2Java.cpp | 88 ++-- .../JavaClrBridge/FailedContextClr2Java.cpp | 120 ++--- .../JavaClrBridge/FailedEvaluatorClr2Java.cpp | 84 ++-- .../JavaClrBridge/FailedTaskClr2Java.cpp | 98 ++-- .../JavaClrBridge/HttpServerClr2Java.cpp | 202 ++++---- .../CppBridge/JavaClrBridge/JavaClrBridge.cpp | 2 +- .../JavaClrBridge/RunningTaskClr2Java.cpp | 114 ++--- .../JavaClrBridge/SuspendedTaskClr2Java.cpp | 108 +++-- .../JavaClrBridge/TaskMessageClr2Java.cpp | 66 +-- .../Org.Apache.REEF.Client/CLRBridgeClient.cs | 1 - .../Api/AbstractFailure.cs | 142 ++++++ .../Api/IAbstractFailure.cs | 25 + lang/cs/Org.Apache.REEF.Common/Api/IFailure.cs | 57 +++ .../Api/IResourceLaunchHandler.cs | 28 ++ .../Api/IResourceReleaseHandler.cs | 28 ++ .../Api/IResourceRequestHandler.cs | 28 ++ .../Avro/AvroDriverInfo.cs | 65 +++ .../Avro/AvroHttpRequest.cs | 79 +++ .../Avro/AvroHttpSerializer.cs | 36 ++ .../Avro/AvroJsonSerializer.cs | 52 ++ .../Avro/AvroReefServiceInfo.cs | 55 +++ .../Catalog/Capabilities/CPU.cs | 59 +++ .../Catalog/Capabilities/ICapability.cs | 25 + .../Catalog/Capabilities/RAM.cs | 51 ++ .../Catalog/INodeDescriptor.cs | 35 ++ .../Catalog/IRackDescriptor.cs | 25 + .../Catalog/IResourceCatalog.cs | 37 ++ .../Catalog/NodeDescriptorImpl.cs | 116 +++++ .../Catalog/RackDescriptorImpl.cs | 75 +++ .../Catalog/ResourceCatalogImpl.cs | 95 ++++ .../ClientJobStatusHandler.cs | 6 +- .../Context/ContextMessage.cs | 66 +++ .../Context/IContextMessage.cs | 28 ++ .../Context/IContextMessageHandler.cs | 27 ++ .../Context/IContextMessageSource.cs | 28 ++ .../DefaultLocalHttpDriverConnection.cs | 45 ++ .../DefaultYarnClusterHttpDriverConnection.cs | 44 ++ .../DefaultYarnOneBoxHttpDriverConnection.cs | 46 ++ .../Evaluator/DriverInformation.cs | 136 ++++++ .../Evaluator/EvaluatorOperationState.cs | 39 ++ .../Evaluator/EvaluatorRuntimeState.cs | 39 ++ .../Evaluator/EvaluatorType.cs | 39 ++ .../Evaluator/IDriverConnection.cs | 26 + .../Events/IContextStart.cs | 26 + .../Events/IContextStop.cs | 26 + .../Exceptions/EvaluatorException.cs | 75 +++ .../Exceptions/JobException.cs | 58 +++ lang/cs/Org.Apache.REEF.Common/FailedRuntime.cs | 2 +- .../IJobMessageObserver.cs | 2 +- .../cs/Org.Apache.REEF.Common/Io/INameClient.cs | 71 +++ .../Org.Apache.REEF.Common/Io/NameAssignment.cs | 60 +++ .../Io/NamingConfiguration.cs | 45 ++ .../Io/NamingConfigurationOptions.cs | 36 ++ .../Org.Apache.REEF.Common.csproj | 197 ++++---- .../Protobuf/Proto/client_runtime.proto | 56 +++ .../Protobuf/Proto/driver_runtime.proto | 90 ++++ .../Protobuf/Proto/evaluator_runtime.proto | 91 ++++ .../Protobuf/Proto/reef_protocol.proto | 44 ++ .../Protobuf/Proto/reef_service_protos.proto | 117 +++++ .../Protobuf/ReefProtocol/ClientRuntime.pb.cs | 145 ++++++ .../Protobuf/ReefProtocol/DriverRuntime.pb.cs | 337 +++++++++++++ .../EvaluatorHeartbeatProtoCodec.cs | 40 ++ .../ReefProtocol/EvaluatorRunTime.pb.cs | 304 ++++++++++++ .../Protobuf/ReefProtocol/REEFMessageCodec.cs | 37 ++ .../Protobuf/ReefProtocol/ReefProtocol.pb.cs | 75 +++ .../Protobuf/ReefProtocol/ReefService.pb.cs | 393 +++++++++++++++ .../Protobuf/ReefProtocol/Serializer.cs | 123 +++++ .../Runtime/Evaluator/Constants.cs | 40 ++ .../Context/ContextClientCodeException.cs | 70 +++ .../Evaluator/Context/ContextConfiguration.cs | 140 ++++++ .../Evaluator/Context/ContextLifeCycle.cs | 106 ++++ .../Runtime/Evaluator/Context/ContextManager.cs | 359 ++++++++++++++ .../Runtime/Evaluator/Context/ContextRuntime.cs | 478 +++++++++++++++++++ .../Evaluator/Context/ContextStartImpl.cs | 33 ++ .../Evaluator/Context/ContextStopImpl.cs | 33 ++ .../Evaluator/Context/RootContextLauncher.cs | 124 +++++ .../Runtime/Evaluator/EvaluatorRuntime.cs | 251 ++++++++++ .../Runtime/Evaluator/EvaluatorSettings.cs | 185 +++++++ .../Runtime/Evaluator/HeartBeatManager.cs | 387 +++++++++++++++ .../Evaluator/ReefMessageProtoObserver.cs | 140 ++++++ .../Runtime/Evaluator/Task/CloseEventImpl.cs | 48 ++ .../Runtime/Evaluator/Task/DriverMessageImpl.cs | 52 ++ .../Runtime/Evaluator/Task/SuspendEventImpl.cs | 48 ++ .../Evaluator/Task/TaskClientCodeException.cs | 65 +++ .../Runtime/Evaluator/Task/TaskLifeCycle.cs | 68 +++ .../Runtime/Evaluator/Task/TaskRuntime.cs | 326 +++++++++++++ .../Runtime/Evaluator/Task/TaskStartImpl.cs | 34 ++ .../Runtime/Evaluator/Task/TaskState.cs | 40 ++ .../Runtime/Evaluator/Task/TaskStatus.cs | 330 +++++++++++++ .../Runtime/Evaluator/Task/TaskStopImpl.cs | 34 ++ .../Evaluator/Utils/EvaluatorConfigurations.cs | 122 +++++ .../Runtime/Evaluator/Utils/RemoteManager.cs | 25 + .../Runtime/MachineStatus.cs | 137 ++++++ .../Org.Apache.REEF.Common/Services/IService.cs | 25 + .../Services/ServiceConfiguration.cs | 83 ++++ .../Services/ServicesConfigurationOptions.cs | 31 ++ .../Defaults/DefaultDriverMessageHandler.cs | 41 ++ .../Tasks/Defaults/DefaultTaskMessageSource.cs | 49 ++ .../Tasks/Events/ICloseEvent.cs | 28 ++ .../Tasks/Events/IDriverMessage.cs | 28 ++ .../Tasks/Events/ISuspendEvent.cs | 25 + .../Tasks/Events/ITaskStart.cs | 26 + .../Tasks/Events/ITaskStop.cs | 26 + .../Tasks/IDriverMessageHandler.cs | 29 ++ .../Tasks/IRunningTask.cs | 53 ++ lang/cs/Org.Apache.REEF.Common/Tasks/ITask.cs | 28 ++ .../Tasks/ITaskMessageSource.cs | 31 ++ .../Tasks/TaskConfiguration.cs | 149 ++++++ .../Tasks/TaskConfigurationOptions.cs | 69 +++ .../Org.Apache.REEF.Common/Tasks/TaskMessage.cs | 68 +++ .../api/AbstractFailure.cs | 142 ------ .../api/IAbstractFailure.cs | 25 - lang/cs/Org.Apache.REEF.Common/api/IFailure.cs | 57 --- .../api/IResourceLaunchHandler.cs | 28 -- .../api/IResourceReleaseHandler.cs | 28 -- .../api/IResourceRequestHandler.cs | 28 -- .../avro/AvroDriverInfo.cs | 65 --- .../avro/AvroHttpRequest.cs | 79 --- .../avro/AvroHttpSerializer.cs | 36 -- .../avro/AvroJsonSerializer.cs | 52 -- .../avro/AvroReefServiceInfo.cs | 55 --- .../catalog/INodeDescriptor.cs | 36 -- .../catalog/IRackDescriptor.cs | 25 - .../catalog/IResourceCatalog.cs | 37 -- .../catalog/NodeDescriptorImpl.cs | 116 ----- .../catalog/RackDescriptorImpl.cs | 75 --- .../catalog/ResourceCatalogImpl.cs | 95 ---- .../catalog/capabilities/CPU.cs | 60 --- .../catalog/capabilities/ICapability.cs | 25 - .../catalog/capabilities/RAM.cs | 51 -- .../context/ContextMessage.cs | 66 --- .../context/IContextMessage.cs | 28 -- .../context/IContextMessageHandler.cs | 27 -- .../context/IContextMessageSource.cs | 28 -- .../DefaultLocalHttpDriverConnection.cs | 45 -- .../DefaultYarnClusterHttpDriverConnection.cs | 44 -- .../DefaultYarnOneBoxHttpDriverConnection.cs | 46 -- .../evaluator/DriverInformation.cs | 136 ------ .../evaluator/EvaluatorOperationState.cs | 39 -- .../evaluator/EvaluatorRuntimeState.cs | 39 -- .../evaluator/EvaluatorType.cs | 39 -- .../evaluator/IDriverConnection.cs | 26 - .../events/IContextStart.cs | 26 - .../events/IContextStop.cs | 26 - .../exceptions/EvaluatorException.cs | 75 --- .../exceptions/JobException.cs | 58 --- .../cs/Org.Apache.REEF.Common/io/INameClient.cs | 71 --- .../Org.Apache.REEF.Common/io/NameAssignment.cs | 60 --- .../io/NamingConfiguration.cs | 45 -- .../io/NamingConfigurationOptions.cs | 36 -- .../protobuf/cs/ClientRuntime.pb.cs | 147 ------ .../protobuf/cs/DriverRuntime.pb.cs | 339 ------------- .../protobuf/cs/EvaluatorRunTime.pb.cs | 305 ------------ .../protobuf/cs/ReefProtocol.pb.cs | 78 --- .../protobuf/cs/ReefService.pb.cs | 393 --------------- .../protobuf/cs/Serializer.cs | 130 ----- .../cs/codec/EvaluatorHeartbeatProtoCodec.cs | 41 -- .../protobuf/cs/codec/REEFMessageCodec.cs | 37 -- .../protobuf/proto/client_runtime.proto | 56 --- .../protobuf/proto/driver_runtime.proto | 90 ---- .../protobuf/proto/evaluator_runtime.proto | 91 ---- .../protobuf/proto/reef_protocol.proto | 44 -- .../protobuf/proto/reef_service_protos.proto | 117 ----- .../runtime/MachineStatus.cs | 137 ------ .../runtime/evaluator/Constants.cs | 40 -- .../runtime/evaluator/EvaluatorRuntime.cs | 255 ---------- .../runtime/evaluator/EvaluatorSettings.cs | 185 ------- .../runtime/evaluator/HeartBeatManager.cs | 390 --------------- .../evaluator/ReefMessageProtoObserver.cs | 140 ------ .../context/ContextClientCodeException.cs | 70 --- .../evaluator/context/ContextConfiguration.cs | 140 ------ .../evaluator/context/ContextLifeCycle.cs | 105 ---- .../runtime/evaluator/context/ContextManager.cs | 362 -------------- .../runtime/evaluator/context/ContextRuntime.cs | 478 ------------------- .../evaluator/context/ContextStartImpl.cs | 33 -- .../evaluator/context/ContextStopImpl.cs | 33 -- .../evaluator/context/RootContextLauncher.cs | 126 ----- .../runtime/evaluator/task/CloseEventImpl.cs | 48 -- .../runtime/evaluator/task/DriverMessageImpl.cs | 52 -- .../runtime/evaluator/task/SuspendEventImpl.cs | 48 -- .../evaluator/task/TaskClientCodeException.cs | 65 --- .../runtime/evaluator/task/TaskLifeCycle.cs | 69 --- .../runtime/evaluator/task/TaskRuntime.cs | 328 ------------- .../runtime/evaluator/task/TaskStartImpl.cs | 34 -- .../runtime/evaluator/task/TaskState.cs | 40 -- .../runtime/evaluator/task/TaskStatus.cs | 330 ------------- .../runtime/evaluator/task/TaskStopImpl.cs | 35 -- .../evaluator/utils/EvaluatorConfigurations.cs | 121 ----- .../runtime/evaluator/utils/RemoteManager.cs | 25 - .../Org.Apache.REEF.Common/services/IService.cs | 25 - .../services/ServiceConfiguration.cs | 83 ---- .../services/ServicesConfigurationOptions.cs | 31 -- .../tasks/IDriverMessageHandler.cs | 31 -- .../tasks/IRunningTask.cs | 53 -- lang/cs/Org.Apache.REEF.Common/tasks/ITask.cs | 28 -- .../tasks/ITaskMessageSource.cs | 31 -- .../tasks/TaskConfiguration.cs | 148 ------ .../tasks/TaskConfigurationOptions.cs | 69 --- .../Org.Apache.REEF.Common/tasks/TaskMessage.cs | 68 --- .../defaults/DefaultDriverMessageHandler.cs | 42 -- .../tasks/defaults/DefaultTaskMessageSource.cs | 49 -- .../tasks/events/ICloseEvent.cs | 28 -- .../tasks/events/IDriverMessage.cs | 28 -- .../tasks/events/ISuspendEvent.cs | 25 - .../tasks/events/ITaskStart.cs | 26 - .../tasks/events/ITaskStop.cs | 26 - .../Bridge/BridgeLogger.cs | 65 +++ .../Bridge/Clr2java/IActiveContextClr2Java.cs | 36 ++ .../Clr2java/IAllocatedEvaluaotrClr2Java.cs | 42 ++ .../Bridge/Clr2java/IClosedContextClr2Java.cs | 34 ++ .../Bridge/Clr2java/IClr2Java.cs | 26 + .../Clr2java/ICompletedEvaluatorClr2Java.cs | 30 ++ .../Bridge/Clr2java/ICompletedTaskClr2Java.cs | 28 ++ .../Bridge/Clr2java/IContextMessageClr2Java.cs | 30 ++ .../Clr2java/IEvaluatorRequestorClr2Java.cs | 28 ++ .../Bridge/Clr2java/IFailedContextClr2Java.cs | 36 ++ .../Bridge/Clr2java/IFailedEvaluatorClr2Java.cs | 28 ++ .../Bridge/Clr2java/IFailedTaskClr2Java.cs | 28 ++ .../Clr2java/IHttpServerBridgeClr2Java.cs | 34 ++ .../Bridge/Clr2java/IRunningTaskClr2Java.cs | 30 ++ .../Bridge/Clr2java/ISuspendedTaskClr2Java.cs | 42 ++ .../Bridge/Clr2java/ITaskMessageClr2Java.cs | 26 + .../Bridge/ClrClientHelper.cs | 174 +++++++ .../Bridge/ClrHandlerHelper.cs | 178 +++++++ .../Bridge/ClrSystemHandler.cs | 53 ++ .../Bridge/ClrSystemHandlerWrapper.cs | 277 +++++++++++ .../Bridge/DriverBridge.cs | 322 +++++++++++++ .../Bridge/DriverBridgeConfiguration.cs | 274 +++++++++++ .../Bridge/DriverBridgeConfigurationOptions.cs | 155 ++++++ .../Bridge/Events/ActiveContext.cs | 118 +++++ .../Bridge/Events/AllocatedEvaluator.cs | 175 +++++++ .../Bridge/Events/ClosedContext.cs | 99 ++++ .../Bridge/Events/CompletedEvaluator.cs | 61 +++ .../Bridge/Events/CompletedTask.cs | 76 +++ .../Bridge/Events/ContextMessage.cs | 54 +++ .../Bridge/Events/EvaluatorRequstor.cs | 96 ++++ .../Bridge/Events/FailedContext.cs | 111 +++++ .../Bridge/Events/FailedEvaluator.cs | 72 +++ .../Bridge/Events/FailedTask.cs | 141 ++++++ .../Bridge/Events/RunningTask.cs | 98 ++++ .../Bridge/Events/SuspendedTask.cs | 83 ++++ .../Bridge/Events/TaskMessage.cs | 65 +++ .../Bridge/HttpMessage.cs | 61 +++ .../Bridge/HttpServerHandler.cs | 164 +++++++ .../Bridge/HttpServerPort.cs | 33 ++ .../Bridge/IHttpHandler.cs | 39 ++ .../Bridge/IHttpMessage.cs | 33 ++ .../Bridge/ReefHttpRequest.cs | 49 ++ .../Bridge/ReefHttpResponse.cs | 30 ++ lang/cs/Org.Apache.REEF.Driver/ClientManager.cs | 2 +- .../Context/ContextConfiguration.cs | 93 ++++ .../Context/ContextConfigurationOptions.cs | 61 +++ .../Defaults/DefaultContextMessageSource.cs | 42 ++ .../Defaults/DefaultContextStartHandler.cs | 48 ++ .../Defaults/DefaultContextStopHandler.cs | 48 ++ .../Context/EvaluatorContext.cs | 147 ++++++ .../Context/IActiveContext.cs | 29 ++ .../Context/IClosedContext.cs | 26 + .../Org.Apache.REEF.Driver/Context/IContext.cs | 45 ++ .../Context/IFailedContext.cs | 28 ++ .../Contract/IBridgeContract.cs | 26 + .../Defaults/DefaultClientCloseHandler.cs | 53 ++ .../DefaultClientCloseWithMessageHandler.cs | 54 +++ .../Defaults/DefaultClientMessageHandler.cs | 54 +++ .../Defaults/DefaultContextActiveHandler.cs | 56 +++ .../Defaults/DefaultContextClosureHandler.cs | 55 +++ .../Defaults/DefaultContextFailureHandler.cs | 51 ++ .../Defaults/DefaultContextMessageHandler.cs | 55 +++ .../Defaults/DefaultCustomTraceListener.cs | 45 ++ .../DefaultDriverRestartContextActiveHandler.cs | 56 +++ .../Defaults/DefaultDriverRestartHandler.cs | 55 +++ .../DefaultDriverRestartTaskRunningHandler.cs | 54 +++ .../DefaultEvaluatorAllocationHandler.cs | 57 +++ .../DefaultEvaluatorCompletionHandler.cs | 54 +++ .../Defaults/DefaultEvaluatorFailureHandler.cs | 55 +++ .../DefaultEvaluatorRequestorHandler.cs | 61 +++ .../Defaults/DefaultHttpHandler.cs | 49 ++ .../Defaults/DefaultTaskCompletionHandler.cs | 60 +++ .../Defaults/DefaultTaskFailureHandler.cs | 53 ++ .../Defaults/DefaultTaskMessageHandler.cs | 55 +++ .../Defaults/DefaultTaskRunningHandler.cs | 54 +++ .../Defaults/DefaultTaskSuspensionHandler.cs | 54 +++ .../DriverConfigGenerator.cs | 3 +- lang/cs/Org.Apache.REEF.Driver/DriverManager.cs | 5 +- .../DriverRuntimeConfiguration.cs | 1 - .../Evaluator/EvaluatorDescriptorImpl.cs | 218 +++++++++ .../Evaluator/EvaluatorRequest.cs | 107 +++++ .../Evaluator/EvaluatorRequestBuilder.cs | 60 +++ .../Evaluator/IAllocatedEvaluator.cs | 55 +++ .../Evaluator/ICompletedEvaluator.cs | 30 ++ .../Evaluator/IEvaluatorDescriptor.cs | 57 +++ .../Evaluator/IEvaluatorRequest .cs | 42 ++ .../Evaluator/IEvaluatorRequestor.cs | 47 ++ .../Evaluator/IFailedEvaluator.cs | 42 ++ .../Org.Apache.REEF.Driver/EvaluatorManager.cs | 8 +- .../Org.Apache.REEF.Driver.csproj | 184 +++---- .../Task/ICompletedTask.cs | 29 ++ .../Org.Apache.REEF.Driver/Task/IFailedTask.cs | 30 ++ .../Org.Apache.REEF.Driver/Task/IRunningTask.cs | 65 +++ .../Task/ISuspendedTask.cs | 29 ++ .../Org.Apache.REEF.Driver/Task/ITaskMessage.cs | 28 ++ .../Task/RunningTaskImpl.cs | 127 +++++ .../bridge/BridgeLogger.cs | 65 --- .../bridge/ClrClientHelper.cs | 175 ------- .../bridge/ClrHandlerHelper.cs | 178 ------- .../bridge/ClrSystemHandler.cs | 53 -- .../bridge/ClrSystemHandlerWrapper.cs | 274 ----------- .../bridge/DriverBridge.cs | 321 ------------- .../bridge/DriverBridgeConfiguration.cs | 273 ----------- .../bridge/DriverBridgeConfigurationOptions.cs | 154 ------ .../bridge/HttpMessage.cs | 60 --- .../bridge/HttpServerHandler.cs | 165 ------- .../bridge/HttpServerPort.cs | 33 -- .../bridge/IHttpHandler.cs | 39 -- .../bridge/IHttpMessage.cs | 33 -- .../bridge/ReefHttpRequest.cs | 49 -- .../bridge/ReefHttpResponse.cs | 30 -- .../bridge/clr2java/IActiveContextClr2Java.cs | 36 -- .../clr2java/IAllocatedEvaluaotrClr2Java.cs | 42 -- .../bridge/clr2java/IClosedContextClr2Java.cs | 34 -- .../bridge/clr2java/IClr2Java.cs | 26 - .../clr2java/ICompletedEvaluatorClr2Java.cs | 30 -- .../bridge/clr2java/ICompletedTaskClr2Java.cs | 28 -- .../bridge/clr2java/IContextMessageClr2Java.cs | 30 -- .../clr2java/IEvaluatorRequestorClr2Java.cs | 28 -- .../bridge/clr2java/IFailedContextClr2Java.cs | 36 -- .../bridge/clr2java/IFailedEvaluatorClr2Java.cs | 30 -- .../bridge/clr2java/IFailedTaskClr2Java.cs | 28 -- .../clr2java/IHttpServerBridgeClr2Java.cs | 34 -- .../bridge/clr2java/IRunningTaskClr2Java.cs | 30 -- .../bridge/clr2java/ISuspendedTaskClr2Java.cs | 42 -- .../bridge/clr2java/ITaskMessageClr2Java.cs | 26 - .../bridge/events/ActiveContext.cs | 117 ----- .../bridge/events/AllocatedEvaluator.cs | 175 ------- .../bridge/events/ClosedContext.cs | 98 ---- .../bridge/events/CompletedEvaluator.cs | 60 --- .../bridge/events/CompletedTask.cs | 75 --- .../bridge/events/ContextMessage.cs | 53 -- .../bridge/events/EvaluatorRequstor.cs | 95 ---- .../bridge/events/FailedContext.cs | 110 ----- .../bridge/events/FailedEvaluator.cs | 72 --- .../bridge/events/FailedTask.cs | 140 ------ .../bridge/events/RunningTask.cs | 97 ---- .../bridge/events/SuspendedTask.cs | 81 ---- .../bridge/events/TaskMessage.cs | 64 --- .../context/ContextConfiguration.cs | 93 ---- .../context/ContextConfigurationOptions.cs | 60 --- .../context/EvaluatorContext.cs | 148 ------ .../context/IActiveContext.cs | 29 -- .../context/IClosedContext.cs | 26 - .../Org.Apache.REEF.Driver/context/IContext.cs | 45 -- .../context/IFailedContext.cs | 28 -- .../defaults/DefaultContextMessageSource.cs | 42 -- .../defaults/DefaultContextStartHandler.cs | 48 -- .../defaults/DefaultContextStopHandler.cs | 48 -- .../contract/IBridgeContract.cs | 26 - .../defaults/DefaultClientCloseHandler.cs | 53 -- .../DefaultClientCloseWithMessageHandler.cs | 54 --- .../defaults/DefaultClientMessageHandler.cs | 54 --- .../defaults/DefaultContextActiveHandler.cs | 56 --- .../defaults/DefaultContextClosureHandler.cs | 55 --- .../defaults/DefaultContextFailureHandler.cs | 51 -- .../defaults/DefaultContextMessageHandler.cs | 55 --- .../defaults/DefaultCustomTraceListener.cs | 45 -- .../DefaultDriverRestartContextActiveHandler.cs | 56 --- .../defaults/DefaultDriverRestartHandler.cs | 54 --- .../DefaultDriverRestartTaskRunningHandler.cs | 54 --- .../DefaultEvaluatorAllocationHandler.cs | 57 --- .../DefaultEvaluatorCompletionHandler.cs | 54 --- .../defaults/DefaultEvaluatorFailureHandler.cs | 55 --- .../DefaultEvaluatorRequestorHandler.cs | 61 --- .../defaults/DefaultHttpHandler.cs | 49 -- .../defaults/DefaultTaskCompletionHandler.cs | 60 --- .../defaults/DefaultTaskFailureHandler.cs | 53 -- .../defaults/DefaultTaskMessageHandler.cs | 55 --- .../defaults/DefaultTaskRunningHandler.cs | 54 --- .../defaults/DefaultTaskSuspensionHandler.cs | 53 -- .../evaluator/EvaluatorDescriptorImpl.cs | 218 --------- .../evaluator/EvaluatorRequest.cs | 108 ----- .../evaluator/EvaluatorRequestBuilder.cs | 60 --- .../evaluator/IAllocatedEvaluator.cs | 55 --- .../evaluator/ICompletedEvaluator.cs | 30 -- .../evaluator/IEvaluatorDescriptor.cs | 57 --- .../evaluator/IEvaluatorRequest .cs | 42 -- .../evaluator/IEvaluatorRequestor.cs | 47 -- .../evaluator/IFailedEvaluator.cs | 41 -- .../task/ICompletedTask.cs | 29 -- .../Org.Apache.REEF.Driver/task/IFailedTask.cs | 30 -- .../Org.Apache.REEF.Driver/task/IRunningTask.cs | 65 --- .../task/ISuspendedTask.cs | 29 -- .../Org.Apache.REEF.Driver/task/ITaskMessage.cs | 28 -- .../task/RunningTaskImpl.cs | 127 ----- lang/cs/Org.Apache.REEF.Evaluator/Evaluator.cs | 12 +- .../Handlers/HelloActiveContextHandler.cs | 2 +- .../Handlers/HelloAllocatedEvaluatorHandler.cs | 6 +- .../Handlers/HelloRestartHandler.cs | 1 + .../Handlers/HelloSimpleEventHandlers.cs | 5 +- .../Handlers/HelloStartHandler.cs | 5 +- .../RetainedEvalActiveContextHandler.cs | 2 +- .../Handlers/RetainedEvalStartHandler.cs | 2 +- .../Tasks/FailedTask/FailedTask.cs | 2 +- .../Tasks/HelloTask/HelloService.cs | 2 +- .../Tasks/HelloTask/HelloTask.cs | 6 +- .../Tasks/HelloTask/HelloTaskMessage.cs | 2 +- .../Tasks/ShellTask/ShellTask.cs | 2 +- .../Tasks/StreamingTasks/StreamTask1.cs | 2 +- .../Tasks/StreamingTasks/StreamTask2.cs | 2 +- .../Naming/Codec/NamingLookupResponseCodec.cs | 2 +- .../Naming/Codec/NamingRegisterRequestCodec.cs | 2 +- .../Naming/Events/NamingGetAllResponse.cs | 2 +- .../Naming/Events/NamingLookupResponse.cs | 2 +- .../Naming/Events/NamingRegisterRequest.cs | 2 +- .../Naming/INameServer.cs | 2 +- .../Naming/NameClient.cs | 2 +- .../Naming/NameLookupClient.cs | 2 +- .../Naming/NameRegisterClient.cs | 2 +- .../Naming/NameServer.cs | 2 +- .../Naming/NamingConfiguration.cs | 50 -- .../Naming/NamingConfigurationOptions.cs | 41 -- .../Observers/NamingGetAllRequestObserver.cs | 2 +- .../Observers/NamingLookupRequestObserver.cs | 2 +- .../Observers/NamingRegisterRequestObserver.cs | 2 +- .../NetworkService/INetworkService.cs | 4 +- .../NetworkService/NetworkService.cs | 2 +- .../NetworkServiceConfiguration.cs | 2 +- .../NetworkService/NsConnection.cs | 2 +- .../Org.Apache.REEF.Network.csproj | 6 - .../Org.Apache.REEF.Network/Utilities/Utils.cs | 2 +- .../ClassHierarchy/TestClassHierarchy.cs | 9 +- .../ClassHierarchy/TestSerilization.cs | 8 +- .../Configuration/TestAvroConfiguration.cs | 3 +- .../TestAvroSerializerRoundTrip.cs | 1 + .../Configuration/TestConfiguration.cs | 7 +- .../Format/TestTaskConfiguration.cs | 2 +- .../Injection/TestInjection.cs | 2 +- .../Injection/TestListInjection.cs | 5 - lang/cs/Org.Apache.REEF.Tang.Tools/Program.cs | 2 +- .../AvroConfiguration.cs | 2 +- .../ConfigurationEntry.cs | 2 +- .../Formats/AvroConfigurationSerializer.cs | 1 + .../Protobuf/ProtocolBufferClassHierarchy.cs | 88 ++-- .../Protobuf/ProtocolBufferInjectionPlan.cs | 82 ++-- .../Protobuf/class_hierarchy.cs | 2 +- .../Protobuf/injection_plan.cs | 2 +- .../Evaluator/EvaluatorConfigurationsTests.cs | 2 +- .../Evaluator/EvaluatorTests.cs | 3 +- .../Functional/Driver/DriverTestStartHandler.cs | 2 +- .../Functional/Messaging/MessageDriver.cs | 3 +- .../Functional/Messaging/MessageTask.cs | 4 +- .../Functional/ReefFunctionalTest.cs | 2 +- .../Network/NameServerTests.cs | 2 +- .../Network/NetworkServiceTests.cs | 2 +- ...bridge-0.11.0-incubating-SNAPSHOT-shaded.jar | Bin 13555222 -> 13555272 bytes lang/cs/Org.Apache.REEF.Wake.Tests/ClockTest.cs | 1 + .../Examples/P2p/IEventSource.cs | 35 ++ .../Examples/P2p/Pull2Push.cs | 102 ++++ .../Impl/MissingStartHandlerHandler.cs | 1 + .../Org.Apache.REEF.Wake.csproj | 10 +- .../Protobuf/RemoteProtocol.proto | 36 -- .../Protobuf/WakeRemoteProtosGen.cs | 96 ---- .../Remote/Impl/MultiDecoder.cs | 2 +- .../Remote/Impl/MultiEncoder.cs | 2 +- .../Remote/Impl/RemoteEventDecoder.cs | 2 +- .../Remote/Impl/RemoteEventEncoder.cs | 2 +- .../Remote/Proto/RemoteProtocol.proto | 36 ++ .../Remote/Proto/WakeRemoteProtos.cs | 6 +- .../Remote/Proto/WakeRemoteProtosGen.cs | 96 ++++ .../cs/Org.Apache.REEF.Wake/Time/Event/Alarm.cs | 2 +- .../Time/Event/StartTime.cs | 2 +- .../Org.Apache.REEF.Wake/Time/Event/StopTime.cs | 2 +- lang/cs/Org.Apache.REEF.Wake/Time/IClock.cs | 1 + .../Time/Runtime/Event/ClientAlarm.cs | 1 + .../Time/Runtime/Event/RuntimeAlarm.cs | 1 + .../Time/Runtime/RuntimeClock.cs | 14 +- .../src/main/cs/Examples/P2p/IEventSource.cs | 35 -- .../src/main/cs/Examples/P2p/Pull2Push.cs | 103 ---- .../src/main/cs/PeriodicEvent.cs | 23 - 485 files changed, 16429 insertions(+), 16540 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ActiveContextClr2Java.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ActiveContextClr2Java.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ActiveContextClr2Java.cpp index 3ad4e43..6e56806 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ActiveContextClr2Java.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ActiveContextClr2Java.cpp @@ -23,83 +23,85 @@ namespace Org { namespace REEF { namespace Driver { namespace Bridge { - private ref class ManagedLog { + namespace Clr2java { + private ref class ManagedLog { internal: static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); - }; + }; - ActiveContextClr2Java::ActiveContextClr2Java(JNIEnv *env, jobject jobjectActiveContext) { - ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::ActiveContextClr2Java"); - pin_ptr<JavaVM*> pJavaVm = &_jvm; - if (env->GetJavaVM(pJavaVm) != 0) { - ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); - } + ActiveContextClr2Java::ActiveContextClr2Java(JNIEnv *env, jobject jobjectActiveContext) { + ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::ActiveContextClr2Java"); + pin_ptr<JavaVM*> pJavaVm = &_jvm; + if (env->GetJavaVM(pJavaVm) != 0) { + ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); + } - _jobjectActiveContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectActiveContext)); + _jobjectActiveContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectActiveContext)); - jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext); + jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext); - jfieldID jidContextId = env->GetFieldID(jclassActiveContext, "contextId", "Ljava/lang/String;"); - _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectActiveContext, jidContextId))); + jfieldID jidContextId = env->GetFieldID(jclassActiveContext, "contextId", "Ljava/lang/String;"); + _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectActiveContext, jidContextId))); - jfieldID jidEvaluatorId = env->GetFieldID(jclassActiveContext, "evaluatorId", "Ljava/lang/String;"); - _jstringEvaluatorId = (jstring)env->GetObjectField(_jobjectActiveContext, jidEvaluatorId); - _jstringEvaluatorId = reinterpret_cast<jstring>(env->NewGlobalRef(_jstringEvaluatorId)); + jfieldID jidEvaluatorId = env->GetFieldID(jclassActiveContext, "evaluatorId", "Ljava/lang/String;"); + _jstringEvaluatorId = (jstring)env->GetObjectField(_jobjectActiveContext, jidEvaluatorId); + _jstringEvaluatorId = reinterpret_cast<jstring>(env->NewGlobalRef(_jstringEvaluatorId)); - ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::ActiveContextClr2Java"); - } + ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::ActiveContextClr2Java"); + } - void ActiveContextClr2Java::SubmitTask(String^ taskConfigStr) { - ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::SubmitTask"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassActiveContext = env->GetObjectClass (_jobjectActiveContext); - jmethodID jmidSubmitTask = env->GetMethodID(jclassActiveContext, "submitTaskString", "(Ljava/lang/String;)V"); + void ActiveContextClr2Java::SubmitTask(String^ taskConfigStr) { + ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::SubmitTask"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext); + jmethodID jmidSubmitTask = env->GetMethodID(jclassActiveContext, "submitTaskString", "(Ljava/lang/String;)V"); - if (jmidSubmitTask == NULL) { - ManagedLog::LOGGER->Log("jmidSubmitTask is NULL"); - return; + if (jmidSubmitTask == NULL) { + ManagedLog::LOGGER->Log("jmidSubmitTask is NULL"); + return; + } + env->CallObjectMethod( + _jobjectActiveContext, + jmidSubmitTask, + JavaStringFromManagedString(env, taskConfigStr)); + ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SubmitTask"); } - env -> CallObjectMethod( - _jobjectActiveContext, - jmidSubmitTask, - JavaStringFromManagedString(env, taskConfigStr)); - ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SubmitTask"); - } - void ActiveContextClr2Java::OnError(String^ message) { - JNIEnv *env = RetrieveEnv(_jvm); - HandleClr2JavaError(env, message, _jobjectActiveContext); - } + void ActiveContextClr2Java::OnError(String^ message) { + JNIEnv *env = RetrieveEnv(_jvm); + HandleClr2JavaError(env, message, _jobjectActiveContext); + } - void ActiveContextClr2Java::Close() { - ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::Close"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassActiveContext = env->GetObjectClass (_jobjectActiveContext); - jmethodID jmidClose = env->GetMethodID(jclassActiveContext, "close", "()V"); + void ActiveContextClr2Java::Close() { + ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::Close"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext); + jmethodID jmidClose = env->GetMethodID(jclassActiveContext, "close", "()V"); - if (jmidClose == NULL) { - ManagedLog::LOGGER->Log("jmidClose is NULL"); - return; + if (jmidClose == NULL) { + ManagedLog::LOGGER->Log("jmidClose is NULL"); + return; + } + env->CallObjectMethod( + _jobjectActiveContext, + jmidClose); + ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::Close"); } - env -> CallObjectMethod( - _jobjectActiveContext, - jmidClose); - ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::Close"); - } - String^ ActiveContextClr2Java::GetId() { - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringId); - } + String^ ActiveContextClr2Java::GetId() { + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringId); + } - String^ ActiveContextClr2Java::GetEvaluatorId() { - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringEvaluatorId); - } + String^ ActiveContextClr2Java::GetEvaluatorId() { + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringEvaluatorId); + } - IEvaluatorDescriptor^ ActiveContextClr2Java::GetEvaluatorDescriptor() { - ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::GetEvaluatorDescriptor"); - return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectActiveContext, _jvm); + IEvaluatorDescriptor^ ActiveContextClr2Java::GetEvaluatorDescriptor() { + ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::GetEvaluatorDescriptor"); + return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectActiveContext, _jvm); + } } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/AllocatedEvaluatorClr2Java.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/AllocatedEvaluatorClr2Java.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/AllocatedEvaluatorClr2Java.cpp index b8f18c5..4dabd96 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/AllocatedEvaluatorClr2Java.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/AllocatedEvaluatorClr2Java.cpp @@ -22,145 +22,147 @@ using namespace JavaClrBridge; namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - ref class ManagedLog { - internal: - static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); - }; - - AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java(JNIEnv *env, jobject jallocatedEvaluator) { - - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java"); - - pin_ptr<JavaVM*> pJavaVm = &_jvm; - if (env->GetJavaVM(pJavaVm) != 0) { - ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); - } - _jobjectAllocatedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jallocatedEvaluator)); - - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jfieldID jidEvaluatorId = env->GetFieldID(jclassAllocatedEvaluator, "evaluatorId", "Ljava/lang/String;"); - _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectAllocatedEvaluator, jidEvaluatorId))); - - jfieldID jidNameServerInfo = env->GetFieldID(jclassAllocatedEvaluator, "nameServerInfo", "Ljava/lang/String;"); - _jstringNameServerInfo = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectAllocatedEvaluator, jidNameServerInfo))); - - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java"); - } - - void AllocatedEvaluatorClr2Java::SubmitContext(String^ contextConfigStr) { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContext"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jmethodID jmidSubmitContext = env->GetMethodID(jclassAllocatedEvaluator, "submitContextString", "(Ljava/lang/String;)V"); - - if (jmidSubmitContext == NULL) { - ManagedLog::LOGGER->Log("jmidSubmitContext is NULL"); - return; - } - env -> CallObjectMethod( - _jobjectAllocatedEvaluator, - jmidSubmitContext, - JavaStringFromManagedString(env, contextConfigStr)); - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContext"); - } - - void AllocatedEvaluatorClr2Java::SubmitContextAndTask(String^ contextConfigStr, String^ taskConfigStr) { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndTask"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jmethodID jmidSubmitContextAndTask = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndTaskString", "(Ljava/lang/String;Ljava/lang/String;)V"); - - if (jmidSubmitContextAndTask == NULL) { - ManagedLog::LOGGER->Log("jmidSubmitContextAndTask is NULL"); - return; - } - env -> CallObjectMethod( - _jobjectAllocatedEvaluator, - jmidSubmitContextAndTask, - JavaStringFromManagedString(env, contextConfigStr), - JavaStringFromManagedString(env, taskConfigStr)); - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndTask"); - } - - void AllocatedEvaluatorClr2Java::SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr) { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndService"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jmethodID jmidSubmitContextAndService = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndServiceString", "(Ljava/lang/String;Ljava/lang/String;)V"); - - if (jmidSubmitContextAndService == NULL) { - ManagedLog::LOGGER->Log("jmidSubmitContextAndService is NULL"); - return; - } - env -> CallObjectMethod( - _jobjectAllocatedEvaluator, - jmidSubmitContextAndService, - JavaStringFromManagedString(env, contextConfigStr), - JavaStringFromManagedString(env, serviceConfigStr)); - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndService"); - } - - void AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask(String^ contextConfigStr, String^ serviceConfigStr, String^ taskConfigStr) { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jmethodID jmidSubmitContextAndServiceAndTask = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndServiceAndTaskString", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); - - if (jmidSubmitContextAndServiceAndTask == NULL) { - ManagedLog::LOGGER->Log("jmidSubmitContextAndServiceAndTask is NULL"); - return; - } - env -> CallObjectMethod( - _jobjectAllocatedEvaluator, - jmidSubmitContextAndServiceAndTask, - JavaStringFromManagedString(env, contextConfigStr), - JavaStringFromManagedString(env, serviceConfigStr), - JavaStringFromManagedString(env, taskConfigStr)); - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask"); - } - - void AllocatedEvaluatorClr2Java::OnError(String^ message) { - JNIEnv *env = RetrieveEnv(_jvm); - HandleClr2JavaError(env, message, _jobjectAllocatedEvaluator); - } - - void AllocatedEvaluatorClr2Java::Close() { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::Close"); - JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassAllocatedEvaluator = env->GetObjectClass (_jobjectAllocatedEvaluator); - jmethodID jmidClose = env->GetMethodID(jclassAllocatedEvaluator, "close", "()V"); - - if (jmidClose == NULL) { - ManagedLog::LOGGER->Log("jmidClose is NULL"); - return; - } - env -> CallObjectMethod( - _jobjectAllocatedEvaluator, - jmidClose); - ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::Close"); - } - - String^ AllocatedEvaluatorClr2Java::GetId() { - ManagedLog::LOGGER->Log("AllocatedEvaluatorClr2Java::GetId"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringId); - } - - String^ AllocatedEvaluatorClr2Java::GetNameServerInfo() { - ManagedLog::LOGGER->Log("AllocatedEvaluatorClr2Java::GetNameServerInfo"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringNameServerInfo); - } - - IEvaluatorDescriptor^ AllocatedEvaluatorClr2Java::GetEvaluatorDescriptor() { - ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::GetEvaluatorDescriptor"); - return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectAllocatedEvaluator, _jvm); - } - } - } - } + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + ref class ManagedLog { + internal: + static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); + }; + + AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java(JNIEnv *env, jobject jallocatedEvaluator) { + + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java"); + + pin_ptr<JavaVM*> pJavaVm = &_jvm; + if (env->GetJavaVM(pJavaVm) != 0) { + ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); + } + _jobjectAllocatedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jallocatedEvaluator)); + + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jfieldID jidEvaluatorId = env->GetFieldID(jclassAllocatedEvaluator, "evaluatorId", "Ljava/lang/String;"); + _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectAllocatedEvaluator, jidEvaluatorId))); + + jfieldID jidNameServerInfo = env->GetFieldID(jclassAllocatedEvaluator, "nameServerInfo", "Ljava/lang/String;"); + _jstringNameServerInfo = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectAllocatedEvaluator, jidNameServerInfo))); + + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java"); + } + + void AllocatedEvaluatorClr2Java::SubmitContext(String^ contextConfigStr) { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContext"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jmethodID jmidSubmitContext = env->GetMethodID(jclassAllocatedEvaluator, "submitContextString", "(Ljava/lang/String;)V"); + + if (jmidSubmitContext == NULL) { + ManagedLog::LOGGER->Log("jmidSubmitContext is NULL"); + return; + } + env->CallObjectMethod( + _jobjectAllocatedEvaluator, + jmidSubmitContext, + JavaStringFromManagedString(env, contextConfigStr)); + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContext"); + } + + void AllocatedEvaluatorClr2Java::SubmitContextAndTask(String^ contextConfigStr, String^ taskConfigStr) { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndTask"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jmethodID jmidSubmitContextAndTask = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndTaskString", "(Ljava/lang/String;Ljava/lang/String;)V"); + + if (jmidSubmitContextAndTask == NULL) { + ManagedLog::LOGGER->Log("jmidSubmitContextAndTask is NULL"); + return; + } + env->CallObjectMethod( + _jobjectAllocatedEvaluator, + jmidSubmitContextAndTask, + JavaStringFromManagedString(env, contextConfigStr), + JavaStringFromManagedString(env, taskConfigStr)); + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndTask"); + } + + void AllocatedEvaluatorClr2Java::SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr) { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndService"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jmethodID jmidSubmitContextAndService = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndServiceString", "(Ljava/lang/String;Ljava/lang/String;)V"); + + if (jmidSubmitContextAndService == NULL) { + ManagedLog::LOGGER->Log("jmidSubmitContextAndService is NULL"); + return; + } + env->CallObjectMethod( + _jobjectAllocatedEvaluator, + jmidSubmitContextAndService, + JavaStringFromManagedString(env, contextConfigStr), + JavaStringFromManagedString(env, serviceConfigStr)); + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndService"); + } + + void AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask(String^ contextConfigStr, String^ serviceConfigStr, String^ taskConfigStr) { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jmethodID jmidSubmitContextAndServiceAndTask = env->GetMethodID(jclassAllocatedEvaluator, "submitContextAndServiceAndTaskString", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); + + if (jmidSubmitContextAndServiceAndTask == NULL) { + ManagedLog::LOGGER->Log("jmidSubmitContextAndServiceAndTask is NULL"); + return; + } + env->CallObjectMethod( + _jobjectAllocatedEvaluator, + jmidSubmitContextAndServiceAndTask, + JavaStringFromManagedString(env, contextConfigStr), + JavaStringFromManagedString(env, serviceConfigStr), + JavaStringFromManagedString(env, taskConfigStr)); + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask"); + } + + void AllocatedEvaluatorClr2Java::OnError(String^ message) { + JNIEnv *env = RetrieveEnv(_jvm); + HandleClr2JavaError(env, message, _jobjectAllocatedEvaluator); + } + + void AllocatedEvaluatorClr2Java::Close() { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::Close"); + JNIEnv *env = RetrieveEnv(_jvm); + jclass jclassAllocatedEvaluator = env->GetObjectClass(_jobjectAllocatedEvaluator); + jmethodID jmidClose = env->GetMethodID(jclassAllocatedEvaluator, "close", "()V"); + + if (jmidClose == NULL) { + ManagedLog::LOGGER->Log("jmidClose is NULL"); + return; + } + env->CallObjectMethod( + _jobjectAllocatedEvaluator, + jmidClose); + ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::Close"); + } + + String^ AllocatedEvaluatorClr2Java::GetId() { + ManagedLog::LOGGER->Log("AllocatedEvaluatorClr2Java::GetId"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringId); + } + + String^ AllocatedEvaluatorClr2Java::GetNameServerInfo() { + ManagedLog::LOGGER->Log("AllocatedEvaluatorClr2Java::GetNameServerInfo"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringNameServerInfo); + } + + IEvaluatorDescriptor^ AllocatedEvaluatorClr2Java::GetEvaluatorDescriptor() { + ManagedLog::LOGGER->LogStart("AllocatedEvaluatorClr2Java::GetEvaluatorDescriptor"); + return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectAllocatedEvaluator, _jvm); + } + } + } + } + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ClosedContextClr2Java.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ClosedContextClr2Java.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ClosedContextClr2Java.cpp index 1e1c879..6584abe 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ClosedContextClr2Java.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/ClosedContextClr2Java.cpp @@ -20,69 +20,71 @@ namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - ref class ManagedLog { - internal: - static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); - }; - ClosedContextClr2Java::ClosedContextClr2Java(JNIEnv *env, jobject jobjectClosedContext) { - ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::ClosedContextClr2Java"); + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + ref class ManagedLog { + internal: + static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); + }; + ClosedContextClr2Java::ClosedContextClr2Java(JNIEnv *env, jobject jobjectClosedContext) { + ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::ClosedContextClr2Java"); - pin_ptr<JavaVM*> pJavaVm = &_jvm; - if (env->GetJavaVM(pJavaVm) != 0) { - ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); - } - _jobjectClosedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectClosedContext)); - jclass jclassClosedContext = env->GetObjectClass (_jobjectClosedContext); + pin_ptr<JavaVM*> pJavaVm = &_jvm; + if (env->GetJavaVM(pJavaVm) != 0) { + ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); + } + _jobjectClosedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectClosedContext)); + jclass jclassClosedContext = env->GetObjectClass(_jobjectClosedContext); - jfieldID jidContextId = env->GetFieldID(jclassClosedContext, "contextId", "Ljava/lang/String;"); - jfieldID jidEvaluatorId = env->GetFieldID(jclassClosedContext, "evaluatorId", "Ljava/lang/String;"); + jfieldID jidContextId = env->GetFieldID(jclassClosedContext, "contextId", "Ljava/lang/String;"); + jfieldID jidEvaluatorId = env->GetFieldID(jclassClosedContext, "evaluatorId", "Ljava/lang/String;"); - _jstringContextId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectClosedContext, jidContextId))); - _jstringEvaluatorId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectClosedContext, jidEvaluatorId))); + _jstringContextId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectClosedContext, jidContextId))); + _jstringEvaluatorId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectClosedContext, jidEvaluatorId))); - ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::ClosedContextClr2Java"); - } + ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::ClosedContextClr2Java"); + } - IActiveContextClr2Java^ ClosedContextClr2Java::GetParentContext() { - ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::GetParentContext"); + IActiveContextClr2Java^ ClosedContextClr2Java::GetParentContext() { + ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::GetParentContext"); - JNIEnv *env = RetrieveEnv(_jvm); + JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassClosedContext = env->GetObjectClass(_jobjectClosedContext); - jfieldID jidParentContext = env->GetFieldID(jclassClosedContext, "parentContext", "Lorg/apache/reef/javabridge/ActiveContextBridge;"); - jobject jobjectParentContext = env->GetObjectField(_jobjectClosedContext, jidParentContext); - ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::GetParentContext"); + jclass jclassClosedContext = env->GetObjectClass(_jobjectClosedContext); + jfieldID jidParentContext = env->GetFieldID(jclassClosedContext, "parentContext", "Lorg/apache/reef/javabridge/ActiveContextBridge;"); + jobject jobjectParentContext = env->GetObjectField(_jobjectClosedContext, jidParentContext); + ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::GetParentContext"); - return gcnew ActiveContextClr2Java(env, jobjectParentContext); - } + return gcnew ActiveContextClr2Java(env, jobjectParentContext); + } - String^ ClosedContextClr2Java::GetId() { - ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetId"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringContextId); - } + String^ ClosedContextClr2Java::GetId() { + ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetId"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringContextId); + } - String^ ClosedContextClr2Java::GetEvaluatorId() { - ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetEvaluatorId"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringEvaluatorId); - } + String^ ClosedContextClr2Java::GetEvaluatorId() { + ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetEvaluatorId"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringEvaluatorId); + } - IEvaluatorDescriptor^ ClosedContextClr2Java::GetEvaluatorDescriptor() { - ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::GetEvaluatorDescriptor"); - return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectClosedContext, _jvm); - } + IEvaluatorDescriptor^ ClosedContextClr2Java::GetEvaluatorDescriptor() { + ManagedLog::LOGGER->LogStart("ClosedContextClr2Java::GetEvaluatorDescriptor"); + return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectClosedContext, _jvm); + } - void ClosedContextClr2Java::OnError(String^ message) { - ManagedLog::LOGGER->Log("ClosedContextClr2Java::OnError"); - JNIEnv *env = RetrieveEnv(_jvm); - HandleClr2JavaError(env, message, _jobjectClosedContext); - } - } - } - } + void ClosedContextClr2Java::OnError(String^ message) { + ManagedLog::LOGGER->Log("ClosedContextClr2Java::OnError"); + JNIEnv *env = RetrieveEnv(_jvm); + HandleClr2JavaError(env, message, _jobjectClosedContext); + } + } + } + } + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h index 55c332a..cf0dd1c 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/Clr2JavaImpl.h @@ -33,190 +33,192 @@ using namespace Org::Apache::REEF::Driver::Evaluator; namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - public ref class CommonUtilities { - public: - static IEvaluatorDescriptor^ RetrieveEvaluatorDescriptor(jobject object, JavaVM* jvm); - }; - - public ref class AllocatedEvaluatorClr2Java : public IAllocatedEvaluaotrClr2Java { - jobject _jobjectAllocatedEvaluator; - JavaVM* _jvm; - jstring _jstringId; - jstring _jstringNameServerInfo; - public: - AllocatedEvaluatorClr2Java(JNIEnv *env, jobject jallocatedEvaluator); - virtual void SubmitContextAndTask(String^ contextConfigStr, String^ taskConfigStr); - virtual void SubmitContext(String^ contextConfigStr); - virtual void SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr); - virtual void SubmitContextAndServiceAndTask(String^ contextConfigStr, String^ serviceConfigStr, String^ taskConfigStr); - virtual void OnError(String^ message); - virtual void Close(); - virtual String^ GetId(); - virtual String^ GetNameServerInfo(); - virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); - }; - - public ref class ActiveContextClr2Java : public IActiveContextClr2Java { - jobject _jobjectActiveContext; - jstring _jstringId; - jstring _jstringEvaluatorId; - JavaVM* _jvm; - public: - ActiveContextClr2Java(JNIEnv *env, jobject jallocatedEvaluator); - virtual void SubmitTask(String^ taskConfigStr); - virtual void Close(); - virtual void OnError(String^ message); - virtual String^ GetId(); - virtual String^ GetEvaluatorId(); - virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); - }; - - public ref class EvaluatorRequestorClr2Java : public IEvaluatorRequestorClr2Java { - jobject _jobjectEvaluatorRequestor; - JavaVM* _jvm; - public: - EvaluatorRequestorClr2Java(JNIEnv *env, jobject jevaluatorRequestor); - virtual void OnError(String^ message); - virtual void Submit(IEvaluatorRequest^ request); - }; - - public ref class TaskMessageClr2Java : public ITaskMessageClr2Java { - jobject _jobjectTaskMessage; - JavaVM* _jvm; - jstring _jstringId; - public: - TaskMessageClr2Java(JNIEnv *env, jobject jtaskMessage); - virtual void OnError(String^ message); - virtual String^ GetId(); - }; - - public ref class FailedTaskClr2Java : public IFailedTaskClr2Java { - jobject _jobjectFailedTask; - JavaVM* _jvm; - public: - FailedTaskClr2Java(JNIEnv *env, jobject jfailedTask); - virtual void OnError(String^ message); - virtual IActiveContextClr2Java^ GetActiveContext(); - virtual String^ GetString(); - }; - - public ref class RunningTaskClr2Java : public IRunningTaskClr2Java { - jobject _jobjectRunningTask; - JavaVM* _jvm; - jstring _jstringId; - public: - RunningTaskClr2Java(JNIEnv *env, jobject jrunningTask); - virtual void OnError(String^ message); - virtual IActiveContextClr2Java^ GetActiveContext(); - virtual String^ GetId(); - virtual void Send(array<byte>^ message); - }; - - public ref class FailedEvaluatorClr2Java : public IFailedEvaluatorClr2Java { - jobject _jobjectFailedEvaluator; - JavaVM* _jvm; - jstring _jstringId; - public: - FailedEvaluatorClr2Java(JNIEnv *env, jobject jfailedEvaluator); - virtual void OnError(String^ message); - virtual IEvaluatorRequestorClr2Java^ GetEvaluatorRequestor(); - virtual String^ GetId(); - }; - - public ref class HttpServerClr2Java : public IHttpServerBridgeClr2Java { - jobject _jhttpServerEventBridge; - JavaVM* _jvm; - public: - HttpServerClr2Java(JNIEnv *env, jobject jhttpServerEventBridge); - virtual void OnError(String^ message); - virtual String^ GetQueryString(); - virtual void SetUriSpecification(String^ uriSpecification); - virtual void SetQueryResult(String^ queryResult); - virtual array<byte>^ GetQueryRequestData(); - virtual void SetQueryResponseData(array<byte>^ responseData); - }; - - public ref class CompletedTaskClr2Java : public ICompletedTaskClr2Java { - jobject _jobjectCompletedTask; - JavaVM* _jvm; - jstring _jstringId; - public: - CompletedTaskClr2Java(JNIEnv *env, jobject jcompletedTask); - virtual void OnError(String^ message); - virtual IActiveContextClr2Java^ GetActiveContext(); - virtual String^ GetId(); - }; - - public ref class SuspendedTaskClr2Java : public ISuspendedTaskClr2Java { - jobject _jobjectSuspendedTask; - JavaVM* _jvm; - jstring _jstringId; - public: - SuspendedTaskClr2Java(JNIEnv *env, jobject jobjectSuspendedTask); - virtual void OnError(String^ message); - virtual IActiveContextClr2Java^ GetActiveContext(); - virtual String^ GetId(); - virtual array<byte>^ Get(); - }; - - public ref class CompletedEvaluatorClr2Java : public ICompletedEvaluatorClr2Java { - jobject _jobjectCompletedEvaluator; - JavaVM* _jvm; - jstring _jstringId; - public: - CompletedEvaluatorClr2Java(JNIEnv *env, jobject jobjectCompletedEvaluator); - virtual void OnError(String^ message); - virtual String^ GetId(); - }; - - public ref class ClosedContextClr2Java : public IClosedContextClr2Java { - jobject _jobjectClosedContext; - JavaVM* _jvm; - jstring _jstringContextId; - jstring _jstringEvaluatorId; - public: - ClosedContextClr2Java(JNIEnv *env, jobject jobjectClosedContext); - virtual void OnError(String^ message); - virtual String^ GetId(); - virtual String^ GetEvaluatorId(); - virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); - virtual IActiveContextClr2Java^ GetParentContext(); - }; - - public ref class FailedContextClr2Java : public IFailedContextClr2Java { - jobject _jobjectFailedContext; - JavaVM* _jvm; - jstring _jstringContextId; - jstring _jstringEvaluatorId; - jstring _jstringParentContextId; - public: - FailedContextClr2Java(JNIEnv *env, jobject jobjectFailedContext); - virtual void OnError(String^ message); - virtual String^ GetId(); - virtual String^ GetEvaluatorId(); - virtual String^ GetParentId(); - virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); - virtual IActiveContextClr2Java^ GetParentContext(); - }; - - public ref class ContextMessageClr2Java : public IContextMessageClr2Java { - jobject _jobjectContextMessage; - JavaVM* _jvm; - jbyteArray _jarrayMessage; - jstring _jstringId; - jstring _jstringSourceId; - public: - ContextMessageClr2Java(JNIEnv *env, jobject jobjectContextMessage); - virtual void OnError(String^ message); - virtual array<byte>^ Get(); - virtual String^ GetId(); - virtual String^ GetMessageSourceId(); - }; - } - } - } + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + public ref class CommonUtilities { + public: + static IEvaluatorDescriptor^ RetrieveEvaluatorDescriptor(jobject object, JavaVM* jvm); + }; + + public ref class AllocatedEvaluatorClr2Java : public IAllocatedEvaluaotrClr2Java { + jobject _jobjectAllocatedEvaluator; + JavaVM* _jvm; + jstring _jstringId; + jstring _jstringNameServerInfo; + public: + AllocatedEvaluatorClr2Java(JNIEnv *env, jobject jallocatedEvaluator); + virtual void SubmitContextAndTask(String^ contextConfigStr, String^ taskConfigStr); + virtual void SubmitContext(String^ contextConfigStr); + virtual void SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr); + virtual void SubmitContextAndServiceAndTask(String^ contextConfigStr, String^ serviceConfigStr, String^ taskConfigStr); + virtual void OnError(String^ message); + virtual void Close(); + virtual String^ GetId(); + virtual String^ GetNameServerInfo(); + virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); + }; + + public ref class ActiveContextClr2Java : public IActiveContextClr2Java { + jobject _jobjectActiveContext; + jstring _jstringId; + jstring _jstringEvaluatorId; + JavaVM* _jvm; + public: + ActiveContextClr2Java(JNIEnv *env, jobject jallocatedEvaluator); + virtual void SubmitTask(String^ taskConfigStr); + virtual void Close(); + virtual void OnError(String^ message); + virtual String^ GetId(); + virtual String^ GetEvaluatorId(); + virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); + }; + + public ref class EvaluatorRequestorClr2Java : public IEvaluatorRequestorClr2Java { + jobject _jobjectEvaluatorRequestor; + JavaVM* _jvm; + public: + EvaluatorRequestorClr2Java(JNIEnv *env, jobject jevaluatorRequestor); + virtual void OnError(String^ message); + virtual void Submit(IEvaluatorRequest^ request); + }; + + public ref class TaskMessageClr2Java : public ITaskMessageClr2Java { + jobject _jobjectTaskMessage; + JavaVM* _jvm; + jstring _jstringId; + public: + TaskMessageClr2Java(JNIEnv *env, jobject jtaskMessage); + virtual void OnError(String^ message); + virtual String^ GetId(); + }; + + public ref class FailedTaskClr2Java : public IFailedTaskClr2Java { + jobject _jobjectFailedTask; + JavaVM* _jvm; + public: + FailedTaskClr2Java(JNIEnv *env, jobject jfailedTask); + virtual void OnError(String^ message); + virtual IActiveContextClr2Java^ GetActiveContext(); + virtual String^ GetString(); + }; + + public ref class RunningTaskClr2Java : public IRunningTaskClr2Java { + jobject _jobjectRunningTask; + JavaVM* _jvm; + jstring _jstringId; + public: + RunningTaskClr2Java(JNIEnv *env, jobject jrunningTask); + virtual void OnError(String^ message); + virtual IActiveContextClr2Java^ GetActiveContext(); + virtual String^ GetId(); + virtual void Send(array<byte>^ message); + }; + + public ref class FailedEvaluatorClr2Java : public IFailedEvaluatorClr2Java { + jobject _jobjectFailedEvaluator; + JavaVM* _jvm; + jstring _jstringId; + public: + FailedEvaluatorClr2Java(JNIEnv *env, jobject jfailedEvaluator); + virtual void OnError(String^ message); + virtual IEvaluatorRequestorClr2Java^ GetEvaluatorRequestor(); + virtual String^ GetId(); + }; + + public ref class HttpServerClr2Java : public IHttpServerBridgeClr2Java { + jobject _jhttpServerEventBridge; + JavaVM* _jvm; + public: + HttpServerClr2Java(JNIEnv *env, jobject jhttpServerEventBridge); + virtual void OnError(String^ message); + virtual String^ GetQueryString(); + virtual void SetUriSpecification(String^ uriSpecification); + virtual void SetQueryResult(String^ queryResult); + virtual array<byte>^ GetQueryRequestData(); + virtual void SetQueryResponseData(array<byte>^ responseData); + }; + + public ref class CompletedTaskClr2Java : public ICompletedTaskClr2Java { + jobject _jobjectCompletedTask; + JavaVM* _jvm; + jstring _jstringId; + public: + CompletedTaskClr2Java(JNIEnv *env, jobject jcompletedTask); + virtual void OnError(String^ message); + virtual IActiveContextClr2Java^ GetActiveContext(); + virtual String^ GetId(); + }; + + public ref class SuspendedTaskClr2Java : public ISuspendedTaskClr2Java { + jobject _jobjectSuspendedTask; + JavaVM* _jvm; + jstring _jstringId; + public: + SuspendedTaskClr2Java(JNIEnv *env, jobject jobjectSuspendedTask); + virtual void OnError(String^ message); + virtual IActiveContextClr2Java^ GetActiveContext(); + virtual String^ GetId(); + virtual array<byte>^ Get(); + }; + + public ref class CompletedEvaluatorClr2Java : public ICompletedEvaluatorClr2Java { + jobject _jobjectCompletedEvaluator; + JavaVM* _jvm; + jstring _jstringId; + public: + CompletedEvaluatorClr2Java(JNIEnv *env, jobject jobjectCompletedEvaluator); + virtual void OnError(String^ message); + virtual String^ GetId(); + }; + + public ref class ClosedContextClr2Java : public IClosedContextClr2Java { + jobject _jobjectClosedContext; + JavaVM* _jvm; + jstring _jstringContextId; + jstring _jstringEvaluatorId; + public: + ClosedContextClr2Java(JNIEnv *env, jobject jobjectClosedContext); + virtual void OnError(String^ message); + virtual String^ GetId(); + virtual String^ GetEvaluatorId(); + virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); + virtual IActiveContextClr2Java^ GetParentContext(); + }; + + public ref class FailedContextClr2Java : public IFailedContextClr2Java { + jobject _jobjectFailedContext; + JavaVM* _jvm; + jstring _jstringContextId; + jstring _jstringEvaluatorId; + jstring _jstringParentContextId; + public: + FailedContextClr2Java(JNIEnv *env, jobject jobjectFailedContext); + virtual void OnError(String^ message); + virtual String^ GetId(); + virtual String^ GetEvaluatorId(); + virtual String^ GetParentId(); + virtual IEvaluatorDescriptor^ GetEvaluatorDescriptor(); + virtual IActiveContextClr2Java^ GetParentContext(); + }; + + public ref class ContextMessageClr2Java : public IContextMessageClr2Java { + jobject _jobjectContextMessage; + JavaVM* _jvm; + jbyteArray _jarrayMessage; + jstring _jstringId; + jstring _jstringSourceId; + public: + ContextMessageClr2Java(JNIEnv *env, jobject jobjectContextMessage); + virtual void OnError(String^ message); + virtual array<byte>^ Get(); + virtual String^ GetId(); + virtual String^ GetMessageSourceId(); + }; + } + } + } + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CommonUtilities.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CommonUtilities.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CommonUtilities.cpp index 2a397bc..5de6e75 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CommonUtilities.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CommonUtilities.cpp @@ -20,34 +20,36 @@ namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - ref class ManagedLog { - internal: - static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>CommonUtilities"); - }; + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + ref class ManagedLog { + internal: + static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>CommonUtilities"); + }; - IEvaluatorDescriptor^ CommonUtilities::RetrieveEvaluatorDescriptor(jobject object, JavaVM* jvm) { - ManagedLog::LOGGER->LogStart("CommonUtilities::GetEvaluatorDescriptor"); - JNIEnv *env = RetrieveEnv(jvm); - jclass jclassActiveContext = env->GetObjectClass (object); - jmethodID jmidGetEvaluatorDescriptor = env->GetMethodID(jclassActiveContext, "getEvaluatorDescriptorSring", "()Ljava/lang/String;"); + IEvaluatorDescriptor^ CommonUtilities::RetrieveEvaluatorDescriptor(jobject object, JavaVM* jvm) { + ManagedLog::LOGGER->LogStart("CommonUtilities::GetEvaluatorDescriptor"); + JNIEnv *env = RetrieveEnv(jvm); + jclass jclassActiveContext = env->GetObjectClass(object); + jmethodID jmidGetEvaluatorDescriptor = env->GetMethodID(jclassActiveContext, "getEvaluatorDescriptorSring", "()Ljava/lang/String;"); - if (jmidGetEvaluatorDescriptor == NULL) { - ManagedLog::LOGGER->Log("jmidGetEvaluatorDescriptor is NULL"); - return nullptr; - } - jstring jevaluatorDescriptorString = (jstring)env -> CallObjectMethod( - object, - jmidGetEvaluatorDescriptor); - String^ evaluatorDescriptorString = ManagedStringFromJavaString(env, jevaluatorDescriptorString); - ManagedLog::LOGGER->LogStop("InteropUtil::GetEvaluatorDescriptor"); + if (jmidGetEvaluatorDescriptor == NULL) { + ManagedLog::LOGGER->Log("jmidGetEvaluatorDescriptor is NULL"); + return nullptr; + } + jstring jevaluatorDescriptorString = (jstring)env->CallObjectMethod( + object, + jmidGetEvaluatorDescriptor); + String^ evaluatorDescriptorString = ManagedStringFromJavaString(env, jevaluatorDescriptorString); + ManagedLog::LOGGER->LogStop("InteropUtil::GetEvaluatorDescriptor"); - return gcnew EvaluatorDescriptorImpl(evaluatorDescriptorString); - } - } - } - } + return gcnew EvaluatorDescriptorImpl(evaluatorDescriptorString); + } + } + } + } + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedEvaluatorClr2Java.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedEvaluatorClr2Java.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedEvaluatorClr2Java.cpp index 5d9b124..c961881 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedEvaluatorClr2Java.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedEvaluatorClr2Java.cpp @@ -20,41 +20,43 @@ namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - ref class ManagedLog { - internal: - static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); - }; + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + ref class ManagedLog { + internal: + static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); + }; - CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java(JNIEnv *env, jobject jCompletedEvaluator) { - ManagedLog::LOGGER->LogStart("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java"); - pin_ptr<JavaVM*> pJavaVm = &_jvm; - if (env->GetJavaVM(pJavaVm) != 0) { - ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); - } - _jobjectCompletedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jCompletedEvaluator)); + CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java(JNIEnv *env, jobject jCompletedEvaluator) { + ManagedLog::LOGGER->LogStart("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java"); + pin_ptr<JavaVM*> pJavaVm = &_jvm; + if (env->GetJavaVM(pJavaVm) != 0) { + ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); + } + _jobjectCompletedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jCompletedEvaluator)); - jclass jclassCompletedEvaluator = env->GetObjectClass (_jobjectCompletedEvaluator); - jfieldID jidEvaluatorId = env->GetFieldID(jclassCompletedEvaluator, "evaluatorId", "Ljava/lang/String;"); - _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectCompletedEvaluator, jidEvaluatorId))); - ManagedLog::LOGGER->LogStop("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java"); - } + jclass jclassCompletedEvaluator = env->GetObjectClass(_jobjectCompletedEvaluator); + jfieldID jidEvaluatorId = env->GetFieldID(jclassCompletedEvaluator, "evaluatorId", "Ljava/lang/String;"); + _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectCompletedEvaluator, jidEvaluatorId))); + ManagedLog::LOGGER->LogStop("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java"); + } - void CompletedEvaluatorClr2Java::OnError(String^ message) { - ManagedLog::LOGGER->Log("CompletedEvaluatorClr2Java::OnError"); - JNIEnv *env = RetrieveEnv(_jvm); - HandleClr2JavaError(env, message, _jobjectCompletedEvaluator); - } + void CompletedEvaluatorClr2Java::OnError(String^ message) { + ManagedLog::LOGGER->Log("CompletedEvaluatorClr2Java::OnError"); + JNIEnv *env = RetrieveEnv(_jvm); + HandleClr2JavaError(env, message, _jobjectCompletedEvaluator); + } - String^ CompletedEvaluatorClr2Java::GetId() { - ManagedLog::LOGGER->Log("CompletedEvaluatorClr2Java::GetId"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringId); - } - } - } - } + String^ CompletedEvaluatorClr2Java::GetId() { + ManagedLog::LOGGER->Log("CompletedEvaluatorClr2Java::GetId"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringId); + } + } + } + } + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7edb8570/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedTaskClr2Java.cpp ---------------------------------------------------------------------- diff --git a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedTaskClr2Java.cpp b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedTaskClr2Java.cpp index 10a1166..be9fe31 100644 --- a/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedTaskClr2Java.cpp +++ b/lang/cpp/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/CompletedTaskClr2Java.cpp @@ -20,52 +20,54 @@ namespace Org { namespace Apache { - namespace REEF { - namespace Driver { - namespace Bridge { - ref class ManagedLog { - internal: - static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); - }; + namespace REEF { + namespace Driver { + namespace Bridge { + namespace Clr2java { + ref class ManagedLog { + internal: + static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>"); + }; - CompletedTaskClr2Java::CompletedTaskClr2Java(JNIEnv *env, jobject jobjectCompletedTask) { - ManagedLog::LOGGER->LogStart("CompletedTaskClr2Java::CompletedTaskClr2Java"); - pin_ptr<JavaVM*> pJavaVm = &_jvm; - if (env->GetJavaVM(pJavaVm) != 0) { - ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); - } - _jobjectCompletedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectCompletedTask)); + CompletedTaskClr2Java::CompletedTaskClr2Java(JNIEnv *env, jobject jobjectCompletedTask) { + ManagedLog::LOGGER->LogStart("CompletedTaskClr2Java::CompletedTaskClr2Java"); + pin_ptr<JavaVM*> pJavaVm = &_jvm; + if (env->GetJavaVM(pJavaVm) != 0) { + ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr); + } + _jobjectCompletedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectCompletedTask)); - jclass jclassCompletedTask = env->GetObjectClass (_jobjectCompletedTask); - jfieldID jidTaskId = env->GetFieldID(jclassCompletedTask, "taskId", "Ljava/lang/String;"); - _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectCompletedTask, jidTaskId))); - ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::CompletedTaskClr2Java"); - } + jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask); + jfieldID jidTaskId = env->GetFieldID(jclassCompletedTask, "taskId", "Ljava/lang/String;"); + _jstringId = reinterpret_cast<jstring>(env->NewGlobalRef(env->GetObjectField(_jobjectCompletedTask, jidTaskId))); + ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::CompletedTaskClr2Java"); + } - void CompletedTaskClr2Java::OnError(String^ message) { - ManagedLog::LOGGER->Log("CompletedTaskClr2Java::OnError"); - JNIEnv *env = RetrieveEnv(_jvm); - HandleClr2JavaError(env, message, _jobjectCompletedTask); - } + void CompletedTaskClr2Java::OnError(String^ message) { + ManagedLog::LOGGER->Log("CompletedTaskClr2Java::OnError"); + JNIEnv *env = RetrieveEnv(_jvm); + HandleClr2JavaError(env, message, _jobjectCompletedTask); + } - IActiveContextClr2Java^ CompletedTaskClr2Java::GetActiveContext() { - ManagedLog::LOGGER->LogStart("CompletedTaskClr2Java::GetActiveContext"); - JNIEnv *env = RetrieveEnv(_jvm); + IActiveContextClr2Java^ CompletedTaskClr2Java::GetActiveContext() { + ManagedLog::LOGGER->LogStart("CompletedTaskClr2Java::GetActiveContext"); + JNIEnv *env = RetrieveEnv(_jvm); - jclass jclassCompletedTask = env->GetObjectClass (_jobjectCompletedTask); - jfieldID jidActiveContext = env->GetFieldID(jclassCompletedTask, "jactiveContext", "Lorg/apache/reef/javabridge/ActiveContextBridge;"); - jobject jobjectActiveContext = env->GetObjectField(_jobjectCompletedTask, jidActiveContext); - ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::GetActiveContext"); - return gcnew ActiveContextClr2Java(env, jobjectActiveContext); - } + jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask); + jfieldID jidActiveContext = env->GetFieldID(jclassCompletedTask, "jactiveContext", "Lorg/apache/reef/javabridge/ActiveContextBridge;"); + jobject jobjectActiveContext = env->GetObjectField(_jobjectCompletedTask, jidActiveContext); + ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::GetActiveContext"); + return gcnew ActiveContextClr2Java(env, jobjectActiveContext); + } - String^ CompletedTaskClr2Java::GetId() { - ManagedLog::LOGGER->Log("CompletedTaskClr2Java::GetId"); - JNIEnv *env = RetrieveEnv(_jvm); - return ManagedStringFromJavaString(env, _jstringId); - } - } - } - } + String^ CompletedTaskClr2Java::GetId() { + ManagedLog::LOGGER->Log("CompletedTaskClr2Java::GetId"); + JNIEnv *env = RetrieveEnv(_jvm); + return ManagedStringFromJavaString(env, _jstringId); + } + } + } + } + } } } \ No newline at end of file
