X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..a92d7b716f51a53dea7f59db8524d4add713b910:/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 6410bbfcd9..a82ce2f7c2 100644 --- 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. */ @@ -49,7 +48,14 @@ public class Task { * This value has to be ≥ 0. */ public Task(String name, double flopsAmount, double bytesAmount) { + if (flopsAmount<0) + throw new IllegalArgumentException("Task flopsAmount (" + flopsAmount + ") cannot be negative"); + if (bytesAmount<0) + throw new IllegalArgumentException("Task bytesAmount (" + bytesAmount + ") cannot be negative"); + create(name, flopsAmount, bytesAmount); + + this.name = name; this.messageSize = bytesAmount; } /** @@ -67,7 +73,17 @@ public class Task { * the destination of the communications. */ public Task(String name, Host[]hosts, double[]flopsAmount, double[]bytesAmount) { + if (flopsAmount == null) + throw new IllegalArgumentException("Parallel task flops amounts is null"); + if (bytesAmount == null) + throw new IllegalArgumentException("Parallel task bytes amounts is null"); + if (hosts == null) + throw new IllegalArgumentException("Host list is null"); + if (name == null) + throw new IllegalArgumentException("Parallel task name is null"); + parallelCreate(name, hosts, flopsAmount, bytesAmount); + this.name = name; } /** @@ -85,8 +101,7 @@ public class Task { */ private final native void create(String name, double flopsAmount, - double bytesAmount) - throws IllegalArgumentException; + double bytesAmount); /** * The natively implemented method to create a MSG parallel task. * @@ -100,8 +115,7 @@ public class Task { private final native void parallelCreate(String name, Host[]hosts, double[]flopsAmount, - double[]bytesAmount) - throws NullPointerException, IllegalArgumentException; + double[]bytesAmount); /* * * * * * Getters / Setters * * * * * */ @@ -160,23 +174,17 @@ public class Task { */ public native void execute() throws HostFailureException,TaskCancelledException; - /** Bound a computation to a certain load */ - public native void setBound(double load); + /** Changes the maximum CPU utilization of a computation task. Unit is flops/s. */ + public native void setBound(double bound); /** Cancels a 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(); /* * * * @@ -204,7 +212,7 @@ public class Task { * @throws HostFailureException * @throws TransferFailureException */ - public void send(String mailbox) throws TransferFailureException, HostFailureException, TimeoutException, NativeException { + public void send(String mailbox) throws TransferFailureException, HostFailureException, TimeoutException { send(mailbox, -1); } @@ -213,12 +221,13 @@ public class Task { * * @param mailbox where to send the message * @param timeout - * @exception NativeException if the retrieval fails. * @throws TimeoutException * @throws HostFailureException * @throws TransferFailureException */ - public native void send(String mailbox, double timeout) throws TransferFailureException, HostFailureException, TimeoutException, NativeException; + public void send(String mailbox, double timeout) throws TransferFailureException, HostFailureException, TimeoutException { + sendBounded(mailbox, timeout, -1); + } /** Sends the task on the specified mailbox (capping the sending rate to \a maxrate) * @@ -229,7 +238,7 @@ public class Task { * @throws TimeoutException */ public void sendBounded(String mailbox, double maxrate) throws TransferFailureException, HostFailureException, TimeoutException { - sendBounded(mailbox,-1,maxrate); + sendBounded(mailbox, -1, maxrate); } @@ -259,61 +268,45 @@ 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 - */ - - public static Task receive(String mailbox) throws TransferFailureException, HostFailureException, TimeoutException { - return receive(mailbox, -1.0, null); - } /** - * Retrieves next task on the mailbox identified by the specified name (wait at most \a timeout seconds) + * Retrieves next task on the mailbox identified by the specified alias * * @param mailbox - * @param timeout - */ - public static Task receive(String mailbox, double timeout) throws TransferFailureException, HostFailureException, TimeoutException { - return receive(mailbox, timeout, null); - } - - /** - * Retrieves next task sent by a given host on the mailbox identified by the specified alias - * - * @param mailbox - * @param host + * @return a Task */ - public static Task receive(String mailbox, Host host) throws TransferFailureException, HostFailureException, TimeoutException { - return receive(mailbox, -1.0, host); + public static Task receive(String mailbox) throws TransferFailureException, HostFailureException, TimeoutException { + return receive(mailbox, -1.0); } /** - * Retrieves next task sent by a given host on the mailbox identified by the specified alias (wait at most \a timeout seconds) + * Retrieves next task on the mailbox identified by the specified alias (wait at most \a timeout seconds) * * @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) 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 { - return receiveBounded(mailbox, -1.0, null, rate); + return receiveBounded(mailbox, -1.0, rate); } /** @@ -321,47 +314,20 @@ 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); - } - - /** - * Retrieves next task sent by a given host on the mailbox identified by the specified alias with a capped rate - * - * @param mailbox - * @param host - */ - - public static Task receiveBounded(String mailbox, Host host, double rate) throws TransferFailureException, HostFailureException, TimeoutException { - return receiveBounded(mailbox, -1.0, host, rate); - } - - /** - * Retrieves next task sent by a given host on the mailbox identified by the specified alias (wait at most \a timeout seconds) - * with a capped rate - * - * @param mailbox - * @param timeout - * @param host - */ - 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, 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