X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..fa471698a7b34731a73d30ea79370e15374e086c:/src/bindings/java/jmsg_host.cpp diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index 85ad9cbbe3..e25ad9d881 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -1,27 +1,22 @@ /* Functions related to the java host instances. */ -/* Copyright (c) 2007-2015. 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 -#include -#include -#include - -#include - -#include +#include "simgrid/plugins/energy.h" +#include "simgrid/plugins/load.h" +#include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Storage.hpp" -#include "simgrid/msg.h" -#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(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); static jmethodID jhost_method_Host_constructor; static jfieldID jhost_field_Host_bind; @@ -48,54 +43,38 @@ msg_host_t jhost_get_native(JNIEnv * env, jobject jhost) { return (msg_host_t) (uintptr_t) env->GetLongField(jhost, jhost_field_Host_bind); } -const char *jhost_get_name(jobject jhost, JNIEnv * env) { - msg_host_t host = jhost_get_native(env, jhost); - return host->cname(); -} - -jboolean jhost_is_valid(jobject jhost, JNIEnv * env) { - if (env->GetLongField(jhost, jhost_field_Host_bind)) { - return JNI_TRUE; - } else { - return JNI_FALSE; - } -} - JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) { jclass class_Host = env->FindClass("org/simgrid/msg/Host"); jhost_method_Host_constructor = env->GetMethodID(class_Host, "", "()V"); jhost_field_Host_bind = jxbt_get_jfield(env,class_Host, "bind", "J"); jhost_field_Host_name = jxbt_get_jfield(env, class_Host, "name", "Ljava/lang/String;"); - if (!class_Host || !jhost_field_Host_name || !jhost_method_Host_constructor || !jhost_field_Host_bind) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); - } + xbt_assert(class_Host && jhost_field_Host_name && jhost_method_Host_constructor && jhost_field_Host_bind, + "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) { - msg_host_t host; /* native host */ - jobject jhost; /* global reference to the java host instance returned */ /* 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); /* get the host by name (the hosts are created during the grid resolution) */ - host = MSG_host_by_name(name); + msg_host_t host = MSG_host_by_name(name); - if (!host) { /* invalid name */ + if (not host) { /* invalid name */ jxbt_throw_host_not_found(env, name); env->ReleaseStringUTFChars(jname, name); return nullptr; } env->ReleaseStringUTFChars(jname, name); - if (!host->extension(JAVA_HOST_LEVEL)) { /* native host not associated yet with java host */ + if (not host->extension(JAVA_HOST_LEVEL)) { /* native host not associated yet with java host */ /* Instantiate a new java host */ - jhost = jhost_new_instance(env); + jobject jhost = jhost_new_instance(env); - if (!jhost) { + if (not jhost) { jxbt_throw_jni(env, "java host instantiation failed"); return nullptr; } @@ -103,7 +82,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla /* get a global reference to the newly created host */ jhost = jhost_ref(env, jhost); - if (!jhost) { + if (not jhost) { jxbt_throw_jni(env, "new global ref allocation failed"); return nullptr; } @@ -125,13 +104,13 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc msg_host_t host = MSG_host_self(); - if (!host->extension(JAVA_HOST_LEVEL)) { + if (not host->extension(JAVA_HOST_LEVEL)) { /* the native host not yet associated with the java host instance */ /* instanciate a new java host instance */ jhost = jhost_new_instance(env); - if (!jhost) { + if (not jhost) { jxbt_throw_jni(env, "java host instantiation failed"); return nullptr; } @@ -139,12 +118,12 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc /* get a global reference to the newly created host */ jhost = jhost_ref(env, jhost); - if (!jhost) { + if (not jhost) { jxbt_throw_jni(env, "global ref allocation failed"); 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); @@ -163,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) { @@ -176,7 +156,7 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass c JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return -1; } @@ -187,7 +167,7 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, jobje JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return -1; } @@ -198,14 +178,14 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return nullptr; } const char *name = env->GetStringUTFChars((jstring) jname, 0); const char *property = MSG_host_get_property_value(host, name); - if (!property) { + if (not property) { return nullptr; } @@ -220,7 +200,7 @@ 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); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return; } @@ -228,7 +208,7 @@ Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0); char *value = xbt_strdup(value_java); - MSG_host_set_property_value(host, name, value, xbt_free_f); + MSG_host_set_property_value(host, name, value); env->ReleaseStringUTFChars((jstring) jvalue, value_java); env->ReleaseStringUTFChars((jstring) jname, name); @@ -238,7 +218,7 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } @@ -252,35 +232,30 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEn jobject jstorage; jstring jname; - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } 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); - if (!jtable) { - jxbt_throw_jni(env, "Storages table allocation failed"); - return nullptr; + if (not jtable) { + jxbt_throw_jni(env, "Storages table allocation failed"); + 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; } @@ -288,25 +263,23 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIE { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } jobjectArray jtable; - xbt_dynar_t dyn = MSG_host_get_attached_storage_list(host); - int count = xbt_dynar_length(dyn); - jclass cls = jxbt_get_class(env, "java/lang/String"); - jtable = env->NewObjectArray((jsize) count, cls, nullptr); - int index; - char *storage_name; + 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; - for (index = 0; index < count; index++) { - storage_name = xbt_dynar_get_as(dyn,index,char*); + 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; } @@ -314,7 +287,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEn { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } @@ -323,37 +296,28 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEn JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) { - int index; - jobjectArray jtable; - jobject jhost; - jstring jname; - msg_host_t host; xbt_dynar_t table = MSG_hosts_as_dynar(); int count = xbt_dynar_length(table); jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host"); - - if (!cls) { + if (not cls) return nullptr; - } - jtable = env->NewObjectArray((jsize) count, cls, nullptr); + jobjectArray jtable = env->NewObjectArray((jsize)count, cls, nullptr); - if (!jtable) { + if (not jtable) { jxbt_throw_jni(env, "Hosts table allocation failed"); return nullptr; } - for (index = 0; index < count; index++) { - host = xbt_dynar_get_as(table,index,msg_host_t); - jhost = (jobject) host->extension(JAVA_HOST_LEVEL); - - if (!jhost) { - jname = env->NewStringUTF(host->cname()); + 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)); - jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); - /* FIXME: leak of jname ? */ + if (not jhost) { + jstring jname = env->NewStringUTF(host->get_cname()); + jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); } env->SetObjectArrayElement(jtable, index, jhost); @@ -365,19 +329,91 @@ 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); } -#include "simgrid/plugins/energy.h" +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_updateAllEnergyConsumptions(JNIEnv* env, jclass cls) +{ + sg_host_energy_update_all(); +} + JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); - if (!host) { + if (not host) { jxbt_throw_notbound(env, "host", jhost); return 0; } return MSG_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); +} +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); +} +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); +} +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); +} +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); +} + +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); +}