X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd9dfb43196aed35d56c8f1f69de1493f2795c2d..fa471698a7b34731a73d30ea79370e15374e086c:/src/bindings/java/jmsg_host.cpp diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index 2676d37ff9..e25ad9d881 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -1,22 +1,23 @@ /* Functions related to the java host instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ #include "simgrid/plugins/energy.h" +#include "simgrid/plugins/load.h" #include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Storage.hpp" -#include "jmsg.h" +#include "JavaContext.hpp" +#include "jmsg.hpp" #include "jmsg_host.h" -#include "jxbt_utilities.h" #include "jmsg_storage.h" +#include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -SG_BEGIN_DECL() - static jmethodID jhost_method_Host_constructor; static jfieldID jhost_field_Host_bind; static jfieldID jhost_field_Host_name; @@ -55,7 +56,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla /* get the C string from the java string */ if (jname == nullptr) { - jxbt_throw_null(env,bprintf("No host can have a null name")); + jxbt_throw_null(env, "No host can have a null name"); return nullptr; } const char *name = env->GetStringUTFChars(jname, 0); @@ -122,7 +123,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc return nullptr; } /* Sets the host name */ - jobject jname = env->NewStringUTF(host->cname()); + jobject jname = env->NewStringUTF(host->get_cname()); env->SetObjectField(jhost, jhost_field_Host_name, jname); /* Bind & store it */ jhost_bind(jhost, host, env); @@ -141,7 +142,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); - MSG_host_off(host); + if (not simgrid::kernel::context::StopRequest::try_n_catch([host]() { MSG_host_off(host); })) + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); } JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) { @@ -237,8 +239,8 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEn int index = 0; jobjectArray jtable; - xbt_dict_t dict = MSG_host_get_mounted_storage_list(host); - int count = xbt_dict_length(dict); + std::unordered_map mounted_storages = host->get_mounted_storages(); + int count = mounted_storages.size(); jclass cls = env->FindClass("org/simgrid/msg/Storage"); jtable = env->NewObjectArray((jsize) count, cls, nullptr); @@ -248,17 +250,12 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEn return nullptr; } - xbt_dict_cursor_t cursor=nullptr; - const char* mount_name; - const char* storage_name; - - xbt_dict_foreach(dict,cursor,mount_name,storage_name) { - jname = env->NewStringUTF(storage_name); + for (auto const& elm : mounted_storages) { + jname = env->NewStringUTF(elm.second->get_cname()); jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname); env->SetObjectArrayElement(jtable, index, jstorage); index++; } - xbt_dict_free(&dict); return jtable; } @@ -319,7 +316,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->cname()); + jstring jname = env->NewStringUTF(host->get_cname()); jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); } @@ -332,7 +329,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); } @@ -371,7 +368,7 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getPstatesCount(JNIEnv* env, jo JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentPowerPeak(JNIEnv* env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); - return MSG_host_get_current_power_peak(host); + return MSG_host_get_speed(host); } JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getPowerPeakAt(JNIEnv* env, jobject jhost, jint pstate) { @@ -379,4 +376,44 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getPowerPeakAt(JNIEnv* env, return MSG_host_get_power_peak_at(host, pstate); } -SG_END_DECL() +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getLoad(JNIEnv* env, jobject jhost) +{ + msg_host_t host = jhost_get_native(env, jhost); + return MSG_host_get_load(host); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentLoad (JNIEnv *env, jobject jhost) +{ + msg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return MSG_host_get_current_load(host); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getComputedFlops (JNIEnv *env, jobject jhost) +{ + msg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return MSG_host_get_computed_flops(host); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getAvgLoad (JNIEnv *env, jobject jhost) +{ + msg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return MSG_host_get_avg_load(host); +}