X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b87fc0829538ec066fd077e6c30ee6270b8abd78..67d66b0cf79b9fc02c0450f254584693dbf21d3b:/src/bindings/java/jmsg_host.cpp diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index 28804e76e9..1b276068d8 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -1,23 +1,22 @@ /* Functions related to the java host instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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/Exception.hpp" #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; @@ -52,23 +51,21 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass "Native initialization of msg/Host failed. Please report that bug"); } -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, jstring jname) { - +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv* env, jclass cls, jstring jname) +{ /* get the C string from the java string */ if (jname == nullptr) { jxbt_throw_null(env, "No host can have a null name"); return nullptr; } - const char *name = env->GetStringUTFChars(jname, 0); + jstring_wrapper name(env, jname); /* get the host by name (the hosts are created during the grid resolution) */ - msg_host_t host = MSG_host_by_name(name); + sg_host_t host = sg_host_by_name(name); if (not host) { /* invalid name */ jxbt_throw_host_not_found(env, name); - env->ReleaseStringUTFChars(jname, name); return nullptr; } - env->ReleaseStringUTFChars(jname, name); if (not host->extension(JAVA_HOST_LEVEL)) { /* native host not associated yet with java host */ /* Instantiate a new java host */ @@ -92,7 +89,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla jhost_bind(jhost, host, env); /* the native host data field is set with the global reference to the java host returned by this function */ - host->extension_set(JAVA_HOST_LEVEL, (void *)jhost); + host->extension_set(JAVA_HOST_LEVEL, jhost); } /* return the global reference to the java host instance */ @@ -102,12 +99,12 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) { jobject jhost; - msg_host_t host = MSG_host_self(); + sg_host_t host = sg_host_self(); if (not host->extension(JAVA_HOST_LEVEL)) { /* the native host not yet associated with the java host instance */ - /* instanciate a new java host instance */ + /* instantiate a new java host instance */ jhost = jhost_new_instance(env); if (not jhost) { @@ -123,11 +120,11 @@ 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); - host->extension_set(JAVA_HOST_LEVEL, (void *) jhost); + host->extension_set(JAVA_HOST_LEVEL, jhost); } else { jhost = (jobject) host->extension(JAVA_HOST_LEVEL); } @@ -136,168 +133,92 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc } JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); - MSG_host_on(host); + sg_host_t host = jhost_get_native(env, jhost); + sg_host_turn_on(host); } 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); + sg_host_t host = jhost_get_native(env, jhost); + if (not simgrid::ForcefulKillException::try_n_catch([host]() { sg_host_turn_off(host); })) + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Host turned off"); } JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) { - xbt_dynar_t hosts = MSG_hosts_as_dynar(); - int nb_host = xbt_dynar_length(hosts); - xbt_dynar_free(&hosts); - return (jint) nb_host; + return (jint)sg_host_count(); } JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); + const_sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return -1; } - return (jdouble) MSG_host_get_speed(host); + return (jdouble)sg_host_get_speed(host); } JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); + const_sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return -1; } - return (jdouble) MSG_host_get_core_number(host); + return (jdouble)sg_host_core_count(host); } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) { - msg_host_t host = jhost_get_native(env, jhost); + const_sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return nullptr; } - const char *name = env->GetStringUTFChars((jstring) jname, 0); + jstring_wrapper name(env, (jstring)jname); - const char *property = MSG_host_get_property_value(host, name); + const char* property = sg_host_get_property_value(host, name); if (not property) { return nullptr; } jobject jproperty = env->NewStringUTF(property); - env->ReleaseStringUTFChars((jstring) jname, name); - return jproperty; } JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue) { - msg_host_t host = jhost_get_native(env, jhost); + sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return; } - const char *name = env->GetStringUTFChars((jstring) jname, 0); - const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0); - char *value = xbt_strdup(value_java); - - MSG_host_set_property_value(host, name, value); + jstring_wrapper name(env, (jstring)jname); + jstring_wrapper value_java(env, (jstring)jvalue); + const char* value = xbt_strdup(value_java); - env->ReleaseStringUTFChars((jstring) jvalue, value_java); - env->ReleaseStringUTFChars((jstring) jname, name); + sg_host_set_property_value(host, name, value); } JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn(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 (jboolean) MSG_host_is_on(host); -} - -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost) -{ - msg_host_t host = jhost_get_native(env, jhost); - jobject jstorage; - jstring jname; + const_sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } - int index = 0; - jobjectArray jtable; - std::unordered_map mounted_storages = host->getMountedStorages(); - int count = mounted_storages.size(); - jclass cls = env->FindClass("org/simgrid/msg/Storage"); - - jtable = env->NewObjectArray((jsize) count, cls, nullptr); - - if (not jtable) { - jxbt_throw_jni(env, "Storages table allocation failed"); - return nullptr; - } - - for (auto elm : mounted_storages) { - jname = env->NewStringUTF(elm.second->getName()); - jstorage = Java_org_simgrid_msg_Storage_getByName(env,cls,jname); - env->SetObjectArrayElement(jtable, index, jstorage); - index++; - } - return jtable; -} - -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost) -{ - msg_host_t host = jhost_get_native(env, jhost); - - if (not host) { - jxbt_throw_notbound(env, "host", jhost); - return 0; - } - jobjectArray jtable; - - xbt_dynar_t dyn = sg_host_get_attached_storage_list(host); - jclass cls = jxbt_get_class(env, "java/lang/String"); - jtable = env->NewObjectArray(static_cast(xbt_dynar_length(dyn)), cls, nullptr); - unsigned int index; - const char* storage_name; - jstring jstorage_name; - xbt_dynar_foreach (dyn, index, storage_name) { - jstorage_name = env->NewStringUTF(storage_name); - env->SetObjectArrayElement(jtable, index, jstorage_name); - } - xbt_dynar_free_container(&dyn); - return jtable; -} - -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(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 (jobjectArray)MSG_host_get_storage_content(host); + return (jboolean)sg_host_is_on(host); } JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) { - - xbt_dynar_t table = MSG_hosts_as_dynar(); - int count = xbt_dynar_length(table); + sg_host_t* table = sg_host_list(); + int count = sg_host_count(); jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host"); if (not cls) @@ -311,25 +232,23 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas } for (int index = 0; index < count; index++) { - msg_host_t host = xbt_dynar_get_as(table, index, msg_host_t); - jobject jhost = static_cast(host->extension(JAVA_HOST_LEVEL)); + auto jhost = static_cast(table[index]->extension(JAVA_HOST_LEVEL)); if (not jhost) { - jstring jname = env->NewStringUTF(host->getCname()); + jstring jname = env->NewStringUTF(table[index]->get_cname()); jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); } env->SetObjectArrayElement(jtable, index, jhost); } - xbt_dynar_free(&table); + xbt_free(table); return jtable; } 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); - env->ReleaseStringUTFChars((jstring) jname, name); + jstring_wrapper name(env, (jstring)jname); + sg_mailbox_set_receiver(name); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_updateAllEnergyConsumptions(JNIEnv* env, jclass cls) @@ -339,40 +258,80 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_updateAllEnergyConsumptions(JNI JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); + const_sg_host_t host = jhost_get_native(env, jhost); if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } - return MSG_host_get_consumed_energy(host); + return sg_host_get_consumed_energy(host); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setPstate(JNIEnv* env, jobject jhost, jint pstate) { - msg_host_t host = jhost_get_native(env, jhost); - MSG_host_set_pstate(host, pstate); + sg_host_t host = jhost_get_native(env, jhost); + sg_host_set_pstate(host, pstate); } JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getPstate(JNIEnv* env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); - return MSG_host_get_pstate(host); + const_sg_host_t host = jhost_get_native(env, jhost); + return sg_host_get_pstate(host); } JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getPstatesCount(JNIEnv* env, jobject jhost) { - msg_host_t host = jhost_get_native(env, jhost); - return MSG_host_get_nb_pstates(host); + const_sg_host_t host = jhost_get_native(env, jhost); + return sg_host_get_nb_pstates(host); } 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_speed(host); + const_sg_host_t host = jhost_get_native(env, jhost); + return sg_host_get_speed(host); } JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getPowerPeakAt(JNIEnv* env, jobject jhost, jint pstate) { - msg_host_t host = jhost_get_native(env, jhost); - return MSG_host_get_power_peak_at(host, pstate); + const_sg_host_t host = jhost_get_native(env, jhost); + return sg_host_get_pstate_speed(host, pstate); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getLoad(JNIEnv* env, jobject jhost) +{ + const_sg_host_t host = jhost_get_native(env, jhost); + return sg_host_get_load(host); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentLoad (JNIEnv *env, jobject jhost) +{ + const_sg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return sg_host_get_current_load(host); } -SG_END_DECL() +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getComputedFlops (JNIEnv *env, jobject jhost) +{ + const_sg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return sg_host_get_computed_flops(host); +} + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getAvgLoad (JNIEnv *env, jobject jhost) +{ + const_sg_host_t host = jhost_get_native(env, jhost); + + if (not host) { + jxbt_throw_notbound(env, "host", jhost); + return 0; + } + + return sg_host_get_avg_load(host); +}