-/* JNI interface to virtual machine in Simgrid */
+/* Java bindings of the s4u::VirtualMachine */
-/* Copyright (c) 2006-2014. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2017. 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. */
package org.simgrid.msg;
-import java.util.ArrayList;
public class VM extends Host {
// No need to declare a new bind variable: we use the one inherited from the super class Host
- private static ArrayList<VM> vms= new ArrayList<>();
private Host currentHost;
+ private int coreAmount = 1;
/** Create a `basic' VM (i.e. 1GB of RAM, other values are not taken into account). */
public VM(Host host, String name) {
- this(host,name,1024, 0, 0);
+ this(host,name, /*coreAmount*/1, 1024, 0, 0);
+ }
+
+ public VM(Host host, String name, int coreAmount) {
+ this(host,name, coreAmount, 1024, 0, 0);
+ }
+ public VM(Host host, String name, int ramSize, int migNetSpeed, int dpIntensity){
+ this(host, name, /*coreAmount*/1, ramSize, migNetSpeed, dpIntensity);
}
/**
* @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
* @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
*/
- public VM(Host host, String name, int ramSize, int migNetSpeed, int dpIntensity){
+ public VM(Host host, String name, int coreAmount, int ramSize, int migNetSpeed, int dpIntensity){
super();
super.name = name;
this.currentHost = host;
- create(host, name, ramSize, migNetSpeed, dpIntensity);
- vms.add(this);
+ this.coreAmount = coreAmount;
+ create(host, name, coreAmount, ramSize, migNetSpeed, dpIntensity);
}
- public native static VM[] all();
+ /** Retrieve the list of all existing VMs */
+ public static native VM[] all();
- public static VM getVMByName(String name){
- for (VM vm : vms){
- if (vm.getName().equals(name))
- return vm;
- }
- return null;
- }
+ /** Retrieve a VM from its name */
+ public static native VM getVMByName(String name);
/** Shutdown and unref the VM.
*
*/
public void destroy() {
shutdown();
-/// vms.remove(this);
}
/* Make sure that the GC also destroys the C object */
protected void finalize() throws Throwable {
nativeFinalize();
}
- public native void nativeFinalize();
+ private native void nativeFinalize();
/** Returns whether the given VM is currently suspended */
public native int isCreated();
* @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
* @param dpIntensity (dirty page intensity, a percentage of migNetSpeed [0-100], if you don't know put zero ;))
*/
- private native void create(Host host, String name, int ramSize, int migNetSpeed, int dpIntensity);
+ private native void create(Host host, String name, int coreAmount, int ramSize, int migNetSpeed, int dpIntensity);
/**
// If the migration correcly returned, then we should change the currentHost value.
this.currentHost = destination;
}
- private native void nativeMigration(Host destination) throws Exception;
+ private native void nativeMigration(Host destination) throws MsgException;
/** Immediately suspend the execution of all processes within the given VM
*
public native void resume();
/** Class initializer (for JNI), don't do it yourself */
- public static native void nativeInit();
+ private static native void nativeInit();
static {
nativeInit();
}