X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffb152ddb9e70873da098de4577e64a2595f4697..c0164fce5ac7eb8737258e5bde6d34c956283282:/src/bindings/java/org/simgrid/msg/Comm.java

diff --git a/src/bindings/java/org/simgrid/msg/Comm.java b/src/bindings/java/org/simgrid/msg/Comm.java
index ebe63fc16a..2338380dcc 100644
--- a/src/bindings/java/org/simgrid/msg/Comm.java
+++ b/src/bindings/java/org/simgrid/msg/Comm.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,32 +6,21 @@
 
 package org.simgrid.msg;
 
-/**
- * Communication action, representing an ongoing communication
- * between processes.
- */
+/** Communication action, representing an ongoing communication between processes. */
 public class Comm {
-	/**
-	 * Indicates if the communication is a receiving communication
-	 */
+	/** Indicates if the communication is a receiving communication */
 	protected boolean receiving;
-	/**
-	 * Indicates if the communication is finished
-	 */
+	/** Indicates if the communication is finished */
 	protected boolean finished = false;
 	/**
 	 * Represents the bind between the java comm and the
-	 * native C comm. You must never access it, since it is 
+	 * native C comm. You must never access it, since it is
 	 * automatically set.
 	 */
 	private long bind = 0;
-	/**
-	 * Represents the bind for the task object pointer. Don't touch it.
-	 */
+	/** Represents the bind for the task object pointer. Don't touch it. */
 	private long taskBind = 0;
-	/**
-	 * Task associated with the comm. Beware, it can be null 
-	 */
+	/** Task associated with the comm. Beware, it can be null */
 	protected Task task = null;
 	/**
 	 * Protected constructor, used by Comm factories
@@ -40,35 +29,37 @@ public class Comm {
 	protected Comm() {
 
 	}
-	/**
-	 * Finalize the communication object, destroying it.
-	 */
-	protected void finalize() throws Throwable {
-		destroy();
+	/** Destroy the C communication object, when the GC reclaims the java part. */
+	@Deprecated @Override
+	protected void finalize() throws Throwable{
+		nativeFinalize();
 	}
-	/**
-	 * Unbind the communication object
-	 */
-	protected native void destroy() throws NativeException;
+	protected native void nativeFinalize();
 	/**
 	 * Returns if the communication is finished or not.
 	 * If the communication has finished and there was an error,
 	 * raise an exception.
 	 */
 	public native boolean test() throws TransferFailureException, HostFailureException, TimeoutException ;
-	/**
-	 * Wait for the complemetion of the communication for an indefinite time
-	 */
+	/** Wait infinitely for the completion of the communication (infinite timeout) */
 	public void waitCompletion() throws TransferFailureException, HostFailureException, TimeoutException {
 		waitCompletion(-1);
 	}
 	/**
 	 * Wait for the completion of the communication.
 	 * Throws an exception if there were an error in the communication.
-	 * @param timeout Time before giving up
+	 * @param timeout Time before giving up (infinite time if negative)
 	 */
 	public native void waitCompletion(double timeout) throws TransferFailureException, HostFailureException, TimeoutException;
 
+	/** Wait all of the communications */
+	public static native void waitAll(Comm[] comms, double timeout) throws TransferFailureException, HostFailureException, TimeoutException;
+	/** Wait all of the communications, with no maximal delay */
+	public static void waitAll(Comm[] comms) throws TransferFailureException, HostFailureException, TimeoutException {
+		waitAll(comms, -1.);
+	}
+	/** Wait any of the communications, and return the rank of the terminating comm */
+	public static native int waitAny(Comm[] comms) throws TransferFailureException, HostFailureException, TimeoutException;
 	/**
 	 * Returns the task associated with the communication.
 	 * if the communication isn't finished yet, will return null.
@@ -77,12 +68,10 @@ public class Comm {
 		return task;
 	}
 
-	/**
-	 * Class initializer, to initialize various JNI stuff
-	 */
+	/** Class initializer, to initialize various JNI stuff */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}	
 }