/* 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. */
#include "simgrid/plugins/energy.h"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Storage.hpp"
-#include "jmsg.h"
+#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;
/* 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) */
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 */
jobject jhost = jhost_new_instance(env);
- if (!jhost) {
+ if (not jhost) {
jxbt_throw_jni(env, "java host instantiation failed");
return nullptr;
}
/* 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;
}
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;
}
/* 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);
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);
+ MSG_host_off(host);
}
JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) {
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;
}
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;
}
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;
}
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;
}
{
msg_host_t host = jhost_get_native(env, jhost);
- if (!host) {
+ if (not host) {
jxbt_throw_notbound(env, "host", jhost);
return 0;
}
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<std::string, msg_storage_t> 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 (!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;
}
{
msg_host_t host = jhost_get_native(env, jhost);
- if (!host) {
+ if (not host) {
jxbt_throw_notbound(env, "host", jhost);
return 0;
}
jstorage_name = env->NewStringUTF(storage_name);
env->SetObjectArrayElement(jtable, index, jstorage_name);
}
-
+ xbt_dynar_free_container(&dyn);
return jtable;
}
{
msg_host_t host = jhost_get_native(env, jhost);
- if (!host) {
+ if (not host) {
jxbt_throw_notbound(env, "host", jhost);
return 0;
}
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<jobject>(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);
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);
}
+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;
}
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)
{
msg_host_t host = jhost_get_native(env, jhost);
return MSG_host_get_power_peak_at(host, pstate);
}
-
-SG_END_DECL()
