XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+SG_BEGIN_DECL()
+
static jfieldID jvm_field_bind;
void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm)
{
jclass jprocess_class_VM = env->FindClass("org/simgrid/msg/VM");
jvm_field_bind = jxbt_get_jfield(env, jprocess_class_VM, "bind", "J");
- if (!jvm_field_bind ) {
- jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
- }
+ 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)
return (jint) MSG_vm_is_suspended(vm);
}
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaving(JNIEnv * env, jobject jvm)
-{
- msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_saving(vm);
-}
-
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaved(JNIEnv * env, jobject jvm)
-{
- msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_saved(vm);
-}
-
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRestoring(JNIEnv * env, jobject jvm)
-{
- msg_vm_t vm = jvm_get_native(env,jvm);
- return (jint) MSG_vm_is_restoring(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_vm_set_bound(vm, bound);
}
-JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname,
- jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath,
- jint jdisksize, jint jmig_netspeed, jint jdp_intensity)
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm, jobject jhost, jstring jname,
+ jint jramsize, jint jmig_netspeed, jint jdp_intensity)
{
msg_host_t host = jhost_get_native(env, jhost);
- const char *name;
- name = env->GetStringUTFChars(jname, 0);
+ const char* name = env->GetStringUTFChars(jname, 0);
name = xbt_strdup(name);
- // TODO disk concerns are not taken into account yet
- // const char *diskpath;
- // disk_path = (*env)->GetStringUTFChars(env, jdiskpath, 0);
- // disk_path = xbt_strdup(disk_path);
+ msg_vm_t vm = MSG_vm_create(host, name, static_cast<int>(jramsize), static_cast<int>(jmig_netspeed),
+ static_cast<int>(jdp_intensity));
- msg_vm_t vm = MSG_vm_create(host, name, (int) jncore, (int) jramsize, (int) jnetcap, nullptr, (int) jdisksize,
- (int) jmig_netspeed, (int) jdp_intensity);
-
- jvm_bind(env,jvm,vm);
+ jvm_bind(env, jvm, vm);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm)
MSG_vm_resume(vm);
}
-JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm)
-{
- msg_vm_t vm = jvm_get_native(env,jvm);
- MSG_vm_save(vm);
-}
-
-JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm)
-{
- msg_vm_t vm = jvm_get_native(env,jvm);
- MSG_vm_restore(vm);
-}
+SG_END_DECL()