/* Java bindings of the NetZones. */
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2022. 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. */
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) {
- simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
+ const simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
return env->NewStringUTF(as->get_cname());
}
JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) {
int index = 0;
jobjectArray jtable;
- sg_netzone_t self_as = jnetzone_get_native(env, jas);
+ const simgrid::s4u::NetZone* self_as = jnetzone_get_native(env, jas);
jclass cls = env->FindClass("org/simgrid/msg/As");
if (not cls)
return nullptr;
- jtable = env->NewObjectArray(static_cast<jsize>(self_as->getChildren()->size()), cls, nullptr);
+ jtable = env->NewObjectArray(static_cast<jsize>(self_as->get_children().size()), cls, nullptr);
if (not jtable) {
jxbt_throw_jni(env, "Hosts table allocation failed");
return nullptr;
}
- for (auto const& tmp_as : *self_as->getChildren()) {
+ for (auto const& tmp_as : self_as->get_children()) {
jobject tmp_jas = jnetzone_new_instance(env);
if (not tmp_jas) {
jxbt_throw_jni(env, "java As instantiation failed");
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) {
- simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
+ const simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
if (not as) {
jxbt_throw_notbound(env, "as", jas);
return nullptr;
}
- const char *name = env->GetStringUTFChars(static_cast<jstring>(jname), 0);
+ jstring_wrapper name(env, static_cast<jstring>(jname));
- const char* property = MSG_zone_get_property_value(as, name);
+ const char* property = sg_zone_get_property_value(as, name);
if (not property) {
return nullptr;
}
jobject jproperty = env->NewStringUTF(property);
- env->ReleaseStringUTFChars(static_cast<jstring>(jname), name);
-
return jproperty;
}
jobjectArray jtable;
jobject jhost;
jstring jname;
- simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
+ const simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas);
jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
if (not cls)
return nullptr;
- std::vector<sg_host_t> table;
- as->getHosts(&table);
+ std::vector<simgrid::s4u::Host*> table = as->get_all_hosts();
jtable = env->NewObjectArray(static_cast<jsize>(table.size()), cls, nullptr);