You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by mo...@apache.org on 2016/07/08 00:31:06 UTC
[1/2] reef git commit: [REEF-997] Fix spacing in C++ files
Repository: reef
Updated Branches:
refs/heads/master 4f85dd77c -> 8557f0f2a
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/FailedContextClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/FailedContextClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/FailedContextClr2Java.cpp
index 115fddc..b4da4bf 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/FailedContextClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/FailedContextClr2Java.cpp
@@ -19,99 +19,99 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
- FailedContextClr2Java::FailedContextClr2Java(JNIEnv *env, jobject jobjectFailedContext) {
- ManagedLog::LOGGER->LogStart("FailedContextClr2Java::FailedContextClr2Java");
-
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectFailedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedContext));
- jclass jclassFailedContext = env->GetObjectClass(_jobjectFailedContext);
-
- jmethodID jmidGetParentId = env->GetMethodID(jclassFailedContext, "getParentIdString", "()Ljava/lang/String;");
- _jstringContextId = CommonUtilities::GetJObjectId(env, jobjectFailedContext, jclassFailedContext);
- _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, jobjectFailedContext, jclassFailedContext);
- _jstringParentContextId = reinterpret_cast<jstring>(env->NewGlobalRef(env->CallObjectMethod(_jobjectFailedContext, jmidGetParentId)));
-
- ManagedLog::LOGGER->LogStop("FailedContextClr2Java::FailedContextClr2Java");
- }
-
- FailedContextClr2Java::~FailedContextClr2Java() {
- this->!FailedContextClr2Java();
- }
-
- FailedContextClr2Java::!FailedContextClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectFailedContext != NULL) {
- env->DeleteGlobalRef(_jobjectFailedContext);
- }
-
- if (_jstringContextId != NULL) {
- env->DeleteGlobalRef(_jstringContextId);
- }
-
- if (_jstringEvaluatorId != NULL) {
- env->DeleteGlobalRef(_jstringEvaluatorId);
- }
-
- if (_jstringParentContextId != NULL) {
- env->DeleteGlobalRef(_jstringParentContextId);
- }
- }
-
- IActiveContextClr2Java^ FailedContextClr2Java::GetParentContext() {
- ManagedLog::LOGGER->LogStart("FailedContextClr2Java::GetParentContext");
-
- JNIEnv *env = RetrieveEnv(_jvm);
-
- jclass jclassFailedContext = env->GetObjectClass(_jobjectFailedContext);
- jmethodID jmidGetParentContext = env->GetMethodID(jclassFailedContext, "getParentContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
- jobject jobjectParentContext = env->CallObjectMethod(_jobjectFailedContext, jmidGetParentContext);
- ManagedLog::LOGGER->LogStop("FailedContextClr2Java::GetParentContext");
-
- return gcnew ActiveContextClr2Java(env, jobjectParentContext);
- }
-
- String^ FailedContextClr2Java::GetId() {
- ManagedLog::LOGGER->Log("FailedContextClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringContextId);
- }
-
- String^ FailedContextClr2Java::GetEvaluatorId() {
- ManagedLog::LOGGER->Log("FailedContextClr2Java::GetEvaluatorId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringEvaluatorId);
- }
-
- String^ FailedContextClr2Java::GetParentId() {
- ManagedLog::LOGGER->Log("FailedContextClr2Java::GetParentId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringParentContextId);
- }
-
- IEvaluatorDescriptor^ FailedContextClr2Java::GetEvaluatorDescriptor() {
- ManagedLog::LOGGER->LogStart("FailedContextClr2Java::GetEvaluatorDescriptor");
- return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectFailedContext, _jvm);
- }
-
- void FailedContextClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("FailedContextClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectFailedContext);
- }
- }
- }
- }
- }
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
+ FailedContextClr2Java::FailedContextClr2Java(JNIEnv *env, jobject jobjectFailedContext) {
+ ManagedLog::LOGGER->LogStart("FailedContextClr2Java::FailedContextClr2Java");
+
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectFailedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedContext));
+ jclass jclassFailedContext = env->GetObjectClass(_jobjectFailedContext);
+
+ jmethodID jmidGetParentId = env->GetMethodID(jclassFailedContext, "getParentIdString", "()Ljava/lang/String;");
+ _jstringContextId = CommonUtilities::GetJObjectId(env, jobjectFailedContext, jclassFailedContext);
+ _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, jobjectFailedContext, jclassFailedContext);
+ _jstringParentContextId = reinterpret_cast<jstring>(env->NewGlobalRef(env->CallObjectMethod(_jobjectFailedContext, jmidGetParentId)));
+
+ ManagedLog::LOGGER->LogStop("FailedContextClr2Java::FailedContextClr2Java");
+ }
+
+ FailedContextClr2Java::~FailedContextClr2Java() {
+ this->!FailedContextClr2Java();
+ }
+
+ FailedContextClr2Java::!FailedContextClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectFailedContext != NULL) {
+ env->DeleteGlobalRef(_jobjectFailedContext);
+ }
+
+ if (_jstringContextId != NULL) {
+ env->DeleteGlobalRef(_jstringContextId);
+ }
+
+ if (_jstringEvaluatorId != NULL) {
+ env->DeleteGlobalRef(_jstringEvaluatorId);
+ }
+
+ if (_jstringParentContextId != NULL) {
+ env->DeleteGlobalRef(_jstringParentContextId);
+ }
+ }
+
+ IActiveContextClr2Java^ FailedContextClr2Java::GetParentContext() {
+ ManagedLog::LOGGER->LogStart("FailedContextClr2Java::GetParentContext");
+
+ JNIEnv *env = RetrieveEnv(_jvm);
+
+ jclass jclassFailedContext = env->GetObjectClass(_jobjectFailedContext);
+ jmethodID jmidGetParentContext = env->GetMethodID(jclassFailedContext, "getParentContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+ jobject jobjectParentContext = env->CallObjectMethod(_jobjectFailedContext, jmidGetParentContext);
+ ManagedLog::LOGGER->LogStop("FailedContextClr2Java::GetParentContext");
+
+ return gcnew ActiveContextClr2Java(env, jobjectParentContext);
+ }
+
+ String^ FailedContextClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("FailedContextClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringContextId);
+ }
+
+ String^ FailedContextClr2Java::GetEvaluatorId() {
+ ManagedLog::LOGGER->Log("FailedContextClr2Java::GetEvaluatorId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringEvaluatorId);
+ }
+
+ String^ FailedContextClr2Java::GetParentId() {
+ ManagedLog::LOGGER->Log("FailedContextClr2Java::GetParentId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringParentContextId);
+ }
+
+ IEvaluatorDescriptor^ FailedContextClr2Java::GetEvaluatorDescriptor() {
+ ManagedLog::LOGGER->LogStart("FailedContextClr2Java::GetEvaluatorDescriptor");
+ return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectFailedContext, _jvm);
+ }
+
+ void FailedContextClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("FailedContextClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectFailedContext);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/FailedEvaluatorClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/FailedEvaluatorClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/FailedEvaluatorClr2Java.cpp
index f033c24..1775ccd 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/FailedEvaluatorClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/FailedEvaluatorClr2Java.cpp
@@ -21,60 +21,60 @@ using namespace JavaClrBridge;
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
-
- FailedEvaluatorClr2Java::FailedEvaluatorClr2Java(JNIEnv *env, jobject jobjectFailedEvaluator) {
- ManagedLog::LOGGER->LogStart("FailedEvaluatorClr2Java::FailedEvaluatorClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectFailedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedEvaluator));
-
- jclass jclassFailedEvaluator = env->GetObjectClass(_jobjectFailedEvaluator);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectFailedEvaluator, jclassFailedEvaluator);
- ManagedLog::LOGGER->LogStop("FailedEvaluatorClr2Java::FailedEvaluatorClr2Java");
- }
-
- FailedEvaluatorClr2Java::~FailedEvaluatorClr2Java() {
- this->!FailedEvaluatorClr2Java();
- }
-
- FailedEvaluatorClr2Java::!FailedEvaluatorClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectFailedEvaluator != NULL) {
- env->DeleteGlobalRef(_jobjectFailedEvaluator);
- }
-
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
- }
-
- IEvaluatorRequestorClr2Java^ FailedEvaluatorClr2Java::GetEvaluatorRequestor() {
- ManagedLog::LOGGER->LogStart("FailedEvaluatorClr2Java::GetEvaluatorRequestor");
- JNIEnv *env = RetrieveEnv(_jvm);
-
- jclass jclassFailedEvaluator = env->GetObjectClass(_jobjectFailedEvaluator);
- jmethodID jmidGetEvaluatorRequestor = env->GetMethodID(jclassFailedEvaluator, "getEvaluatorRequestorBridge", "()Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;");
- jobject jobjectEvaluatorRequestor = env->CallObjectMethod(_jobjectFailedEvaluator, jmidGetEvaluatorRequestor);
- ManagedLog::LOGGER->LogStop("FailedEvaluatorClr2Java::GetEvaluatorRequestor");
- return gcnew EvaluatorRequestorClr2Java(env, jobjectEvaluatorRequestor);
- }
-
- String^ FailedEvaluatorClr2Java::GetId() {
- ManagedLog::LOGGER->Log("FailedEvaluatorClr2Java::GetId");
-
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
+
+ FailedEvaluatorClr2Java::FailedEvaluatorClr2Java(JNIEnv *env, jobject jobjectFailedEvaluator) {
+ ManagedLog::LOGGER->LogStart("FailedEvaluatorClr2Java::FailedEvaluatorClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectFailedEvaluator = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedEvaluator));
+
+ jclass jclassFailedEvaluator = env->GetObjectClass(_jobjectFailedEvaluator);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectFailedEvaluator, jclassFailedEvaluator);
+ ManagedLog::LOGGER->LogStop("FailedEvaluatorClr2Java::FailedEvaluatorClr2Java");
+ }
+
+ FailedEvaluatorClr2Java::~FailedEvaluatorClr2Java() {
+ this->!FailedEvaluatorClr2Java();
+ }
+
+ FailedEvaluatorClr2Java::!FailedEvaluatorClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectFailedEvaluator != NULL) {
+ env->DeleteGlobalRef(_jobjectFailedEvaluator);
+ }
+
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+ }
+
+ IEvaluatorRequestorClr2Java^ FailedEvaluatorClr2Java::GetEvaluatorRequestor() {
+ ManagedLog::LOGGER->LogStart("FailedEvaluatorClr2Java::GetEvaluatorRequestor");
+ JNIEnv *env = RetrieveEnv(_jvm);
+
+ jclass jclassFailedEvaluator = env->GetObjectClass(_jobjectFailedEvaluator);
+ jmethodID jmidGetEvaluatorRequestor = env->GetMethodID(jclassFailedEvaluator, "getEvaluatorRequestorBridge", "()Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;");
+ jobject jobjectEvaluatorRequestor = env->CallObjectMethod(_jobjectFailedEvaluator, jmidGetEvaluatorRequestor);
+ ManagedLog::LOGGER->LogStop("FailedEvaluatorClr2Java::GetEvaluatorRequestor");
+ return gcnew EvaluatorRequestorClr2Java(env, jobjectEvaluatorRequestor);
+ }
+
+ String^ FailedEvaluatorClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("FailedEvaluatorClr2Java::GetId");
+
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
array<IFailedContextClr2Java^>^ FailedEvaluatorClr2Java::GetFailedContextsClr2Java() {
JNIEnv *env = RetrieveEnv(_jvm);
@@ -110,11 +110,11 @@ namespace Org {
return gcnew FailedTaskClr2Java(env, failedTask);
}
- void FailedEvaluatorClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("FailedEvaluatorClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectFailedEvaluator);
- }
+ void FailedEvaluatorClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("FailedEvaluatorClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectFailedEvaluator);
+ }
array<byte>^ FailedEvaluatorClr2Java::GetErrorBytes() {
JNIEnv *env = RetrieveEnv(_jvm);
@@ -154,9 +154,9 @@ namespace Org {
jstring stackTrace = reinterpret_cast<jstring>(methodCallReturn);
return ManagedStringFromJavaString(env, stackTrace);
}
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/FailedTaskClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/FailedTaskClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/FailedTaskClr2Java.cpp
index 91443c2..fcf8819 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/FailedTaskClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/FailedTaskClr2Java.cpp
@@ -19,80 +19,80 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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++>");
+ };
- FailedTaskClr2Java::FailedTaskClr2Java(JNIEnv *env, jobject jobjectFailedTask) {
- ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::AllocatedEvaluatorClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectFailedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedTask));
- ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::AllocatedEvaluatorClr2Java");
- }
+ FailedTaskClr2Java::FailedTaskClr2Java(JNIEnv *env, jobject jobjectFailedTask) {
+ ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::AllocatedEvaluatorClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectFailedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectFailedTask));
+ ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::AllocatedEvaluatorClr2Java");
+ }
- FailedTaskClr2Java::~FailedTaskClr2Java() {
- this->!FailedTaskClr2Java();
- }
+ FailedTaskClr2Java::~FailedTaskClr2Java() {
+ this->!FailedTaskClr2Java();
+ }
- FailedTaskClr2Java::!FailedTaskClr2Java() {
- if (_jobjectFailedTask != NULL) {
- JNIEnv *env = RetrieveEnv(_jvm);
- env->DeleteGlobalRef(_jobjectFailedTask);
- }
- }
+ FailedTaskClr2Java::!FailedTaskClr2Java() {
+ if (_jobjectFailedTask != NULL) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ env->DeleteGlobalRef(_jobjectFailedTask);
+ }
+ }
- IActiveContextClr2Java^ FailedTaskClr2Java::GetActiveContext() {
- ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::GetActiveContext");
+ IActiveContextClr2Java^ FailedTaskClr2Java::GetActiveContext() {
+ ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::GetActiveContext");
- JNIEnv *env = RetrieveEnv(_jvm);
+ JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassFailedTask = env->GetObjectClass(_jobjectFailedTask);
- jmethodID jmidGetActiveContext = env->GetMethodID(jclassFailedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
- jobject jobjectActiveContext = env->CallObjectMethod(_jobjectFailedTask, jmidGetActiveContext);
+ jclass jclassFailedTask = env->GetObjectClass(_jobjectFailedTask);
+ jmethodID jmidGetActiveContext = env->GetMethodID(jclassFailedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+ jobject jobjectActiveContext = env->CallObjectMethod(_jobjectFailedTask, jmidGetActiveContext);
- ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::GetActiveContext");
+ ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::GetActiveContext");
- if (jobjectActiveContext == NULL) {
- return nullptr;
- }
+ if (jobjectActiveContext == NULL) {
+ return nullptr;
+ }
- return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
- }
+ return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
+ }
- array<byte>^ FailedTaskClr2Java::GetFailedTaskSerializedAvro() {
- ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::GetFailedTaskSerializedAvro");
- JNIEnv *env = RetrieveEnv(_jvm);
+ array<byte>^ FailedTaskClr2Java::GetFailedTaskSerializedAvro() {
+ ManagedLog::LOGGER->LogStart("FailedTaskClr2Java::GetFailedTaskSerializedAvro");
+ JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassFailedTask = env->GetObjectClass(_jobjectFailedTask);
- jmethodID jmidGetFailedTaskSerializedAvro = env->GetMethodID(jclassFailedTask, "getFailedTaskSerializedAvro", "()[B");
+ jclass jclassFailedTask = env->GetObjectClass(_jobjectFailedTask);
+ jmethodID jmidGetFailedTaskSerializedAvro = env->GetMethodID(jclassFailedTask, "getFailedTaskSerializedAvro", "()[B");
- if (jmidGetFailedTaskSerializedAvro == NULL) {
- ManagedLog::LOGGER->LogStart("jmidGetFailedTaskSerializedAvro is NULL");
- return nullptr;
- }
- jbyteArray jFailedTaskSerializedAvro = (jbyteArray)env->CallObjectMethod(
- _jobjectFailedTask,
- jmidGetFailedTaskSerializedAvro);
- ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::GetFailedTaskSerializedAvro");
- return ManagedByteArrayFromJavaByteArray(env, jFailedTaskSerializedAvro);
- }
+ if (jmidGetFailedTaskSerializedAvro == NULL) {
+ ManagedLog::LOGGER->LogStart("jmidGetFailedTaskSerializedAvro is NULL");
+ return nullptr;
+ }
+ jbyteArray jFailedTaskSerializedAvro = (jbyteArray)env->CallObjectMethod(
+ _jobjectFailedTask,
+ jmidGetFailedTaskSerializedAvro);
+ ManagedLog::LOGGER->LogStop("FailedTaskClr2Java::GetFailedTaskSerializedAvro");
+ return ManagedByteArrayFromJavaByteArray(env, jFailedTaskSerializedAvro);
+ }
- void FailedTaskClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("FailedTaskClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectFailedTask);
- }
- }
- }
- }
- }
+ void FailedTaskClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("FailedTaskClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectFailedTask);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/HttpServerClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/HttpServerClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/HttpServerClr2Java.cpp
index 658d155..02d0eeb 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/HttpServerClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/HttpServerClr2Java.cpp
@@ -19,131 +19,131 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
-
- HttpServerClr2Java::HttpServerClr2Java(JNIEnv *env, jobject jhttpServerEventBridge) {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::HttpServerClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jhttpServerEventBridge = reinterpret_cast<jobject>(env->NewGlobalRef(jhttpServerEventBridge));
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::HttpServerClr2Java");
- }
-
- HttpServerClr2Java::~HttpServerClr2Java() {
- this->!HttpServerClr2Java();
- }
-
- HttpServerClr2Java::!HttpServerClr2Java() {
- if (_jhttpServerEventBridge != NULL) {
- JNIEnv *env = RetrieveEnv(_jvm);
- env->DeleteGlobalRef(_jhttpServerEventBridge);
- }
- }
-
- String^ HttpServerClr2Java::GetQueryString() {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::GetQueryString");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
- jmethodID jmidgetQueryString = env->GetMethodID(jclasshttpServerEventBridge, "getQueryString", "()Ljava/lang/String;");
- if (jmidgetQueryString == NULL) {
- fprintf(stdout, " jmidgetQueryString is NULL\n");
- fflush(stdout);
- return nullptr;
- }
- jstring jQueryString = (jstring)env->CallObjectMethod(
- _jhttpServerEventBridge,
- jmidgetQueryString);
-
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::GetQueryString");
- return ManagedStringFromJavaString(env, jQueryString);
- }
-
- array<byte>^ HttpServerClr2Java::GetQueryRequestData() {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::GetQueryRequestData");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
- jmethodID jmidgetQueryBytes = env->GetMethodID(jclasshttpServerEventBridge, "getQueryRequestData", "()[B");
-
- if (jmidgetQueryBytes == NULL) {
- ManagedLog::LOGGER->Log("jmidgetQueryBytes is NULL");
- return nullptr;
- }
- jbyteArray jQueryBytes = (jbyteArray)env->CallObjectMethod(
- _jhttpServerEventBridge,
- jmidgetQueryBytes);
-
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::GetQueryRequestData");
- return ManagedByteArrayFromJavaByteArray(env, jQueryBytes);
- }
-
- void HttpServerClr2Java::SetQueryResult(String^ queryResult) {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetQueryResult");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
- jmethodID jmidsetQueryResult = env->GetMethodID(jclasshttpServerEventBridge, "setQueryResult", "(Ljava/lang/String;)V");
-
- if (jmidsetQueryResult == NULL) {
- ManagedLog::LOGGER->Log("jmidsetQueryResult is NULL");
- return;
- }
- env->CallObjectMethod(
- _jhttpServerEventBridge,
- jmidsetQueryResult,
- JavaStringFromManagedString(env, queryResult));
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetQueryResult");
- }
-
- void HttpServerClr2Java::SetQueryResponseData(array<byte>^ queryResponseData) {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetQueryResponseData");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
- jmethodID jmidsetQueryResult = env->GetMethodID(jclasshttpServerEventBridge, "setQueryResponseData", "([B)V");
-
- if (jmidsetQueryResult == NULL) {
- ManagedLog::LOGGER->Log("jmidsetQueryResult is NULL");
- return;
- }
- env->CallObjectMethod(
- _jhttpServerEventBridge,
- jmidsetQueryResult,
- JavaByteArrayFromManagedByteArray(env, queryResponseData));
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetQueryResponseData");
- }
-
- void HttpServerClr2Java::SetUriSpecification(String^ uriSpecification) {
- ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetUriSpecification");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
- jmethodID jmidsetUriSpecification = env->GetMethodID(jclasshttpServerEventBridge, "setUriSpecification", "(Ljava/lang/String;)V");
-
- if (jmidsetUriSpecification == NULL) {
- ManagedLog::LOGGER->Log("jmidsetUriSpecification is NULL");
- return;
- }
- env->CallObjectMethod(
- _jhttpServerEventBridge,
- jmidsetUriSpecification,
- JavaStringFromManagedString(env, uriSpecification));
- ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetUriSpecification");
- }
-
- void HttpServerClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("HttpServerClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jhttpServerEventBridge);
- }
- }
- }
- }
- }
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
+
+ HttpServerClr2Java::HttpServerClr2Java(JNIEnv *env, jobject jhttpServerEventBridge) {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::HttpServerClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jhttpServerEventBridge = reinterpret_cast<jobject>(env->NewGlobalRef(jhttpServerEventBridge));
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::HttpServerClr2Java");
+ }
+
+ HttpServerClr2Java::~HttpServerClr2Java() {
+ this->!HttpServerClr2Java();
+ }
+
+ HttpServerClr2Java::!HttpServerClr2Java() {
+ if (_jhttpServerEventBridge != NULL) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ env->DeleteGlobalRef(_jhttpServerEventBridge);
+ }
+ }
+
+ String^ HttpServerClr2Java::GetQueryString() {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::GetQueryString");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
+ jmethodID jmidgetQueryString = env->GetMethodID(jclasshttpServerEventBridge, "getQueryString", "()Ljava/lang/String;");
+ if (jmidgetQueryString == NULL) {
+ fprintf(stdout, " jmidgetQueryString is NULL\n");
+ fflush(stdout);
+ return nullptr;
+ }
+ jstring jQueryString = (jstring)env->CallObjectMethod(
+ _jhttpServerEventBridge,
+ jmidgetQueryString);
+
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::GetQueryString");
+ return ManagedStringFromJavaString(env, jQueryString);
+ }
+
+ array<byte>^ HttpServerClr2Java::GetQueryRequestData() {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::GetQueryRequestData");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
+ jmethodID jmidgetQueryBytes = env->GetMethodID(jclasshttpServerEventBridge, "getQueryRequestData", "()[B");
+
+ if (jmidgetQueryBytes == NULL) {
+ ManagedLog::LOGGER->Log("jmidgetQueryBytes is NULL");
+ return nullptr;
+ }
+ jbyteArray jQueryBytes = (jbyteArray)env->CallObjectMethod(
+ _jhttpServerEventBridge,
+ jmidgetQueryBytes);
+
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::GetQueryRequestData");
+ return ManagedByteArrayFromJavaByteArray(env, jQueryBytes);
+ }
+
+ void HttpServerClr2Java::SetQueryResult(String^ queryResult) {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetQueryResult");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
+ jmethodID jmidsetQueryResult = env->GetMethodID(jclasshttpServerEventBridge, "setQueryResult", "(Ljava/lang/String;)V");
+
+ if (jmidsetQueryResult == NULL) {
+ ManagedLog::LOGGER->Log("jmidsetQueryResult is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jhttpServerEventBridge,
+ jmidsetQueryResult,
+ JavaStringFromManagedString(env, queryResult));
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetQueryResult");
+ }
+
+ void HttpServerClr2Java::SetQueryResponseData(array<byte>^ queryResponseData) {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetQueryResponseData");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
+ jmethodID jmidsetQueryResult = env->GetMethodID(jclasshttpServerEventBridge, "setQueryResponseData", "([B)V");
+
+ if (jmidsetQueryResult == NULL) {
+ ManagedLog::LOGGER->Log("jmidsetQueryResult is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jhttpServerEventBridge,
+ jmidsetQueryResult,
+ JavaByteArrayFromManagedByteArray(env, queryResponseData));
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetQueryResponseData");
+ }
+
+ void HttpServerClr2Java::SetUriSpecification(String^ uriSpecification) {
+ ManagedLog::LOGGER->LogStart("HttpServerClr2Java::SetUriSpecification");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclasshttpServerEventBridge = env->GetObjectClass(_jhttpServerEventBridge);
+ jmethodID jmidsetUriSpecification = env->GetMethodID(jclasshttpServerEventBridge, "setUriSpecification", "(Ljava/lang/String;)V");
+
+ if (jmidsetUriSpecification == NULL) {
+ ManagedLog::LOGGER->Log("jmidsetUriSpecification is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jhttpServerEventBridge,
+ jmidsetUriSpecification,
+ JavaStringFromManagedString(env, uriSpecification));
+ ManagedLog::LOGGER->LogStop("HttpServerClr2Java::SetUriSpecification");
+ }
+
+ void HttpServerClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("HttpServerClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jhttpServerEventBridge);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/InteropLogger.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/InteropLogger.cpp b/lang/cs/Org.Apache.REEF.Bridge/InteropLogger.cpp
index 4f208bd..f7be82c 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/InteropLogger.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/InteropLogger.cpp
@@ -18,34 +18,34 @@
#include "InteropLogger.h"
namespace Org {
- namespace Apache {
- namespace REEF {
- namespace Bridge {
- /// currently not being used
- InteropLogger::InteropLogger(JNIEnv* env, jobject jobjectInteropLogger) {
- _env = env;
- _jobjectInteropLogger = jobjectInteropLogger;
- _jclassInteropLogger = env->GetObjectClass(jobjectInteropLogger);
- wchar_t formatBuf[1024];
- if (NULL == _jclassInteropLogger) {
- swprintf_s(formatBuf, sizeof(formatBuf) / sizeof(wchar_t), L"_jclassInteropLogger %p\n", _jclassInteropLogger);
- fwprintf(stdout, formatBuf);
- fflush(stdout);
- }
- _jmidLog = env->GetMethodID(_jclassInteropLogger, "log", "(ILjava/lang/String;)V");
- if (NULL == _jmidLog) {
- swprintf_s(formatBuf, sizeof(formatBuf) / sizeof(wchar_t), L"_jmidLog %p\n", _jmidLog);
- fwprintf(stdout, formatBuf);
- fflush(stdout);
- }
+ namespace Apache {
+ namespace REEF {
+ namespace Bridge {
+ /// currently not being used
+ InteropLogger::InteropLogger(JNIEnv* env, jobject jobjectInteropLogger) {
+ _env = env;
+ _jobjectInteropLogger = jobjectInteropLogger;
+ _jclassInteropLogger = env->GetObjectClass(jobjectInteropLogger);
+ wchar_t formatBuf[1024];
+ if (NULL == _jclassInteropLogger) {
+ swprintf_s(formatBuf, sizeof(formatBuf) / sizeof(wchar_t), L"_jclassInteropLogger %p\n", _jclassInteropLogger);
+ fwprintf(stdout, formatBuf);
+ fflush(stdout);
+ }
+ _jmidLog = env->GetMethodID(_jclassInteropLogger, "log", "(ILjava/lang/String;)V");
+ if (NULL == _jmidLog) {
+ swprintf_s(formatBuf, sizeof(formatBuf) / sizeof(wchar_t), L"_jmidLog %p\n", _jmidLog);
+ fwprintf(stdout, formatBuf);
+ fflush(stdout);
+ }
- }
- void InteropLogger::Log(TraceLevel traceLevel, String^ message) {
- pin_ptr<const wchar_t> wch = PtrToStringChars(message);
- jstring msg = _env->NewString((const jchar*)wch, message->Length);
- _env->CallObjectMethod(_jobjectInteropLogger, _jmidLog, (int)traceLevel, msg);
- }
- }
- }
- }
+ }
+ void InteropLogger::Log(TraceLevel traceLevel, String^ message) {
+ pin_ptr<const wchar_t> wch = PtrToStringChars(message);
+ jstring msg = _env->NewString((const jchar*)wch, message->Length);
+ _env->CallObjectMethod(_jobjectInteropLogger, _jmidLog, (int)traceLevel, msg);
+ }
+ }
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp b/lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp
index 69c28bc..9f676ce 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp
@@ -58,9 +58,9 @@ String^ ManagedStringFromJavaString (
}
bool ClrBoolFromJavaBoolean(
- JNIEnv * env,
- jboolean jbool) {
- return jbool != JNI_FALSE;
+ JNIEnv * env,
+ jboolean jbool) {
+ return jbool != JNI_FALSE;
}
jstring JavaStringFromManagedString(
@@ -129,5 +129,5 @@ JNIEnv* RetrieveEnv(JavaVM* jvm) {
}
String^ FormatJavaExceptionMessage(String^ errorMessage, Exception^ exception) {
- return String::Concat(errorMessage, Environment::NewLine, exception->StackTrace);
+ return String::Concat(errorMessage, Environment::NewLine, exception->StackTrace);
}
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp b/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp
index f5950aa..53edb0c 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp
@@ -142,10 +142,10 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_callClrSyst
ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnStartHandler");
DateTime dt = DateTime::Now;
- String^ strPort = ManagedStringFromJavaString(env, httpServerPort);
+ String^ strPort = ManagedStringFromJavaString(env, httpServerPort);
- EvaluatorRequestorClr2Java^ evaluatorRequestorBridge = gcnew EvaluatorRequestorClr2Java(env, jevaluatorRequestorBridge);
- BridgeHandlerManager^ handlerManager = ClrSystemHandlerWrapper::Call_ClrSystemStartHandler_OnStart(dt, strPort, evaluatorRequestorBridge);
+ EvaluatorRequestorClr2Java^ evaluatorRequestorBridge = gcnew EvaluatorRequestorClr2Java(env, jevaluatorRequestorBridge);
+ BridgeHandlerManager^ handlerManager = ClrSystemHandlerWrapper::Call_ClrSystemStartHandler_OnStart(dt, strPort, evaluatorRequestorBridge);
populateJavaBridgeHandlerManager(env, jbridgeHandlerManager, handlerManager);
}
catch (System::Exception^ ex) {
@@ -474,19 +474,19 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystemCo
*/
JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler
(JNIEnv * env, jclass jclassx, jstring httpServerPort, jobject jbridgeHandlerManager, jobject jevaluatorRequestorBridge, jobject jdriverRestartedBridge) {
- try {
- ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler");
- String^ strPort = ManagedStringFromJavaString(env, httpServerPort);
+ try {
+ ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler");
+ String^ strPort = ManagedStringFromJavaString(env, httpServerPort);
- EvaluatorRequestorClr2Java^ evaluatorRequestorBridge = gcnew EvaluatorRequestorClr2Java(env, jevaluatorRequestorBridge);
- DriverRestartedClr2Java^ driverRestartedBridge = gcnew DriverRestartedClr2Java(env, jdriverRestartedBridge);
+ EvaluatorRequestorClr2Java^ evaluatorRequestorBridge = gcnew EvaluatorRequestorClr2Java(env, jevaluatorRequestorBridge);
+ DriverRestartedClr2Java^ driverRestartedBridge = gcnew DriverRestartedClr2Java(env, jdriverRestartedBridge);
BridgeHandlerManager^ handlerManager = ClrSystemHandlerWrapper::Call_ClrSystemRestartHandler_OnRestart(strPort, evaluatorRequestorBridge, driverRestartedBridge);
populateJavaBridgeHandlerManager(env, jbridgeHandlerManager, handlerManager);
- }
- catch (System::Exception^ ex) {
- // we cannot get error back to java here since we don't have an object to call back (although we ideally should...)
- ManagedLog::LOGGER->LogError("Exceptions in Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler", ex);
- }
+ }
+ catch (System::Exception^ ex) {
+ // we cannot get error back to java here since we don't have an object to call back (although we ideally should...)
+ ManagedLog::LOGGER->LogError("Exceptions in Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler", ex);
+ }
}
/*
@@ -534,15 +534,15 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystemDr
*/
JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartCompletedHandlerOnNext
(JNIEnv * env, jclass cls , jlong handler, jobject jdriverRestartCompleted) {
- ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartCompletedHandlerOnNext");
- DriverRestartCompletedClr2Java^ driverRestartCompletedBridge = gcnew DriverRestartCompletedClr2Java(env, jdriverRestartCompleted);
- try {
- ClrSystemHandlerWrapper::Call_ClrSystemDriverRestartCompleted_OnNext(handler, driverRestartCompletedBridge);
- }
- catch (System::Exception^ ex) {
- String^ errorMessage = "Exception in Call_ClrSystemDriverRestartRunningTask_OnNext";
- ManagedLog::LOGGER->LogError(errorMessage, ex);
- }
+ ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartCompletedHandlerOnNext");
+ DriverRestartCompletedClr2Java^ driverRestartCompletedBridge = gcnew DriverRestartCompletedClr2Java(env, jdriverRestartCompleted);
+ try {
+ ClrSystemHandlerWrapper::Call_ClrSystemDriverRestartCompleted_OnNext(handler, driverRestartCompletedBridge);
+ }
+ catch (System::Exception^ ex) {
+ String^ errorMessage = "Exception in Call_ClrSystemDriverRestartRunningTask_OnNext";
+ ManagedLog::LOGGER->LogError(errorMessage, ex);
+ }
}
/*
@@ -552,15 +552,15 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystemDr
*/
JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartFailedEvaluatorHandlerOnNext
(JNIEnv * env, jclass cls, jlong handler, jobject jfailedEvaluator, jobject jlogger) {
- ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartFailedEvaluatorHandlerOnNext");
- FailedEvaluatorClr2Java^ failedEvaluatorBridge = gcnew FailedEvaluatorClr2Java(env, jfailedEvaluator);
- try {
- ClrSystemHandlerWrapper::Call_ClrSystemDriverRestartFailedEvaluator_OnNext(handler, failedEvaluatorBridge);
- }
- catch (System::Exception^ ex) {
- String^ errorMessage = "Exception in Call_ClrSystemDriverRestartFailedEvaluator_OnNext";
- ManagedLog::LOGGER->LogError(errorMessage, ex);
- }
+ ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartFailedEvaluatorHandlerOnNext");
+ FailedEvaluatorClr2Java^ failedEvaluatorBridge = gcnew FailedEvaluatorClr2Java(env, jfailedEvaluator);
+ try {
+ ClrSystemHandlerWrapper::Call_ClrSystemDriverRestartFailedEvaluator_OnNext(handler, failedEvaluatorBridge);
+ }
+ catch (System::Exception^ ex) {
+ String^ errorMessage = "Exception in Call_ClrSystemDriverRestartFailedEvaluator_OnNext";
+ ManagedLog::LOGGER->LogError(errorMessage, ex);
+ }
}
/*
@@ -582,73 +582,73 @@ JNIEXPORT jfloat JNICALL Java_org_apache_reef_javabridge_NativeInterop_clrSystem
}
static JNINativeMethod methods[] = {
- { "loadClrAssembly", "(Ljava/lang/String;)V", (void*)&Java_org_apache_reef_javabridge_NativeInterop_loadClrAssembly },
+ { "loadClrAssembly", "(Ljava/lang/String;)V", (void*)&Java_org_apache_reef_javabridge_NativeInterop_loadClrAssembly },
- { "clrBufferedLog", "(ILjava/lang/String;)V", (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrBufferedLog },
+ { "clrBufferedLog", "(ILjava/lang/String;)V", (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrBufferedLog },
- { "callClrSystemOnStartHandler", "(Ljava/lang/String;Ljava/lang/String;Lorg/apache/reef/javabridge/BridgeHandlerManager;Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnStartHandler },
+ { "callClrSystemOnStartHandler", "(Ljava/lang/String;Ljava/lang/String;Lorg/apache/reef/javabridge/BridgeHandlerManager;Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnStartHandler },
- { "clrSystemAllocatedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/AllocatedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemAllocatedEvaluatorHandlerOnNext },
+ { "clrSystemAllocatedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/AllocatedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemAllocatedEvaluatorHandlerOnNext },
- { "clrSystemActiveContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ActiveContextBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemActiveContextHandlerOnNext },
+ { "clrSystemActiveContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ActiveContextBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemActiveContextHandlerOnNext },
- { "clrSystemTaskMessageHandlerOnNext", "(J[BLorg/apache/reef/javabridge/TaskMessageBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemTaskMessageHandlerOnNext },
+ { "clrSystemTaskMessageHandlerOnNext", "(J[BLorg/apache/reef/javabridge/TaskMessageBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemTaskMessageHandlerOnNext },
- { "clrSystemFailedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedTaskHandlerOnNext },
+ { "clrSystemFailedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedTaskHandlerOnNext },
- { "clrSystemHttpServerHandlerOnNext", "(JLorg/apache/reef/javabridge/HttpServerEventBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemHttpServerHandlerOnNext },
+ { "clrSystemHttpServerHandlerOnNext", "(JLorg/apache/reef/javabridge/HttpServerEventBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemHttpServerHandlerOnNext },
- { "clrSystemFailedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedEvaluatorHandlerOnNext },
+ { "clrSystemFailedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedEvaluatorHandlerOnNext },
- { "clrSystemCompletedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/CompletedTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemCompletedTaskHandlerOnNext },
+ { "clrSystemCompletedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/CompletedTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemCompletedTaskHandlerOnNext },
- { "clrSystemRunningTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/RunningTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemRunningTaskHandlerOnNext },
+ { "clrSystemRunningTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/RunningTaskBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemRunningTaskHandlerOnNext },
- { "clrSystemSuspendedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/SuspendedTaskBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemSuspendedTaskHandlerOnNext },
+ { "clrSystemSuspendedTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/SuspendedTaskBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemSuspendedTaskHandlerOnNext },
- { "clrSystemCompletedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/CompletedEvaluatorBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemCompletedEvaluatorHandlerOnNext },
+ { "clrSystemCompletedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/CompletedEvaluatorBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemCompletedEvaluatorHandlerOnNext },
- { "clrSystemClosedContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ClosedContextBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemClosedContextHandlerOnNext },
+ { "clrSystemClosedContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ClosedContextBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemClosedContextHandlerOnNext },
- { "clrSystemFailedContextHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedContextBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedContextHandlerOnNext },
+ { "clrSystemFailedContextHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedContextBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemFailedContextHandlerOnNext },
- { "clrSystemContextMessageHandlerOnNext", "(JLorg/apache/reef/javabridge/ContextMessageBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemContextMessageHandlerOnNext },
+ { "clrSystemContextMessageHandlerOnNext", "(JLorg/apache/reef/javabridge/ContextMessageBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemContextMessageHandlerOnNext },
- { "callClrSystemOnRestartHandler", "(Ljava/lang/String;Lorg/apache/reef/javabridge/BridgeHandlerManager;Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;Lorg/apache/reef/javabridge/DriverRestartedBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler },
+ { "callClrSystemOnRestartHandler", "(Ljava/lang/String;Lorg/apache/reef/javabridge/BridgeHandlerManager;Lorg/apache/reef/javabridge/EvaluatorRequestorBridge;Lorg/apache/reef/javabridge/DriverRestartedBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_callClrSystemOnRestartHandler },
- { "clrSystemDriverRestartActiveContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ActiveContextBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartActiveContextHandlerOnNext },
+ { "clrSystemDriverRestartActiveContextHandlerOnNext", "(JLorg/apache/reef/javabridge/ActiveContextBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartActiveContextHandlerOnNext },
- { "clrSystemDriverRestartRunningTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/RunningTaskBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartRunningTaskHandlerOnNext },
+ { "clrSystemDriverRestartRunningTaskHandlerOnNext", "(JLorg/apache/reef/javabridge/RunningTaskBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartRunningTaskHandlerOnNext },
- { "clrSystemDriverRestartCompletedHandlerOnNext", "(JLorg/apache/reef/javabridge/generic/DriverRestartCompletedBridge;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartCompletedHandlerOnNext },
+ { "clrSystemDriverRestartCompletedHandlerOnNext", "(JLorg/apache/reef/javabridge/generic/DriverRestartCompletedBridge;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartCompletedHandlerOnNext },
- { "clrSystemDriverRestartFailedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartFailedEvaluatorHandlerOnNext },
+ { "clrSystemDriverRestartFailedEvaluatorHandlerOnNext", "(JLorg/apache/reef/javabridge/FailedEvaluatorBridge;Lorg/apache/reef/javabridge/InteropLogger;)V",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemDriverRestartFailedEvaluatorHandlerOnNext },
- { "clrSystemProgressProviderGetProgress", "(J)F",
- (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemProgressProviderGetProgress },
+ { "clrSystemProgressProviderGetProgress", "(J)F",
+ (void*)&Java_org_apache_reef_javabridge_NativeInterop_clrSystemProgressProviderGetProgress },
};
JNIEXPORT void JNICALL
Java_org_apache_reef_javabridge_NativeInterop_registerNatives(JNIEnv *env, jclass cls)
{
- env->RegisterNatives(cls, methods, sizeof(methods) / sizeof(methods[0]));
+ env->RegisterNatives(cls, methods, sizeof(methods) / sizeof(methods[0]));
}
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/RunningTaskClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/RunningTaskClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/RunningTaskClr2Java.cpp
index d9e264d..1318f9b 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/RunningTaskClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/RunningTaskClr2Java.cpp
@@ -19,130 +19,130 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
- RunningTaskClr2Java::RunningTaskClr2Java(JNIEnv *env, jobject jobjectRunningTask) {
- ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::RunningTaskClr2Java");
-
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectRunningTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectRunningTask));
-
- jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectRunningTask, jclassRunningTask);
- ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::RunningTaskClr2Java");
- }
-
- RunningTaskClr2Java::~RunningTaskClr2Java() {
- this->!RunningTaskClr2Java();
- }
-
- RunningTaskClr2Java::!RunningTaskClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectRunningTask != NULL) {
- env->DeleteGlobalRef(_jobjectRunningTask);
- }
-
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
- }
-
- IActiveContextClr2Java^ RunningTaskClr2Java::GetActiveContext() {
- ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::GetActiveContext");
-
- JNIEnv *env = RetrieveEnv(_jvm);
-
- jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
- jmethodID jmidGetActiveContext = env->GetMethodID(jclassRunningTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
- jobject jobjectActiveContext = env->CallObjectMethod(_jobjectRunningTask, jmidGetActiveContext);
- ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::GetActiveContext");
-
- return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
- }
-
- String^ RunningTaskClr2Java::GetId() {
- ManagedLog::LOGGER->Log("RunningTaskClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
-
- void RunningTaskClr2Java::Send(array<byte>^ message) {
- ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Send");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
- jmethodID jmidSend = env->GetMethodID(jclassRunningTask, "send", "([B)V");
-
- if (jmidSend == NULL) {
- ManagedLog::LOGGER->Log("jmidSend is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectRunningTask,
- jmidSend,
- JavaByteArrayFromManagedByteArray(env, message));
- ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Send");
- }
-
- void RunningTaskClr2Java::Suspend(array<byte>^ message) {
- ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Suspend");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
- jmethodID jmidSuspend = env->GetMethodID(jclassRunningTask, "suspend", "([B)V");
-
- if (jmidSuspend == NULL) {
- ManagedLog::LOGGER->Log("jmidSuspend is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectRunningTask,
- jmidSuspend,
- JavaByteArrayFromManagedByteArray(env, message));
- ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Suspend");
- }
-
- void RunningTaskClr2Java::Close(array<byte>^ message) {
- ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Close");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
- jmethodID jmidClose = env->GetMethodID(jclassRunningTask, "close", "([B)V");
-
- if (jmidClose == NULL) {
- ManagedLog::LOGGER->Log("jmidClose is NULL");
- return;
- }
-
- if (message == nullptr) {
- env->CallObjectMethod(
- _jobjectRunningTask,
- jmidClose,
- NULL);
- }
- else {
- env->CallObjectMethod(
- _jobjectRunningTask,
- jmidClose,
- JavaByteArrayFromManagedByteArray(env, message));
- }
- ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Close");
- }
-
- void RunningTaskClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("RunningTaskClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectRunningTask);
- }
- }
- }
- }
- }
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
+ RunningTaskClr2Java::RunningTaskClr2Java(JNIEnv *env, jobject jobjectRunningTask) {
+ ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::RunningTaskClr2Java");
+
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectRunningTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectRunningTask));
+
+ jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectRunningTask, jclassRunningTask);
+ ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::RunningTaskClr2Java");
+ }
+
+ RunningTaskClr2Java::~RunningTaskClr2Java() {
+ this->!RunningTaskClr2Java();
+ }
+
+ RunningTaskClr2Java::!RunningTaskClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectRunningTask != NULL) {
+ env->DeleteGlobalRef(_jobjectRunningTask);
+ }
+
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+ }
+
+ IActiveContextClr2Java^ RunningTaskClr2Java::GetActiveContext() {
+ ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::GetActiveContext");
+
+ JNIEnv *env = RetrieveEnv(_jvm);
+
+ jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
+ jmethodID jmidGetActiveContext = env->GetMethodID(jclassRunningTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+ jobject jobjectActiveContext = env->CallObjectMethod(_jobjectRunningTask, jmidGetActiveContext);
+ ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::GetActiveContext");
+
+ return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
+ }
+
+ String^ RunningTaskClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("RunningTaskClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
+
+ void RunningTaskClr2Java::Send(array<byte>^ message) {
+ ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Send");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
+ jmethodID jmidSend = env->GetMethodID(jclassRunningTask, "send", "([B)V");
+
+ if (jmidSend == NULL) {
+ ManagedLog::LOGGER->Log("jmidSend is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectRunningTask,
+ jmidSend,
+ JavaByteArrayFromManagedByteArray(env, message));
+ ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Send");
+ }
+
+ void RunningTaskClr2Java::Suspend(array<byte>^ message) {
+ ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Suspend");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
+ jmethodID jmidSuspend = env->GetMethodID(jclassRunningTask, "suspend", "([B)V");
+
+ if (jmidSuspend == NULL) {
+ ManagedLog::LOGGER->Log("jmidSuspend is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectRunningTask,
+ jmidSuspend,
+ JavaByteArrayFromManagedByteArray(env, message));
+ ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Suspend");
+ }
+
+ void RunningTaskClr2Java::Close(array<byte>^ message) {
+ ManagedLog::LOGGER->LogStart("RunningTaskClr2Java::Close");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassRunningTask = env->GetObjectClass(_jobjectRunningTask);
+ jmethodID jmidClose = env->GetMethodID(jclassRunningTask, "close", "([B)V");
+
+ if (jmidClose == NULL) {
+ ManagedLog::LOGGER->Log("jmidClose is NULL");
+ return;
+ }
+
+ if (message == nullptr) {
+ env->CallObjectMethod(
+ _jobjectRunningTask,
+ jmidClose,
+ NULL);
+ }
+ else {
+ env->CallObjectMethod(
+ _jobjectRunningTask,
+ jmidClose,
+ JavaByteArrayFromManagedByteArray(env, message));
+ }
+ ManagedLog::LOGGER->LogStop("RunningTaskClr2Java::Close");
+ }
+
+ void RunningTaskClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("RunningTaskClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectRunningTask);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/SuspendedTaskClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/SuspendedTaskClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/SuspendedTaskClr2Java.cpp
index 92f42ca..7fb03cd 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/SuspendedTaskClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/SuspendedTaskClr2Java.cpp
@@ -19,82 +19,82 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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++>");
+ };
- SuspendedTaskClr2Java::SuspendedTaskClr2Java(JNIEnv *env, jobject jobjectSuspendedTask) {
- ManagedLog::LOGGER->LogStart("SuspendedTaskClr2Java::SuspendedTaskClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectSuspendedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectSuspendedTask));
+ SuspendedTaskClr2Java::SuspendedTaskClr2Java(JNIEnv *env, jobject jobjectSuspendedTask) {
+ ManagedLog::LOGGER->LogStart("SuspendedTaskClr2Java::SuspendedTaskClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectSuspendedTask = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectSuspendedTask));
- jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectSuspendedTask, jclassSuspendedTask);
- ManagedLog::LOGGER->LogStop("SuspendedTaskClr2Java::SuspendedTaskClr2Java");
- }
+ jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectSuspendedTask, jclassSuspendedTask);
+ ManagedLog::LOGGER->LogStop("SuspendedTaskClr2Java::SuspendedTaskClr2Java");
+ }
- SuspendedTaskClr2Java::~SuspendedTaskClr2Java() {
- this->!SuspendedTaskClr2Java();
- }
+ SuspendedTaskClr2Java::~SuspendedTaskClr2Java() {
+ this->!SuspendedTaskClr2Java();
+ }
- SuspendedTaskClr2Java::!SuspendedTaskClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectSuspendedTask != NULL) {
- env->DeleteGlobalRef(_jobjectSuspendedTask);
- }
+ SuspendedTaskClr2Java::!SuspendedTaskClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectSuspendedTask != NULL) {
+ env->DeleteGlobalRef(_jobjectSuspendedTask);
+ }
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
- }
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+ }
- IActiveContextClr2Java^ SuspendedTaskClr2Java::GetActiveContext() {
- ManagedLog::LOGGER->LogStart("SuspendedTaskClr2Java::GetActiveContext");
- JNIEnv *env = RetrieveEnv(_jvm);
+ IActiveContextClr2Java^ SuspendedTaskClr2Java::GetActiveContext() {
+ ManagedLog::LOGGER->LogStart("SuspendedTaskClr2Java::GetActiveContext");
+ JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
- jmethodID jmidGetActiveContext = env->GetMethodID(jclassSuspendedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
- jobject jobjectActiveContext = env->CallObjectMethod(_jobjectSuspendedTask, jmidGetActiveContext);
- ManagedLog::LOGGER->LogStop("SuspendedTaskClr2Java::GetActiveContext");
- return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
- }
+ jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
+ jmethodID jmidGetActiveContext = env->GetMethodID(jclassSuspendedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+ jobject jobjectActiveContext = env->CallObjectMethod(_jobjectSuspendedTask, jmidGetActiveContext);
+ ManagedLog::LOGGER->LogStop("SuspendedTaskClr2Java::GetActiveContext");
+ return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
+ }
- String^ SuspendedTaskClr2Java::GetId() {
- ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
+ String^ SuspendedTaskClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
- array<byte>^ SuspendedTaskClr2Java::Get() {
- ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::Get");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
- jmethodID jmidGet = env->GetMethodID(jclassSuspendedTask, "get", "()[B");
+ array<byte>^ SuspendedTaskClr2Java::Get() {
+ ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::Get");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassSuspendedTask = env->GetObjectClass(_jobjectSuspendedTask);
+ jmethodID jmidGet = env->GetMethodID(jclassSuspendedTask, "get", "()[B");
- if (jmidGet == NULL) {
- ManagedLog::LOGGER->Log("jmidGet is NULL");
- return nullptr;
- }
- jbyteArray jMessage = (jbyteArray)env->CallObjectMethod(_jobjectSuspendedTask, jmidGet);
- return ManagedByteArrayFromJavaByteArray(env, jMessage);
- }
+ if (jmidGet == NULL) {
+ ManagedLog::LOGGER->Log("jmidGet is NULL");
+ return nullptr;
+ }
+ jbyteArray jMessage = (jbyteArray)env->CallObjectMethod(_jobjectSuspendedTask, jmidGet);
+ return ManagedByteArrayFromJavaByteArray(env, jMessage);
+ }
- void SuspendedTaskClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectSuspendedTask);
- }
- }
- }
- }
- }
+ void SuspendedTaskClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("SuspendedTaskClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectSuspendedTask);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/TaskMessageClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/TaskMessageClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/TaskMessageClr2Java.cpp
index b5cee9d..730373a 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/TaskMessageClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/TaskMessageClr2Java.cpp
@@ -19,72 +19,72 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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++>");
+ };
- TaskMessageClr2Java::TaskMessageClr2Java(JNIEnv *env, jobject jtaskMessage) {
- ManagedLog::LOGGER->LogStart("TaskMessageClr2Java::TaskMessageClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectTaskMessage = reinterpret_cast<jobject>(env->NewGlobalRef(jtaskMessage));
+ TaskMessageClr2Java::TaskMessageClr2Java(JNIEnv *env, jobject jtaskMessage) {
+ ManagedLog::LOGGER->LogStart("TaskMessageClr2Java::TaskMessageClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectTaskMessage = reinterpret_cast<jobject>(env->NewGlobalRef(jtaskMessage));
- // Get the Task ID.
- jclass jclassTaskMessage = env->GetObjectClass(_jobjectTaskMessage);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectTaskMessage, jclassTaskMessage);
-
- // Get the Task Message Source ID.
- jmethodID jmid = env->GetMethodID(jclassTaskMessage, "getMessageSourceId", "()Ljava/lang/String;");
- _jstringMessageSourceId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectTaskMessage, jmid);
+ // Get the Task ID.
+ jclass jclassTaskMessage = env->GetObjectClass(_jobjectTaskMessage);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectTaskMessage, jclassTaskMessage);
- ManagedLog::LOGGER->LogStop("TaskMessageClr2Java::TaskMessageClr2Java");
- }
+ // Get the Task Message Source ID.
+ jmethodID jmid = env->GetMethodID(jclassTaskMessage, "getMessageSourceId", "()Ljava/lang/String;");
+ _jstringMessageSourceId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectTaskMessage, jmid);
- TaskMessageClr2Java::~TaskMessageClr2Java() {
- this->!TaskMessageClr2Java();
- }
+ ManagedLog::LOGGER->LogStop("TaskMessageClr2Java::TaskMessageClr2Java");
+ }
- TaskMessageClr2Java::!TaskMessageClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectTaskMessage != NULL) {
- env->DeleteGlobalRef(_jobjectTaskMessage);
- }
+ TaskMessageClr2Java::~TaskMessageClr2Java() {
+ this->!TaskMessageClr2Java();
+ }
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
+ TaskMessageClr2Java::!TaskMessageClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectTaskMessage != NULL) {
+ env->DeleteGlobalRef(_jobjectTaskMessage);
+ }
- if (_jstringMessageSourceId != NULL) {
- env->DeleteGlobalRef(_jstringMessageSourceId);
- }
- }
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
- void TaskMessageClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("TaskMessageClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectTaskMessage);
- }
+ if (_jstringMessageSourceId != NULL) {
+ env->DeleteGlobalRef(_jstringMessageSourceId);
+ }
+ }
- String^ TaskMessageClr2Java::GetId() {
- ManagedLog::LOGGER->Log("TaskMessageClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
+ void TaskMessageClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("TaskMessageClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectTaskMessage);
+ }
- String^ TaskMessageClr2Java::GetMessageSourceId() {
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringMessageSourceId);
- }
- }
- }
- }
- }
+ String^ TaskMessageClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("TaskMessageClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
+
+ String^ TaskMessageClr2Java::GetMessageSourceId() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringMessageSourceId);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverExceptionHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverExceptionHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverExceptionHandler.java
index 7d767b0..2307186 100644
--- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverExceptionHandler.java
+++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverExceptionHandler.java
@@ -51,3 +51,4 @@ public final class DriverExceptionHandler implements EventHandler<Throwable> {
this.driverStatusManager.onError(throwable);
}
}
+
[2/2] reef git commit: [REEF-997] Fix spacing in C++ files
Posted by mo...@apache.org.
[REEF-997] Fix spacing in C++ files
This addressed the issue by
* Fixed the indentation in C++ files in REEF Bridge: tabs to double spaces
JIRA:
[REEF-997](https://issues.apache.org/jira/browse/REEF-997)
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/8557f0f2
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/8557f0f2
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/8557f0f2
Branch: refs/heads/master
Commit: 8557f0f2ad163d703ac7fc4713d4e82b6a945d9f
Parents: 4f85dd7
Author: JiEun Lee <sm...@gmail.com>
Authored: Fri Jul 1 16:00:37 2016 +0900
Committer: Sergiy Matusevych <mo...@apache.org>
Committed: Thu Jul 7 17:29:28 2016 -0700
----------------------------------------------------------------------
.../ActiveContextClr2Java.cpp | 308 ++++++++---------
.../AllocatedEvaluatorClr2Java.cpp | 328 +++++++++----------
.../ClosedContextClr2Java.cpp | 188 +++++------
.../Org.Apache.REEF.Bridge/CommonUtilities.cpp | 54 +--
.../CompletedEvaluatorClr2Java.cpp | 90 ++---
.../CompletedTaskClr2Java.cpp | 134 ++++----
.../ContextMessageClr2Java.cpp | 130 ++++----
.../DriverRestartCompletedClr2Java.cpp | 96 +++---
.../DriverRestartedClr2Java.cpp | 118 +++----
.../EvaluatorRequestorClr2Java.cpp | 142 ++++----
.../FailedContextClr2Java.cpp | 188 +++++------
.../FailedEvaluatorClr2Java.cpp | 126 +++----
.../FailedTaskClr2Java.cpp | 124 +++----
.../HttpServerClr2Java.cpp | 252 +++++++-------
.../cs/Org.Apache.REEF.Bridge/InteropLogger.cpp | 58 ++--
lang/cs/Org.Apache.REEF.Bridge/InteropUtil.cpp | 8 +-
.../cs/Org.Apache.REEF.Bridge/JavaClrBridge.cpp | 148 ++++-----
.../RunningTaskClr2Java.cpp | 250 +++++++-------
.../SuspendedTaskClr2Java.cpp | 132 ++++----
.../TaskMessageClr2Java.cpp | 114 +++----
.../common/driver/DriverExceptionHandler.java | 1 +
21 files changed, 1495 insertions(+), 1494 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/ActiveContextClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/ActiveContextClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/ActiveContextClr2Java.cpp
index b3e8685..58cf186 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/ActiveContextClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/ActiveContextClr2Java.cpp
@@ -18,158 +18,158 @@
#include "Clr2JavaImpl.h"
namespace Org {
- namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- 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);
- }
-
- _jobjectActiveContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectActiveContext));
-
- jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
- jmethodID jmidGetContextId = env->GetMethodID(jclassActiveContext, "getContextId", "()Ljava/lang/String;");
- _jstringId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectActiveContext, jmidGetContextId);
- jmethodID jmidGetParentContextId = env->GetMethodID(jclassActiveContext, "getParentContextId", "()Ljava/lang/String;");
- _jstringParentId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectActiveContext, jmidGetParentContextId);
- _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, _jobjectActiveContext, jclassActiveContext);
-
- ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::ActiveContextClr2Java");
- }
-
- ActiveContextClr2Java::~ActiveContextClr2Java() {
- this->!ActiveContextClr2Java();
- }
-
- ActiveContextClr2Java::!ActiveContextClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectActiveContext != NULL) {
- env->DeleteGlobalRef(_jobjectActiveContext);
- }
-
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
-
- if (_jstringEvaluatorId != NULL) {
- env->DeleteGlobalRef(_jstringEvaluatorId);
- }
- }
-
- 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;
- }
- env->CallObjectMethod(
- _jobjectActiveContext,
- jmidSubmitTask,
- JavaStringFromManagedString(env, taskConfigStr));
- ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SubmitTask");
- }
-
- void ActiveContextClr2Java::SubmitContext(String^ contextConfigStr) {
- SubmitContextAndService(contextConfigStr, nullptr);
- }
-
- void ActiveContextClr2Java::SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr) {
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
- jmethodID jmidSubmitContext =
- env->GetMethodID(jclassActiveContext, "submitContextStringAndServiceString", "(Ljava/lang/String;Ljava/lang/String;)V");
-
- if (jmidSubmitContext == NULL) {
- ManagedLog::LOGGER->Log("jmidSubmitContextStringAndServiceString is NULL");
- return;
- }
-
- const jstring serviceConfigJavaStr =
- serviceConfigStr == nullptr ? NULL : JavaStringFromManagedString(env, serviceConfigStr);
-
- env->CallObjectMethod(
- _jobjectActiveContext,
- jmidSubmitContext,
- JavaStringFromManagedString(env, contextConfigStr),
- serviceConfigJavaStr);
- }
-
- 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");
-
- if (jmidClose == NULL) {
- ManagedLog::LOGGER->Log("jmidClose is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectActiveContext,
- jmidClose);
- ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::Close");
- }
-
- String^ ActiveContextClr2Java::GetParentId() {
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringParentId);
- }
-
- String^ ActiveContextClr2Java::GetId() {
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
-
- String^ ActiveContextClr2Java::GetEvaluatorId() {
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringEvaluatorId);
- }
-
- IEvaluatorDescriptor^ ActiveContextClr2Java::GetEvaluatorDescriptor() {
- ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::GetEvaluatorDescriptor");
- return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectActiveContext, _jvm);
- }
-
- void ActiveContextClr2Java::SendMessage(array<byte>^ message) {
- ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::SendMessage");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
- jmethodID jmidSendMessage = env->GetMethodID(jclassActiveContext, "sendMessage", "([B)V");
-
- if (jmidSendMessage == NULL) {
- ManagedLog::LOGGER->Log("jmidSendMessage is NULL");
- return;
- }
-
- env->CallObjectMethod(
- _jobjectActiveContext,
- jmidSendMessage,
- JavaByteArrayFromManagedByteArray(env, message));
-
- ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SendMessage");
- }
- }
- }
- }
- }
- }
+ namespace Apache {
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ 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);
+ }
+
+ _jobjectActiveContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectActiveContext));
+
+ jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
+ jmethodID jmidGetContextId = env->GetMethodID(jclassActiveContext, "getContextId", "()Ljava/lang/String;");
+ _jstringId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectActiveContext, jmidGetContextId);
+ jmethodID jmidGetParentContextId = env->GetMethodID(jclassActiveContext, "getParentContextId", "()Ljava/lang/String;");
+ _jstringParentId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectActiveContext, jmidGetParentContextId);
+ _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, _jobjectActiveContext, jclassActiveContext);
+
+ ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::ActiveContextClr2Java");
+ }
+
+ ActiveContextClr2Java::~ActiveContextClr2Java() {
+ this->!ActiveContextClr2Java();
+ }
+
+ ActiveContextClr2Java::!ActiveContextClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectActiveContext != NULL) {
+ env->DeleteGlobalRef(_jobjectActiveContext);
+ }
+
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+
+ if (_jstringEvaluatorId != NULL) {
+ env->DeleteGlobalRef(_jstringEvaluatorId);
+ }
+ }
+
+ 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;
+ }
+ env->CallObjectMethod(
+ _jobjectActiveContext,
+ jmidSubmitTask,
+ JavaStringFromManagedString(env, taskConfigStr));
+ ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SubmitTask");
+ }
+
+ void ActiveContextClr2Java::SubmitContext(String^ contextConfigStr) {
+ SubmitContextAndService(contextConfigStr, nullptr);
+ }
+
+ void ActiveContextClr2Java::SubmitContextAndService(String^ contextConfigStr, String^ serviceConfigStr) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
+ jmethodID jmidSubmitContext =
+ env->GetMethodID(jclassActiveContext, "submitContextStringAndServiceString", "(Ljava/lang/String;Ljava/lang/String;)V");
+
+ if (jmidSubmitContext == NULL) {
+ ManagedLog::LOGGER->Log("jmidSubmitContextStringAndServiceString is NULL");
+ return;
+ }
+
+ const jstring serviceConfigJavaStr =
+ serviceConfigStr == nullptr ? NULL : JavaStringFromManagedString(env, serviceConfigStr);
+
+ env->CallObjectMethod(
+ _jobjectActiveContext,
+ jmidSubmitContext,
+ JavaStringFromManagedString(env, contextConfigStr),
+ serviceConfigJavaStr);
+ }
+
+ 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");
+
+ if (jmidClose == NULL) {
+ ManagedLog::LOGGER->Log("jmidClose is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectActiveContext,
+ jmidClose);
+ ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::Close");
+ }
+
+ String^ ActiveContextClr2Java::GetParentId() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringParentId);
+ }
+
+ String^ ActiveContextClr2Java::GetId() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
+
+ String^ ActiveContextClr2Java::GetEvaluatorId() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringEvaluatorId);
+ }
+
+ IEvaluatorDescriptor^ ActiveContextClr2Java::GetEvaluatorDescriptor() {
+ ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::GetEvaluatorDescriptor");
+ return CommonUtilities::RetrieveEvaluatorDescriptor(_jobjectActiveContext, _jvm);
+ }
+
+ void ActiveContextClr2Java::SendMessage(array<byte>^ message) {
+ ManagedLog::LOGGER->LogStart("ActiveContextClr2Java::SendMessage");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassActiveContext = env->GetObjectClass(_jobjectActiveContext);
+ jmethodID jmidSendMessage = env->GetMethodID(jclassActiveContext, "sendMessage", "([B)V");
+
+ if (jmidSendMessage == NULL) {
+ ManagedLog::LOGGER->Log("jmidSendMessage is NULL");
+ return;
+ }
+
+ env->CallObjectMethod(
+ _jobjectActiveContext,
+ jmidSendMessage,
+ JavaByteArrayFromManagedByteArray(env, message));
+
+ ManagedLog::LOGGER->LogStop("ActiveContextClr2Java::SendMessage");
+ }
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/AllocatedEvaluatorClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/AllocatedEvaluatorClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/AllocatedEvaluatorClr2Java.cpp
index 397f536..387888c 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/AllocatedEvaluatorClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/AllocatedEvaluatorClr2Java.cpp
@@ -21,169 +21,169 @@ using namespace JavaClrBridge;
namespace Org {
namespace Apache {
- 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);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectAllocatedEvaluator, jclassAllocatedEvaluator);
-
- jmethodID jmidGetNameServerInfo = env->GetMethodID(jclassAllocatedEvaluator, "getNameServerInfo", "()Ljava/lang/String;");
- _jstringNameServerInfo = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectAllocatedEvaluator, jmidGetNameServerInfo);
-
- ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java");
- }
-
- AllocatedEvaluatorClr2Java::~AllocatedEvaluatorClr2Java() {
- this->!AllocatedEvaluatorClr2Java();
- }
-
- AllocatedEvaluatorClr2Java::!AllocatedEvaluatorClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectAllocatedEvaluator != NULL) {
- env->DeleteGlobalRef(_jobjectAllocatedEvaluator);
- }
-
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
-
- if (_jstringNameServerInfo != NULL) {
- env->DeleteGlobalRef(_jstringNameServerInfo);
- }
- }
-
- void AllocatedEvaluatorClr2Java::SubmitContext(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
-
- if (jmidSubmitContext == NULL) {
- ManagedLog::LOGGER->Log("jmidSubmitContext is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectAllocatedEvaluator,
- jmidSubmitContext,
- JavaStringFromManagedString(env, evaluatorConfigStr),
- JavaStringFromManagedString(env, contextConfigStr));
- ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContext");
- }
-
- void AllocatedEvaluatorClr2Java::SubmitContextAndTask(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
-
- if (jmidSubmitContextAndTask == NULL) {
- ManagedLog::LOGGER->Log("jmidSubmitContextAndTask is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectAllocatedEvaluator,
- jmidSubmitContextAndTask,
- JavaStringFromManagedString(env, evaluatorConfigStr),
- JavaStringFromManagedString(env, contextConfigStr),
- JavaStringFromManagedString(env, taskConfigStr));
- ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndTask");
- }
-
- void AllocatedEvaluatorClr2Java::SubmitContextAndService(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
-
- if (jmidSubmitContextAndService == NULL) {
- ManagedLog::LOGGER->Log("jmidSubmitContextAndService is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectAllocatedEvaluator,
- jmidSubmitContextAndService,
- JavaStringFromManagedString(env, evaluatorConfigStr),
- JavaStringFromManagedString(env, contextConfigStr),
- JavaStringFromManagedString(env, serviceConfigStr));
- ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndService");
- }
-
- void AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
-
- if (jmidSubmitContextAndServiceAndTask == NULL) {
- ManagedLog::LOGGER->Log("jmidSubmitContextAndServiceAndTask is NULL");
- return;
- }
- env->CallObjectMethod(
- _jobjectAllocatedEvaluator,
- jmidSubmitContextAndServiceAndTask,
- JavaStringFromManagedString(env, evaluatorConfigStr),
- 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);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectAllocatedEvaluator, jclassAllocatedEvaluator);
+
+ jmethodID jmidGetNameServerInfo = env->GetMethodID(jclassAllocatedEvaluator, "getNameServerInfo", "()Ljava/lang/String;");
+ _jstringNameServerInfo = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectAllocatedEvaluator, jmidGetNameServerInfo);
+
+ ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::AllocatedEvaluatorClr2Java");
+ }
+
+ AllocatedEvaluatorClr2Java::~AllocatedEvaluatorClr2Java() {
+ this->!AllocatedEvaluatorClr2Java();
+ }
+
+ AllocatedEvaluatorClr2Java::!AllocatedEvaluatorClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectAllocatedEvaluator != NULL) {
+ env->DeleteGlobalRef(_jobjectAllocatedEvaluator);
+ }
+
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+
+ if (_jstringNameServerInfo != NULL) {
+ env->DeleteGlobalRef(_jstringNameServerInfo);
+ }
+ }
+
+ void AllocatedEvaluatorClr2Java::SubmitContext(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
+
+ if (jmidSubmitContext == NULL) {
+ ManagedLog::LOGGER->Log("jmidSubmitContext is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectAllocatedEvaluator,
+ jmidSubmitContext,
+ JavaStringFromManagedString(env, evaluatorConfigStr),
+ JavaStringFromManagedString(env, contextConfigStr));
+ ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContext");
+ }
+
+ void AllocatedEvaluatorClr2Java::SubmitContextAndTask(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
+
+ if (jmidSubmitContextAndTask == NULL) {
+ ManagedLog::LOGGER->Log("jmidSubmitContextAndTask is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectAllocatedEvaluator,
+ jmidSubmitContextAndTask,
+ JavaStringFromManagedString(env, evaluatorConfigStr),
+ JavaStringFromManagedString(env, contextConfigStr),
+ JavaStringFromManagedString(env, taskConfigStr));
+ ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndTask");
+ }
+
+ void AllocatedEvaluatorClr2Java::SubmitContextAndService(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
+
+ if (jmidSubmitContextAndService == NULL) {
+ ManagedLog::LOGGER->Log("jmidSubmitContextAndService is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectAllocatedEvaluator,
+ jmidSubmitContextAndService,
+ JavaStringFromManagedString(env, evaluatorConfigStr),
+ JavaStringFromManagedString(env, contextConfigStr),
+ JavaStringFromManagedString(env, serviceConfigStr));
+ ManagedLog::LOGGER->LogStop("AllocatedEvaluatorClr2Java::SubmitContextAndService");
+ }
+
+ void AllocatedEvaluatorClr2Java::SubmitContextAndServiceAndTask(String^ evaluatorConfigStr, 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;Ljava/lang/String;)V");
+
+ if (jmidSubmitContextAndServiceAndTask == NULL) {
+ ManagedLog::LOGGER->Log("jmidSubmitContextAndServiceAndTask is NULL");
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectAllocatedEvaluator,
+ jmidSubmitContextAndServiceAndTask,
+ JavaStringFromManagedString(env, evaluatorConfigStr),
+ 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/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/ClosedContextClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/ClosedContextClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/ClosedContextClr2Java.cpp
index 358e5e6..7faeac6 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/ClosedContextClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/ClosedContextClr2Java.cpp
@@ -18,101 +18,101 @@
#include "Clr2JavaImpl.h"
namespace Org {
- namespace Apache {
- 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);
- }
-
- // Gets the Java closed context class to get its fields
- _jobjectClosedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectClosedContext));
- jclass jclassClosedContext = env->GetObjectClass(_jobjectClosedContext);
-
- // Gets the Context ID and Evaluator ID of the closed context from the Java closed context object.
- _jstringContextId = CommonUtilities::GetJObjectId(env, _jobjectClosedContext, jclassClosedContext);
- _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, _jobjectClosedContext, jclassClosedContext);
-
- jmethodID jmidGetParentContextMid = env->GetMethodID(
- jclassClosedContext, "getParentContextBridge", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
-
- jobject parentContext = env->CallObjectMethod(_jobjectClosedContext, jmidGetParentContextMid);
-
- _parentContext = gcnew ActiveContextClr2Java(env, parentContext);
-
- ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::ClosedContextClr2Java");
- }
-
- ClosedContextClr2Java::~ClosedContextClr2Java() {
- this->!ClosedContextClr2Java();
- }
-
- ClosedContextClr2Java::!ClosedContextClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectClosedContext != NULL) {
- env->DeleteGlobalRef(_jobjectClosedContext);
- }
-
- if (_jstringContextId != NULL) {
- env->DeleteGlobalRef(_jstringContextId);
- }
-
- if (_jstringEvaluatorId != NULL) {
- env->DeleteGlobalRef(_jstringEvaluatorId);
- }
- }
-
- /**
- * Gets the Parent context of the closed context through a JNI call to Java.
- */
- IActiveContextClr2Java^ ClosedContextClr2Java::GetParentContext() {
- return _parentContext;
- }
-
- /**
- * Gets the ID of the closed context from Java.
- */
- String^ ClosedContextClr2Java::GetId() {
- ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringContextId);
- }
-
- /**
- * Gets the Evaluator ID of the Evaluator on which the Closed Context was active.
- */
- String^ ClosedContextClr2Java::GetEvaluatorId() {
- ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetEvaluatorId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringEvaluatorId);
- }
-
- /**
- * Gets the EvaluatorDescriptor of the Evaluator on which the Closed Context was active.
- */
- 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);
- }
- }
- }
+ namespace Apache {
+ 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);
+ }
+
+ // Gets the Java closed context class to get its fields
+ _jobjectClosedContext = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectClosedContext));
+ jclass jclassClosedContext = env->GetObjectClass(_jobjectClosedContext);
+
+ // Gets the Context ID and Evaluator ID of the closed context from the Java closed context object.
+ _jstringContextId = CommonUtilities::GetJObjectId(env, _jobjectClosedContext, jclassClosedContext);
+ _jstringEvaluatorId = CommonUtilities::GetJObjectEvaluatorId(env, _jobjectClosedContext, jclassClosedContext);
+
+ jmethodID jmidGetParentContextMid = env->GetMethodID(
+ jclassClosedContext, "getParentContextBridge", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+
+ jobject parentContext = env->CallObjectMethod(_jobjectClosedContext, jmidGetParentContextMid);
+
+ _parentContext = gcnew ActiveContextClr2Java(env, parentContext);
+
+ ManagedLog::LOGGER->LogStop("ClosedContextClr2Java::ClosedContextClr2Java");
}
+
+ ClosedContextClr2Java::~ClosedContextClr2Java() {
+ this->!ClosedContextClr2Java();
+ }
+
+ ClosedContextClr2Java::!ClosedContextClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectClosedContext != NULL) {
+ env->DeleteGlobalRef(_jobjectClosedContext);
+ }
+
+ if (_jstringContextId != NULL) {
+ env->DeleteGlobalRef(_jstringContextId);
+ }
+
+ if (_jstringEvaluatorId != NULL) {
+ env->DeleteGlobalRef(_jstringEvaluatorId);
+ }
+ }
+
+ /**
+ * Gets the Parent context of the closed context through a JNI call to Java.
+ */
+ IActiveContextClr2Java^ ClosedContextClr2Java::GetParentContext() {
+ return _parentContext;
+ }
+
+ /**
+ * Gets the ID of the closed context from Java.
+ */
+ String^ ClosedContextClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringContextId);
+ }
+
+ /**
+ * Gets the Evaluator ID of the Evaluator on which the Closed Context was active.
+ */
+ String^ ClosedContextClr2Java::GetEvaluatorId() {
+ ManagedLog::LOGGER->Log("ClosedContextClr2Java::GetEvaluatorId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringEvaluatorId);
+ }
+
+ /**
+ * Gets the EvaluatorDescriptor of the Evaluator on which the Closed Context was active.
+ */
+ 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);
+ }
+ }
}
+ }
}
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp b/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
index 2a206f4..677e901 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
@@ -18,37 +18,37 @@
#include "Clr2JavaImpl.h"
namespace Org {
- namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>CommonUtilities");
- };
+ namespace Apache {
+ 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, "getEvaluatorDescriptorString", "()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, "getEvaluatorDescriptorString", "()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/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/CompletedEvaluatorClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/CompletedEvaluatorClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/CompletedEvaluatorClr2Java.cpp
index 68732d4..3e70a63 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/CompletedEvaluatorClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/CompletedEvaluatorClr2Java.cpp
@@ -19,57 +19,57 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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);
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectCompletedEvaluator, jclassCompletedEvaluator);
- ManagedLog::LOGGER->LogStop("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java");
- }
+ jclass jclassCompletedEvaluator = env->GetObjectClass(_jobjectCompletedEvaluator);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectCompletedEvaluator, jclassCompletedEvaluator);
+ ManagedLog::LOGGER->LogStop("CompletedEvaluatorClr2Java::CompletedEvaluatorClr2Java");
+ }
- CompletedEvaluatorClr2Java::~CompletedEvaluatorClr2Java() {
- this->!CompletedEvaluatorClr2Java();
- }
+ CompletedEvaluatorClr2Java::~CompletedEvaluatorClr2Java() {
+ this->!CompletedEvaluatorClr2Java();
+ }
- CompletedEvaluatorClr2Java::!CompletedEvaluatorClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectCompletedEvaluator != NULL) {
- env->DeleteGlobalRef(_jobjectCompletedEvaluator);
- }
+ CompletedEvaluatorClr2Java::!CompletedEvaluatorClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectCompletedEvaluator != NULL) {
+ env->DeleteGlobalRef(_jobjectCompletedEvaluator);
+ }
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
- }
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+ }
- 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/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/CompletedTaskClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/CompletedTaskClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/CompletedTaskClr2Java.cpp
index c5fada1..33d1b9b 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/CompletedTaskClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/CompletedTaskClr2Java.cpp
@@ -19,83 +19,83 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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);
- jmethodID jmidGetTaskId = env->GetMethodID(jclassCompletedTask, "getTaskId", "()Ljava/lang/String;");
- _jstringId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectCompletedTask, jmidGetTaskId);
- ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::CompletedTaskClr2Java");
- }
+ jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask);
+ jmethodID jmidGetTaskId = env->GetMethodID(jclassCompletedTask, "getTaskId", "()Ljava/lang/String;");
+ _jstringId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectCompletedTask, jmidGetTaskId);
+ ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::CompletedTaskClr2Java");
+ }
- CompletedTaskClr2Java::~CompletedTaskClr2Java(){
- this->!CompletedTaskClr2Java();
- }
+ CompletedTaskClr2Java::~CompletedTaskClr2Java(){
+ this->!CompletedTaskClr2Java();
+ }
- CompletedTaskClr2Java::!CompletedTaskClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectCompletedTask != NULL) {
- env->DeleteGlobalRef(_jobjectCompletedTask);
- }
+ CompletedTaskClr2Java::!CompletedTaskClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectCompletedTask != NULL) {
+ env->DeleteGlobalRef(_jobjectCompletedTask);
+ }
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
- }
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
+ }
- 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);
- jmethodID jmidGetActiveContext = env->GetMethodID(jclassCompletedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
- jobject jobjectActiveContext = env->CallObjectMethod(_jobjectCompletedTask, jmidGetActiveContext);
- ManagedLog::LOGGER->LogStop("CompletedTaskClr2Java::GetActiveContext");
- return gcnew ActiveContextClr2Java(env, jobjectActiveContext);
- }
+ jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask);
+ jmethodID jmidGetActiveContext = env->GetMethodID(jclassCompletedTask, "getActiveContext", "()Lorg/apache/reef/javabridge/ActiveContextBridge;");
+ jobject jobjectActiveContext = env->CallObjectMethod(_jobjectCompletedTask, jmidGetActiveContext);
+ 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);
+ }
- array<byte>^ CompletedTaskClr2Java::Get() {
- ManagedLog::LOGGER->Log("CompletedTaskClr2Java::GetMessage");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask);
- jmethodID jmidGet = env->GetMethodID(jclassCompletedTask, "get", "()[B");
+ array<byte>^ CompletedTaskClr2Java::Get() {
+ ManagedLog::LOGGER->Log("CompletedTaskClr2Java::GetMessage");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassCompletedTask = env->GetObjectClass(_jobjectCompletedTask);
+ jmethodID jmidGet = env->GetMethodID(jclassCompletedTask, "get", "()[B");
- if (jmidGet == NULL) {
- ManagedLog::LOGGER->Log("jmidGet is NULL");
- return nullptr;
- }
- jbyteArray jMessage = (jbyteArray)env->CallObjectMethod(_jobjectCompletedTask, jmidGet);
- return ManagedByteArrayFromJavaByteArray(env, jMessage);
- }
- }
- }
- }
- }
+ if (jmidGet == NULL) {
+ ManagedLog::LOGGER->Log("jmidGet is NULL");
+ return nullptr;
+ }
+ jbyteArray jMessage = (jbyteArray)env->CallObjectMethod(_jobjectCompletedTask, jmidGet);
+ return ManagedByteArrayFromJavaByteArray(env, jMessage);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/ContextMessageClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/ContextMessageClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/ContextMessageClr2Java.cpp
index 5eff952..33f928e 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/ContextMessageClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/ContextMessageClr2Java.cpp
@@ -19,82 +19,82 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
- ContextMessageClr2Java::ContextMessageClr2Java(JNIEnv *env, jobject jobjectContextMessage) {
- ManagedLog::LOGGER->LogStart("ContextMessageClr2Java::ContextMessageClr2Java");
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
+ ContextMessageClr2Java::ContextMessageClr2Java(JNIEnv *env, jobject jobjectContextMessage) {
+ ManagedLog::LOGGER->LogStart("ContextMessageClr2Java::ContextMessageClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectContextMessage = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectContextMessage));
- jclass jclassContextMessage = env->GetObjectClass(_jobjectContextMessage);
- jmethodID jmidGetSourceId = env->GetMethodID(jclassContextMessage, "getMessageSourceID", "()Ljava/lang/String;");
- jmethodID jmidGetMessage = env->GetMethodID(jclassContextMessage, "get", "()[B");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectContextMessage = reinterpret_cast<jobject>(env->NewGlobalRef(jobjectContextMessage));
+ jclass jclassContextMessage = env->GetObjectClass(_jobjectContextMessage);
+ jmethodID jmidGetSourceId = env->GetMethodID(jclassContextMessage, "getMessageSourceID", "()Ljava/lang/String;");
+ jmethodID jmidGetMessage = env->GetMethodID(jclassContextMessage, "get", "()[B");
- _jstringId = CommonUtilities::GetJObjectId(env, _jobjectContextMessage, jclassContextMessage);
- _jstringSourceId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectContextMessage, jmidGetSourceId);
- _jarrayMessage = CommonUtilities::CallGetMethodNewGlobalRef<jbyteArray>(env, _jobjectContextMessage, jmidGetMessage);
+ _jstringId = CommonUtilities::GetJObjectId(env, _jobjectContextMessage, jclassContextMessage);
+ _jstringSourceId = CommonUtilities::CallGetMethodNewGlobalRef<jstring>(env, _jobjectContextMessage, jmidGetSourceId);
+ _jarrayMessage = CommonUtilities::CallGetMethodNewGlobalRef<jbyteArray>(env, _jobjectContextMessage, jmidGetMessage);
- ManagedLog::LOGGER->LogStop("ContextMessageClr2Java::ContextMessageClr2Java");
- }
+ ManagedLog::LOGGER->LogStop("ContextMessageClr2Java::ContextMessageClr2Java");
+ }
- ContextMessageClr2Java::~ContextMessageClr2Java() {
- this->!ContextMessageClr2Java();
- }
+ ContextMessageClr2Java::~ContextMessageClr2Java() {
+ this->!ContextMessageClr2Java();
+ }
- ContextMessageClr2Java::!ContextMessageClr2Java() {
- JNIEnv *env = RetrieveEnv(_jvm);
- if (_jobjectContextMessage != NULL) {
- env->DeleteGlobalRef(_jobjectContextMessage);
- }
+ ContextMessageClr2Java::!ContextMessageClr2Java() {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ if (_jobjectContextMessage != NULL) {
+ env->DeleteGlobalRef(_jobjectContextMessage);
+ }
- if (_jstringId != NULL) {
- env->DeleteGlobalRef(_jstringId);
- }
+ if (_jstringId != NULL) {
+ env->DeleteGlobalRef(_jstringId);
+ }
- if (_jstringSourceId != NULL) {
- env->DeleteGlobalRef(_jstringSourceId);
- }
+ if (_jstringSourceId != NULL) {
+ env->DeleteGlobalRef(_jstringSourceId);
+ }
- if (_jarrayMessage != NULL) {
- env->DeleteGlobalRef(_jarrayMessage);
- }
- }
+ if (_jarrayMessage != NULL) {
+ env->DeleteGlobalRef(_jarrayMessage);
+ }
+ }
- String^ ContextMessageClr2Java::GetId() {
- ManagedLog::LOGGER->Log("ContextMessageClr2Java::GetId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringId);
- }
+ String^ ContextMessageClr2Java::GetId() {
+ ManagedLog::LOGGER->Log("ContextMessageClr2Java::GetId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringId);
+ }
- String^ ContextMessageClr2Java::GetMessageSourceId() {
- ManagedLog::LOGGER->Log("ContextMessageClr2Java::GetMessageSourceId");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedStringFromJavaString(env, _jstringSourceId);
- }
+ String^ ContextMessageClr2Java::GetMessageSourceId() {
+ ManagedLog::LOGGER->Log("ContextMessageClr2Java::GetMessageSourceId");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedStringFromJavaString(env, _jstringSourceId);
+ }
- array<byte>^ ContextMessageClr2Java::Get() {
- ManagedLog::LOGGER->Log("ContextMessageClr2Java::Get");
- JNIEnv *env = RetrieveEnv(_jvm);
- return ManagedByteArrayFromJavaByteArray(env, _jarrayMessage);
- }
+ array<byte>^ ContextMessageClr2Java::Get() {
+ ManagedLog::LOGGER->Log("ContextMessageClr2Java::Get");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ return ManagedByteArrayFromJavaByteArray(env, _jarrayMessage);
+ }
- void ContextMessageClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("ContextMessageClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectContextMessage);
- }
- }
- }
- }
- }
+ void ContextMessageClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("ContextMessageClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectContextMessage);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/DriverRestartCompletedClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/DriverRestartCompletedClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/DriverRestartCompletedClr2Java.cpp
index 94612ba..9e72be7 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/DriverRestartCompletedClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/DriverRestartCompletedClr2Java.cpp
@@ -18,61 +18,61 @@
#include "Clr2JavaImpl.h"
namespace Org {
- namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
+ namespace Apache {
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
- DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java(JNIEnv *env, jobject jdriverRestartCompleted) {
- ManagedLog::LOGGER->LogStart("DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectDriverRestartCompleted = reinterpret_cast<jobject>(env->NewGlobalRef(jdriverRestartCompleted));
+ DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java(JNIEnv *env, jobject jdriverRestartCompleted) {
+ ManagedLog::LOGGER->LogStart("DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectDriverRestartCompleted = reinterpret_cast<jobject>(env->NewGlobalRef(jdriverRestartCompleted));
- jclass jclassDriverRestartCompleted = env->GetObjectClass(_jobjectDriverRestartCompleted);
- jmethodID jmidIsTimedOut = env->GetMethodID(jclassDriverRestartCompleted, "isTimedOut", "()Z");
+ jclass jclassDriverRestartCompleted = env->GetObjectClass(_jobjectDriverRestartCompleted);
+ jmethodID jmidIsTimedOut = env->GetMethodID(jclassDriverRestartCompleted, "isTimedOut", "()Z");
- jboolean jisTimedOut = env->CallBooleanMethod(_jobjectDriverRestartCompleted, jmidIsTimedOut);
- _restartCompletedTime = System::DateTime::Now;
- _isTimedOut = ClrBoolFromJavaBoolean(env, jisTimedOut);
+ jboolean jisTimedOut = env->CallBooleanMethod(_jobjectDriverRestartCompleted, jmidIsTimedOut);
+ _restartCompletedTime = System::DateTime::Now;
+ _isTimedOut = ClrBoolFromJavaBoolean(env, jisTimedOut);
- ManagedLog::LOGGER->LogStop("DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java");
- }
+ ManagedLog::LOGGER->LogStop("DriverRestartCompletedClr2Java::DriverRestartCompletedClr2Java");
+ }
- DriverRestartCompletedClr2Java::~DriverRestartCompletedClr2Java() {
- this->!DriverRestartCompletedClr2Java();
- }
+ DriverRestartCompletedClr2Java::~DriverRestartCompletedClr2Java() {
+ this->!DriverRestartCompletedClr2Java();
+ }
- DriverRestartCompletedClr2Java::!DriverRestartCompletedClr2Java() {
- if (_jobjectDriverRestartCompleted != NULL) {
- JNIEnv *env = RetrieveEnv(_jvm);
- env->DeleteGlobalRef(_jobjectDriverRestartCompleted);
- }
- }
+ DriverRestartCompletedClr2Java::!DriverRestartCompletedClr2Java() {
+ if (_jobjectDriverRestartCompleted != NULL) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ env->DeleteGlobalRef(_jobjectDriverRestartCompleted);
+ }
+ }
- bool DriverRestartCompletedClr2Java::IsTimedOut() {
- return _isTimedOut;
- }
+ bool DriverRestartCompletedClr2Java::IsTimedOut() {
+ return _isTimedOut;
+ }
- DateTime DriverRestartCompletedClr2Java::GetCompletedTime() {
- return _restartCompletedTime;
- }
+ DateTime DriverRestartCompletedClr2Java::GetCompletedTime() {
+ return _restartCompletedTime;
+ }
- void DriverRestartCompletedClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("DriverRestartCompletedClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectDriverRestartCompleted);
- }
- }
- }
- }
- }
- }
+ void DriverRestartCompletedClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("DriverRestartCompletedClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectDriverRestartCompleted);
+ }
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/DriverRestartedClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/DriverRestartedClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/DriverRestartedClr2Java.cpp
index e1228c3..21e8e13 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/DriverRestartedClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/DriverRestartedClr2Java.cpp
@@ -18,75 +18,75 @@
#include "Clr2JavaImpl.h"
namespace Org {
- namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- ref class ManagedLog {
- internal:
- static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
- };
+ namespace Apache {
+ namespace REEF {
+ namespace Driver {
+ namespace Bridge {
+ namespace Clr2java {
+ ref class ManagedLog {
+ internal:
+ static BridgeLogger^ LOGGER = BridgeLogger::GetLogger("<C++>");
+ };
- DriverRestartedClr2Java::DriverRestartedClr2Java(JNIEnv *env, jobject jdriverRestarted) {
- ManagedLog::LOGGER->LogStart("DriverRestartedClr2Java::DriverRestartedClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectDriverRestarted = reinterpret_cast<jobject>(env->NewGlobalRef(jdriverRestarted));
+ DriverRestartedClr2Java::DriverRestartedClr2Java(JNIEnv *env, jobject jdriverRestarted) {
+ ManagedLog::LOGGER->LogStart("DriverRestartedClr2Java::DriverRestartedClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectDriverRestarted = reinterpret_cast<jobject>(env->NewGlobalRef(jdriverRestarted));
- jclass jclassDriverRestarted = env->GetObjectClass(_jobjectDriverRestarted);
- jmethodID jmidGetExpectedEvaluatorIds = env->GetMethodID(jclassDriverRestarted, "getExpectedEvaluatorIds", "()[Ljava/lang/String;");
- jmethodID jmidGetResubmissionAttempts = env->GetMethodID(jclassDriverRestarted, "getResubmissionAttempts", "()I");
+ jclass jclassDriverRestarted = env->GetObjectClass(_jobjectDriverRestarted);
+ jmethodID jmidGetExpectedEvaluatorIds = env->GetMethodID(jclassDriverRestarted, "getExpectedEvaluatorIds", "()[Ljava/lang/String;");
+ jmethodID jmidGetResubmissionAttempts = env->GetMethodID(jclassDriverRestarted, "getResubmissionAttempts", "()I");
- _resubmissionAttempts = env->CallIntMethod(_jobjectDriverRestarted, jmidGetResubmissionAttempts);
- jobjectArray jevaluatorIds = CommonUtilities::CallGetMethodNewGlobalRef<jobjectArray>(env, _jobjectDriverRestarted, jmidGetExpectedEvaluatorIds);
- _startTime = System::DateTime::Now;
- int count = env->GetArrayLength(jevaluatorIds);
- _expectedEvaluatorIds = gcnew array<String^>(count);
+ _resubmissionAttempts = env->CallIntMethod(_jobjectDriverRestarted, jmidGetResubmissionAttempts);
+ jobjectArray jevaluatorIds = CommonUtilities::CallGetMethodNewGlobalRef<jobjectArray>(env, _jobjectDriverRestarted, jmidGetExpectedEvaluatorIds);
+ _startTime = System::DateTime::Now;
+ int count = env->GetArrayLength(jevaluatorIds);
+ _expectedEvaluatorIds = gcnew array<String^>(count);
- for (int i = 0; i < count; i++) {
- jstring string = (jstring)(*env).GetObjectArrayElement(jevaluatorIds, i);
- _expectedEvaluatorIds[i] = ManagedStringFromJavaString(env, string);
- }
+ for (int i = 0; i < count; i++) {
+ jstring string = (jstring)(*env).GetObjectArrayElement(jevaluatorIds, i);
+ _expectedEvaluatorIds[i] = ManagedStringFromJavaString(env, string);
+ }
- env->DeleteGlobalRef(jevaluatorIds);
+ env->DeleteGlobalRef(jevaluatorIds);
- ManagedLog::LOGGER->LogStop("DriverRestartedClr2Java::DriverRestartedClr2Java");
- }
+ ManagedLog::LOGGER->LogStop("DriverRestartedClr2Java::DriverRestartedClr2Java");
+ }
- DriverRestartedClr2Java::~DriverRestartedClr2Java() {
- this->!DriverRestartedClr2Java();
- }
+ DriverRestartedClr2Java::~DriverRestartedClr2Java() {
+ this->!DriverRestartedClr2Java();
+ }
- DriverRestartedClr2Java::!DriverRestartedClr2Java() {
- if (_jobjectDriverRestarted != NULL) {
- JNIEnv *env = RetrieveEnv(_jvm);
- env->DeleteGlobalRef(_jobjectDriverRestarted);
- }
- }
+ DriverRestartedClr2Java::!DriverRestartedClr2Java() {
+ if (_jobjectDriverRestarted != NULL) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ env->DeleteGlobalRef(_jobjectDriverRestarted);
+ }
+ }
- array<String^>^ DriverRestartedClr2Java::GetExpectedEvaluatorIds() {
- return _expectedEvaluatorIds;
- }
+ array<String^>^ DriverRestartedClr2Java::GetExpectedEvaluatorIds() {
+ return _expectedEvaluatorIds;
+ }
- DateTime DriverRestartedClr2Java::GetStartTime() {
- return _startTime;
- }
+ DateTime DriverRestartedClr2Java::GetStartTime() {
+ return _startTime;
+ }
- int DriverRestartedClr2Java::GetResubmissionAttempts() {
- return _resubmissionAttempts;
- }
+ int DriverRestartedClr2Java::GetResubmissionAttempts() {
+ return _resubmissionAttempts;
+ }
- void DriverRestartedClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("DriverRestartedClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectDriverRestarted);
- }
- }
- }
- }
- }
- }
+ void DriverRestartedClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("DriverRestartedClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectDriverRestarted);
+ }
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/8557f0f2/lang/cs/Org.Apache.REEF.Bridge/EvaluatorRequestorClr2Java.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/EvaluatorRequestorClr2Java.cpp b/lang/cs/Org.Apache.REEF.Bridge/EvaluatorRequestorClr2Java.cpp
index 0a4df03..7616c2c 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/EvaluatorRequestorClr2Java.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/EvaluatorRequestorClr2Java.cpp
@@ -19,86 +19,86 @@
namespace Org {
namespace Apache {
- namespace REEF {
- namespace Driver {
- namespace Bridge {
- namespace Clr2java {
- 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++>");
+ };
- EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java(JNIEnv *env, jobject jevaluatorRequestor) {
- ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java");
- pin_ptr<JavaVM*> pJavaVm = &_jvm;
- if (env->GetJavaVM(pJavaVm) != 0) {
- ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
- }
- _jobjectEvaluatorRequestor = reinterpret_cast<jobject>(env->NewGlobalRef(jevaluatorRequestor));
- ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java");
- }
+ EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java(JNIEnv *env, jobject jevaluatorRequestor) {
+ ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java");
+ pin_ptr<JavaVM*> pJavaVm = &_jvm;
+ if (env->GetJavaVM(pJavaVm) != 0) {
+ ManagedLog::LOGGER->LogError("Failed to get JavaVM", nullptr);
+ }
+ _jobjectEvaluatorRequestor = reinterpret_cast<jobject>(env->NewGlobalRef(jevaluatorRequestor));
+ ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::EvaluatorRequestorClr2Java");
+ }
- EvaluatorRequestorClr2Java::~EvaluatorRequestorClr2Java() {
- this->!EvaluatorRequestorClr2Java();
- }
+ EvaluatorRequestorClr2Java::~EvaluatorRequestorClr2Java() {
+ this->!EvaluatorRequestorClr2Java();
+ }
- EvaluatorRequestorClr2Java::!EvaluatorRequestorClr2Java() {
- if (_jobjectEvaluatorRequestor != NULL) {
- JNIEnv *env = RetrieveEnv(_jvm);
- env->DeleteGlobalRef(_jobjectEvaluatorRequestor);
- }
- }
+ EvaluatorRequestorClr2Java::!EvaluatorRequestorClr2Java() {
+ if (_jobjectEvaluatorRequestor != NULL) {
+ JNIEnv *env = RetrieveEnv(_jvm);
+ env->DeleteGlobalRef(_jobjectEvaluatorRequestor);
+ }
+ }
- void EvaluatorRequestorClr2Java::Submit(IEvaluatorRequest^ request) {
- ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::Submit");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassEvaluatorRequestor = env->GetObjectClass(_jobjectEvaluatorRequestor);
- jmethodID jmidSubmit = env->GetMethodID(jclassEvaluatorRequestor, "submit", "(IIILjava/lang/String;Ljava/lang/String;)V");
+ void EvaluatorRequestorClr2Java::Submit(IEvaluatorRequest^ request) {
+ ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::Submit");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassEvaluatorRequestor = env->GetObjectClass(_jobjectEvaluatorRequestor);
+ jmethodID jmidSubmit = env->GetMethodID(jclassEvaluatorRequestor, "submit", "(IIILjava/lang/String;Ljava/lang/String;)V");
- if (jmidSubmit == NULL) {
- fprintf(stdout, " jmidSubmit is NULL\n");
- fflush(stdout);
- return;
- }
- env->CallObjectMethod(
- _jobjectEvaluatorRequestor,
- jmidSubmit,
- request->Number,
- request->MemoryMegaBytes,
- request->VirtualCore,
- JavaStringFromManagedString(env, request->Rack),
- JavaStringFromManagedString(env, request->RuntimeName));
- ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::Submit");
- }
+ if (jmidSubmit == NULL) {
+ fprintf(stdout, " jmidSubmit is NULL\n");
+ fflush(stdout);
+ return;
+ }
+ env->CallObjectMethod(
+ _jobjectEvaluatorRequestor,
+ jmidSubmit,
+ request->Number,
+ request->MemoryMegaBytes,
+ request->VirtualCore,
+ JavaStringFromManagedString(env, request->Rack),
+ JavaStringFromManagedString(env, request->RuntimeName));
+ ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::Submit");
+ }
- array<byte>^ EvaluatorRequestorClr2Java::GetDefinedRuntimes() {
- ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::GetDefinedRuntimes");
- JNIEnv *env = RetrieveEnv(_jvm);
- jclass jclassEvaluatorRequestor = env->GetObjectClass(_jobjectEvaluatorRequestor);
- jmethodID jmidGetDefinedRuntimes = env->GetMethodID(jclassEvaluatorRequestor, "getDefinedRuntimes", "()[B");
+ array<byte>^ EvaluatorRequestorClr2Java::GetDefinedRuntimes() {
+ ManagedLog::LOGGER->LogStart("EvaluatorRequestorClr2Java::GetDefinedRuntimes");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ jclass jclassEvaluatorRequestor = env->GetObjectClass(_jobjectEvaluatorRequestor);
+ jmethodID jmidGetDefinedRuntimes = env->GetMethodID(jclassEvaluatorRequestor, "getDefinedRuntimes", "()[B");
- if (jmidGetDefinedRuntimes == NULL) {
- fprintf(stdout, " jmidGetDefinedRuntimes is NULL\n");
- fflush(stdout);
- return nullptr;
- }
+ if (jmidGetDefinedRuntimes == NULL) {
+ fprintf(stdout, " jmidGetDefinedRuntimes is NULL\n");
+ fflush(stdout);
+ return nullptr;
+ }
- jbyteArray jBytes = (jbyteArray)env->CallObjectMethod(
- _jobjectEvaluatorRequestor,
- jmidGetDefinedRuntimes);
+ jbyteArray jBytes = (jbyteArray)env->CallObjectMethod(
+ _jobjectEvaluatorRequestor,
+ jmidGetDefinedRuntimes);
- ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::GetDefinedRuntimes");
- return ManagedByteArrayFromJavaByteArray(env, jBytes);
- }
+ ManagedLog::LOGGER->LogStop("EvaluatorRequestorClr2Java::GetDefinedRuntimes");
+ return ManagedByteArrayFromJavaByteArray(env, jBytes);
+ }
- void EvaluatorRequestorClr2Java::OnError(String^ message) {
- ManagedLog::LOGGER->Log("EvaluatorRequestorClr2Java::OnError");
- JNIEnv *env = RetrieveEnv(_jvm);
- HandleClr2JavaError(env, message, _jobjectEvaluatorRequestor);
- }
- }
- }
- }
- }
+ void EvaluatorRequestorClr2Java::OnError(String^ message) {
+ ManagedLog::LOGGER->Log("EvaluatorRequestorClr2Java::OnError");
+ JNIEnv *env = RetrieveEnv(_jvm);
+ HandleClr2JavaError(env, message, _jobjectEvaluatorRequestor);
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file