X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc042e8bc9c51f9267fa1936deaebe59ae01ee7..4cedf6f3e1b53c5de2a19a293418a04c5d4d777f:/src/bindings/java/jmsg_host.cpp diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index f51c91da94..7076f7a543 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -1,6 +1,6 @@ /* Functions related to the java host instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -16,8 +16,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -extern "C" { - static jmethodID jhost_method_Host_constructor; static jfieldID jhost_field_Host_bind; static jfieldID jhost_field_Host_name; @@ -123,7 +121,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc return nullptr; } /* Sets the host name */ - jobject jname = env->NewStringUTF(host->getCname()); + jobject jname = env->NewStringUTF(host->get_cname()); env->SetObjectField(jhost, jhost_field_Host_name, jname); /* Bind & store it */ jhost_bind(jhost, host, env); @@ -250,7 +248,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEn } for (auto const& elm : mounted_storages) { - jname = env->NewStringUTF(elm.second->getName()); + jname = env->NewStringUTF(elm.second->get_cname()); jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname); env->SetObjectArrayElement(jtable, index, jstorage); index++; @@ -315,7 +313,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas jobject jhost = static_cast(host->extension(JAVA_HOST_LEVEL)); if (not jhost) { - jstring jname = env->NewStringUTF(host->getCname()); + jstring jname = env->NewStringUTF(host->get_cname()); jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); } @@ -328,7 +326,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname) { const char *name = env->GetStringUTFChars((jstring) jname, 0); - MSG_mailbox_set_async(name); + sg_mailbox_set_receiver(name); env->ReleaseStringUTFChars((jstring) jname, name); } @@ -374,4 +372,3 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getPowerPeakAt(JNIEnv* env, msg_host_t host = jhost_get_native(env, jhost); return MSG_host_get_power_peak_at(host, pstate); } -}