/* Functions related to the Virtual Machines. */
-/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2020. 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. */
xbt_assert(jvm_field_bind, "Native initialization of msg/VM failed. Please report that bug");
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm)
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv* env, jobject jvm)
{
msg_vm_t vm = jvm_get_native(env,jvm);
return MSG_vm_is_created(vm);
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm)
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv* env, jobject jvm)
{
msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_running(vm);
+ return MSG_vm_is_running(vm);
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm)
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv* env, jobject jvm)
{
- msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_migrating(vm);
+ const_sg_vm_t vm = jvm_get_native(env, jvm);
+ return MSG_vm_is_migrating(vm);
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm)
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv* env, jobject jvm)
{
msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_suspended(vm);
+ return MSG_vm_is_suspended(vm);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound)
{
msg_vm_t vm = jvm_get_native(env,jvm);
msg_host_t host = jhost_get_native(env, jhost);
- if (not simgrid::kernel::context::StopRequest::try_n_catch([&vm, &host]() { MSG_vm_migrate(vm, host); })) {
+ if (not simgrid::ForcefulKillException::try_n_catch([&vm, &host]() { MSG_vm_migrate(vm, host); })) {
XBT_VERB("Caught exception during migration");
jxbt_throw_host_failure(env, "during migration");
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclass cls, jstring jname)
{
-
/* get the C string from the java string */
if (jname == nullptr) {
jxbt_throw_null(env, "No VM can have a null name");
}
const char* name = env->GetStringUTFChars(jname, 0);
/* get the VM by name (VMs are just special hosts, unfortunately) */
- msg_host_t host = MSG_host_by_name(name);
+ auto const* host = MSG_host_by_name(name);
if (not host) { /* invalid name */
jxbt_throw_host_not_found(env, name);