/* Functions related to the java host instances. */
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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 <xbt/dict.h>
-#include <xbt/dynar.h>
-#include <xbt/log.h>
-#include <xbt/str.h>
-
-#include <surf/surf_routing.h>
-
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/plugins/energy.h"
+#include "simgrid/s4u/host.hpp"
-#include "simgrid/msg.h"
#include "jmsg.h"
#include "jmsg_host.h"
#include "jxbt_utilities.h"
#include "jmsg_storage.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
SG_BEGIN_DECL()
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, "<init>", "()V");
}
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<jsize>(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);
}
env->ReleaseStringUTFChars((jstring) jname, name);
}
-#include "simgrid/plugins/energy.h"
JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost)
{
msg_host_t host = jhost_get_native(env, jhost);