cosmetics

[simgrid.git] / src / bindings / java / org / simgrid / msg / Task.java

diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java
index ac034b6..e267422 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Task.java
+++ b/src/bindings/java/org/simgrid/msg/Task.java
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -167,16 +166,9 @@ public class Task {
        public native void cancel();
 
        /** Deletes a task once the garbage collector reclaims it */
-       @Override
-       protected void finalize() {
-               try {
-                       // Exceptions in finalizers lead to bad situations:
-                       // http://stackoverflow.com/questions/7644556/troubleshooting-a-java-memory-leak-finalization
-                       nativeFinalize();
-                       bind=0; // to avoid segfaults if the impossible happens yet again making this task surviving its finalize()
-               } catch (Throwable e) {
-                       e.printStackTrace();
-               }
+       protected void finalize() throws Throwable{
+               nativeFinalize();
+               bind=0; // to avoid segfaults if the impossible happens yet again making this task surviving its finalize()
        }
        protected native void nativeFinalize();
        /* *                       * *
@@ -259,12 +251,14 @@ public class Task {
        /**
         * Starts listening for receiving a task from an asynchronous communication
         * @param mailbox
+        * @return a Comm handler
         */
        public static native Comm irecv(String mailbox);
        /**
         * Retrieves next task from the mailbox identified by the specified name
         *
         * @param mailbox
+        * @return a Task
         */
 
        public static Task receive(String mailbox) throws TransferFailureException, HostFailureException, TimeoutException {
@@ -276,6 +270,7 @@ public class Task {
         *
         * @param mailbox
         * @param timeout
+        * @return a Task
         */
        public static Task receive(String mailbox, double timeout) throws  TransferFailureException, HostFailureException, TimeoutException {
                return receive(mailbox, timeout, null);
@@ -286,6 +281,7 @@ public class Task {
         *
         * @param mailbox
         * @param host
+        * @return a Task
         */
 
        public static Task receive(String mailbox, Host host) throws TransferFailureException, HostFailureException, TimeoutException {
@@ -298,18 +294,21 @@ public class Task {
         * @param mailbox
         * @param timeout 
         * @param host
+        * @return a Task
         */
-       public native static Task receive(String mailbox, double timeout, Host host) throws TransferFailureException, HostFailureException, TimeoutException;
+       public static native Task receive(String mailbox, double timeout, Host host) throws TransferFailureException, HostFailureException, TimeoutException;
 
        /**
         * Starts listening for receiving a task from an asynchronous communication with a capped rate
         * @param mailbox
+        * @return a Comm handler
         */
        public static native Comm irecvBounded(String mailbox, double rate);
        /**
         * Retrieves next task from the mailbox identified by the specified name with a capped rate
         *
         * @param mailbox
+        * @return a Task
         */
 
        public static Task receiveBounded(String mailbox, double rate) throws TransferFailureException, HostFailureException, TimeoutException {
@@ -321,6 +320,7 @@ public class Task {
         *
         * @param mailbox
         * @param timeout
+        * @return a Task
         */
        public static Task receiveBounded(String mailbox, double timeout, double rate) throws  TransferFailureException, HostFailureException, TimeoutException {
                return receiveBounded(mailbox, timeout, null, rate);
@@ -331,6 +331,7 @@ public class Task {
         *
         * @param mailbox
         * @param host
+        * @return a Task
         */
 
        public static Task receiveBounded(String mailbox, Host host, double rate) throws TransferFailureException, HostFailureException, TimeoutException {
@@ -344,24 +345,20 @@ public class Task {
         * @param mailbox
         * @param timeout 
         * @param host
+        * @return a Task
         */
-       public native static Task receiveBounded(String mailbox, double timeout, Host host, double rate) throws TransferFailureException, HostFailureException, TimeoutException;
+       public static native Task receiveBounded(String mailbox, double timeout, Host host, double rate) throws TransferFailureException, HostFailureException, TimeoutException;
 
 
 
        /**
         * Tests whether there is a pending communication on the mailbox identified by the specified alias, and who sent it
         */
-       public native static int listenFrom(String mailbox);
+       public static native int listenFrom(String mailbox);
        /**
         * Listen whether there is a task waiting (either for a send or a recv) on the mailbox identified by the specified alias
         */
-       public native static boolean listen(String mailbox);
-
-       /**
-        * Counts the number of tasks waiting to be received on the \a mailbox identified by the specified alia and sended by the specified \a host.
-        */
-       public native static int listenFromHost(String alias, Host host);
+       public static native boolean listen(String mailbox);
 
        /**
         * Class initializer, to initialize various JNI stuff