From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Wed, 13 Jun 2012 16:32:56 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
X-Git-Tag: v3_9_90~569^2~19^2~45
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/344426b96f30e5362d99218279f21bd9966ab497?hp=1659965c67d79655ace1edd1368e669fd9429f37

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
---

diff --git a/examples/masterslave/Masterslave.java b/examples/masterslave/Masterslave.java
index 03acdc6b69..a2e0f35a6a 100644
--- a/examples/masterslave/Masterslave.java
+++ b/examples/masterslave/Masterslave.java
@@ -11,7 +11,8 @@ import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
 public class Masterslave {
-   
+   public static final int TASK_COMP_SIZE = 10000000;
+   public static final int TASK_COMM_SIZE = 10000000;
    /* This only contains the launcher. If you do nothing more than than you can run 
     *   java simgrid.msg.Msg
     * which also contains such a launcher
diff --git a/org/simgrid/msg/VM.java b/org/simgrid/msg/VM.java
index c1a4de4830..137fa17249 100644
--- a/org/simgrid/msg/VM.java
+++ b/org/simgrid/msg/VM.java
@@ -10,6 +10,7 @@
  */
 package org.simgrid.msg;
 
+import org.simgrid.msg.Host;
 import org.simgrid.msg.Process;
 
 public class VM {
@@ -26,14 +27,14 @@ public class VM {
 	 * @bug it is expected that in the future, the coreAmount parameter will be used
 	 * to add extra constraints on the execution, but the argument is ignored for now.
 	 */
-	public VM(int coreAmount) {
+	public VM(Host host, int coreAmount) {
 		this.coreAmount = coreAmount;
 	}
 	/**
 	 * Natively implemented method starting the VM.
 	 * @param coreAmount
 	 */
-	private native void start(int coreAmount);
+	private native void start(Host host, int coreAmount);
 	
 	/**
 	 * @brief Returns a new array containing all existing VMs.