A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove 2 (out of 3) horrible hacks around Java contexts
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_vm.cpp
diff --git
a/src/bindings/java/jmsg_vm.cpp
b/src/bindings/java/jmsg_vm.cpp
index
25256f7
..
3fa29e7
100644
(file)
--- a/
src/bindings/java/jmsg_vm.cpp
+++ b/
src/bindings/java/jmsg_vm.cpp
@@
-1,6
+1,6
@@
/* Functions related to the Virtual Machines. */
/* Functions related to the Virtual Machines. */
-/* Copyright (c) 2012-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-201
9
. 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. */
/* 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. */
@@
-8,14
+8,12
@@
#include "jmsg_vm.h"
#include "jmsg_host.h"
#include "jxbt_utilities.hpp"
#include "jmsg_vm.h"
#include "jmsg_host.h"
#include "jxbt_utilities.hpp"
+#include "simgrid/Exception.hpp"
#include "simgrid/plugins/live_migration.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "simgrid/plugins/live_migration.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "xbt/ex.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
-extern "C" {
-
extern int JAVA_HOST_LEVEL;
static jfieldID jvm_field_bind;
extern int JAVA_HOST_LEVEL;
static jfieldID jvm_field_bind;
@@
-92,7
+90,7
@@
JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass c
msg_host_t h;
xbt_dynar_foreach (hosts, it, h) {
simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(h);
msg_host_t h;
xbt_dynar_foreach (hosts, it, h) {
simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(h);
- if (vm != nullptr && vm->get
State() != SURF_VM_STATE_
DESTROYED) {
+ if (vm != nullptr && vm->get
_state() != simgrid::s4u::VirtualMachine::state::
DESTROYED) {
jobject jvm = static_cast<jobject>(vm->extension(JAVA_HOST_LEVEL));
vms.push_back(jvm);
}
jobject jvm = static_cast<jobject>(vm->extension(JAVA_HOST_LEVEL));
vms.push_back(jvm);
}
@@
-134,9
+132,16
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm)
JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm)
{
msg_vm_t vm = jvm_get_native(env,jvm);
JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm)
{
msg_vm_t vm = jvm_get_native(env,jvm);
- if (vm)
{
+ if (vm)
MSG_vm_shutdown(vm);
MSG_vm_shutdown(vm);
- auto vmList = &simgrid::vm::VirtualMachineImpl::allVms_;
+}
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm)
+{
+ msg_vm_t vm = jvm_get_native(env, jvm);
+ if (vm) {
+ MSG_vm_destroy(vm);
+ auto* vmList = &simgrid::vm::VirtualMachineImpl::allVms_;
vmList->erase(std::remove(vmList->begin(), vmList->end(), vm), vmList->end());
}
}
vmList->erase(std::remove(vmList->begin(), vmList->end(), vm), vmList->end());
}
}
@@
-187,4
+192,3
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclas
return static_cast<jobject>(host->extension(JAVA_HOST_LEVEL));
}
return static_cast<jobject>(host->extension(JAVA_HOST_LEVEL));
}
-}