You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by se...@apache.org on 2014/12/08 22:40:26 UTC

incubator-reef git commit: Passing HttpServer port number over the bridge. It contains the changes on ClrBridge, JobDriver and Driver.dll as ClrSystemHandlerWrapper is changed Closes #30 This checkin resolves issue #REEF-51 Author: Julia Wang
Repository: incubator-reef
Updated Branches:
  refs/heads/master f87b96ec3 -> 7c2cf6fa1


Passing HttpServer port number over the bridge. It contains the changes on ClrBridge, JobDriver and Driver.dll as ClrSystemHandlerWrapper is changed
Closes #30
This checkin resolves issue #REEF-51
Author:    Julia Wang <jw...@yahoo.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/7c2cf6fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/7c2cf6fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/7c2cf6fa

Branch: refs/heads/master
Commit: 7c2cf6fa1d65db256f1cad5b6f6dd50fc37fd729
Parents: f87b96e
Author: Julia Wang <jw...@yahoo.com>
Authored: Tue Dec 2 19:15:17 2014 -0800
Committer: Beysim Sezgin <be...@microsoft.com>
Committed: Mon Dec 8 13:36:05 2014 -0800

----------------------------------------------------------------------
 .../externals/Microsoft.Reef.Driver.dll         | Bin 116736 -> 123392 bytes
 .../CppBridge/JavaClrBridge/JavaClrBridge.cpp   |   9 +++++++--
 .../apache/reef/javabridge/NativeInterop.java   |   2 +-
 .../reef/javabridge/generic/JobDriver.java      |   4 ++--
 .../wake/test/remote/RemoteManagerTest.java     |   4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7c2cf6fa/reef-bridge-project/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Microsoft.Reef.Driver.dll
----------------------------------------------------------------------
diff --git a/reef-bridge-project/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Microsoft.Reef.Driver.dll b/reef-bridge-project/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Microsoft.Reef.Driver.dll
index ee4bbca..d95a8c7 100644
Binary files a/reef-bridge-project/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Microsoft.Reef.Driver.dll and b/reef-bridge-project/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/Microsoft.Reef.Driver.dll differ

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7c2cf6fa/reef-bridge-project/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/JavaClrBridge.cpp
----------------------------------------------------------------------
diff --git a/reef-bridge-project/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/JavaClrBridge.cpp b/reef-bridge-project/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/JavaClrBridge.cpp
index dd81b3c..0a9353d 100644
--- a/reef-bridge-project/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/JavaClrBridge.cpp
+++ b/reef-bridge-project/reef-bridge-clr/src/main/Cpp/CppBridge/JavaClrBridge/JavaClrBridge.cpp
@@ -100,14 +100,19 @@ JNIEXPORT void JNICALL Java_org_apache_reef_javabridge_NativeInterop_loadClrAsse
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT jlongArray JNICALL Java_org_apache_reef_javabridge_NativeInterop_CallClrSystemOnStartHandler
-(JNIEnv * env, jclass jclassx, jstring dateTimeString) {
+(JNIEnv * env, jclass jclassx, jstring dateTimeString, jstring httpServerPort) {
   try {
     ManagedLog::LOGGER->Log("+Java_org_apache_reef_javabridge_NativeInterop_CallClrSystemOnStartHandler");
     const wchar_t* charConfig = UnicodeCppStringFromJavaString (env, dateTimeString);
     int lenConfig = env->GetStringLength(dateTimeString);
     String^  strConfig = Marshal::PtrToStringUni((IntPtr)(unsigned short*) charConfig, lenConfig);
     DateTime dt = DateTime::Now;
-    array<unsigned long long>^ handlers = ClrSystemHandlerWrapper::Call_ClrSystemStartHandler_OnStart(dt);
+
+	const wchar_t* charPort = UnicodeCppStringFromJavaString (env, httpServerPort);
+    int lenPort = env->GetStringLength(httpServerPort);
+    String^  strPort = Marshal::PtrToStringUni((IntPtr)(unsigned short*) charPort, lenPort);
+
+    array<unsigned long long>^ handlers = ClrSystemHandlerWrapper::Call_ClrSystemStartHandler_OnStart(dt, strPort);
     return JavaLongArrayFromManagedLongArray(env, handlers);
   }
   catch (System::Exception^ ex) {

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7c2cf6fa/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/NativeInterop.java
----------------------------------------------------------------------
diff --git a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/NativeInterop.java b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/NativeInterop.java
index 585e6aa..5d99a3c 100644
--- a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/NativeInterop.java
+++ b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/NativeInterop.java
@@ -89,7 +89,7 @@ public class NativeInterop {
 
   public static native void ClrBufferedLog(int level, String message);
 
-  public static native long[] CallClrSystemOnStartHandler(String dateTime);
+  public static native long[] CallClrSystemOnStartHandler(String dateTime, String httpServerPortNumber);
 
   public static native void ClrSystemAllocatedEvaluatorHandlerOnNext(
       long handle,

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7c2cf6fa/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
----------------------------------------------------------------------
diff --git a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
index 1022b51..adea40f 100644
--- a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
+++ b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
@@ -160,7 +160,8 @@ public final class JobDriver {
       }
 
       LOG.log(Level.INFO, "StartTime: {0}", new Object[]{startTime});
-      long[] handlers = NativeInterop.CallClrSystemOnStartHandler(startTime.toString());
+      String portNumber = httpServer == null ? null : Integer.toString((httpServer.getPort()));
+      long[] handlers = NativeInterop.CallClrSystemOnStartHandler(startTime.toString(), portNumber);
       if (handlers != null) {
         if (handlers.length != NativeInterop.nHandlers) {
           throw new RuntimeException(
@@ -684,7 +685,6 @@ public final class JobDriver {
     }
   }
 
-
   /**
    * Receive notification that a ContextMessage has been received
    */

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/7c2cf6fa/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
----------------------------------------------------------------------
diff --git a/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java b/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
index 36102bf..7e98229 100644
--- a/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
+++ b/reef-wake/wake/src/test/java/org/apache/reef/wake/test/remote/RemoteManagerTest.java
@@ -104,7 +104,7 @@ public class RemoteManagerTest {
     ExecutorService smExecutor = Executors.newFixedThreadPool(1);
     ExecutorService rmExecutor = Executors.newFixedThreadPool(1);
 
-    RemoteManager sendingManager = getTestRemoteManager("sender", 9000, 3, 2000);
+    RemoteManager sendingManager = getTestRemoteManager("sender", 9020, 3, 2000);
 
     Future<Integer> smFuture = smExecutor.submit(new SendingRemoteManagerThread(sendingManager, 9010, 20000));
     Thread.sleep(1000);
@@ -129,7 +129,7 @@ public class RemoteManagerTest {
     ExecutorService rmExecutor = Executors.newFixedThreadPool(1);
     ArrayList<Future<Integer>> smFutures = new ArrayList<Future<Integer>>(numOfSenderThreads);
 
-    RemoteManager sendingManager = getTestRemoteManager("sender", 9000, 3, 5000);
+    RemoteManager sendingManager = getTestRemoteManager("sender", 9030, 3, 5000);
 
     for (int i = 0; i < numOfSenderThreads; i++) {
       smFutures.add(smExecutor.submit(new SendingRemoteManagerThread(sendingManager, 9010, 20000)));