SG_BEGIN_DECL()
/* *************************** Network Zones ******************************** */
-typedef simgrid_NetZone* msg_as_t;
+#define msg_as_t msg_netzone_t /* portability macro */
+typedef simgrid_NetZone* msg_netzone_t;
/* ******************************** Host ************************************ */
XBT_PUBLIC(unsigned long int) MSG_get_sent_msg();
/************************** Environment ***********************************/
-XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root();
-XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as);
-XBT_PUBLIC(msg_as_t) MSG_environment_as_get_by_name(const char * name);
-XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_as_t as);
-XBT_PUBLIC(const char *) MSG_environment_as_get_property_value(msg_as_t as, const char *name);
-XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as);
+XBT_PUBLIC(msg_netzone_t) MSG_environment_get_routing_root();
+XBT_PUBLIC(const char*) MSG_environment_as_get_name(msg_netzone_t as);
+XBT_PUBLIC(msg_netzone_t) MSG_environment_as_get_by_name(const char* name);
+XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_netzone_t as);
+XBT_PUBLIC(const char*) MSG_environment_as_get_property_value(msg_netzone_t as, const char* name);
+XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_netzone_t as);
/************************** File handling ***********************************/
XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size);
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls)
{
- msg_as_t as = MSG_environment_get_routing_root();
+ msg_netzone_t as = MSG_environment_get_routing_root();
jobject jas = jas_new_instance(env);
if (!jas) {
jxbt_throw_jni(env, "java As instantiation failed");
env->DeleteGlobalRef(jas);
}
-void jas_bind(jobject jas, msg_as_t as, JNIEnv * env) {
+void jas_bind(jobject jas, msg_netzone_t as, JNIEnv* env)
+{
env->SetLongField(jas, jas_field_As_bind, (jlong) (uintptr_t) (as));
}
-msg_as_t jas_get_native(JNIEnv * env, jobject jas) {
- return (msg_as_t) (uintptr_t) env->GetLongField(jas, jas_field_As_bind);
+msg_netzone_t jas_get_native(JNIEnv* env, jobject jas)
+{
+ return (msg_netzone_t)(uintptr_t)env->GetLongField(jas, jas_field_As_bind);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) {
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) {
- msg_as_t as = jas_get_native(env, jas);
+ msg_netzone_t as = jas_get_native(env, jas);
return env->NewStringUTF(MSG_environment_as_get_name(as));
}
int index = 0;
jobjectArray jtable;
jobject tmp_jas;
- msg_as_t tmp_as;
- msg_as_t self_as = jas_get_native(env, jas);
-
+ msg_netzone_t tmp_as;
+ msg_netzone_t self_as = jas_get_native(env, jas);
+
xbt_dict_t dict = MSG_environment_as_get_routing_sons(self_as);
int count = xbt_dict_length(dict);
jclass cls = env->FindClass("org/simgrid/msg/As");
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) {
- msg_as_t as = jas_get_native(env, jas);
+ msg_netzone_t as = jas_get_native(env, jas);
if (!as) {
jxbt_throw_notbound(env, "as", jas);
jobject jhost;
jstring jname;
msg_host_t host;
- msg_as_t as = jas_get_native(env, jas);
+ msg_netzone_t as = jas_get_native(env, jas);
xbt_dynar_t table = MSG_environment_as_get_hosts(as);
int count = xbt_dynar_length(table);
jobject jas_new_instance(JNIEnv * env);
jobject jas_ref(JNIEnv * env, jobject jas);
void jas_unref(JNIEnv * env, jobject jas);
-void jas_bind(jobject jas, msg_as_t as, JNIEnv * env);
-msg_as_t jas_get_native(JNIEnv * env, jobject jas);
+void jas_bind(jobject jas, msg_netzone_t as, JNIEnv* env);
+msg_netzone_t jas_get_native(JNIEnv* env, jobject jas);
JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls);
}
}
-msg_as_t MSG_environment_get_routing_root() {
+msg_netzone_t MSG_environment_get_routing_root()
+{
return simgrid::s4u::Engine::instance()->netRoot();
}
-const char *MSG_environment_as_get_name(msg_as_t as) {
+const char* MSG_environment_as_get_name(msg_netzone_t as)
+{
return as->name();
}
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
+msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+{
return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
+xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t as)
+{
return as->children();
}
-const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
+const char* MSG_environment_as_get_property_value(msg_netzone_t as, const char* name)
{
xbt_dict_t dict = static_cast<xbt_dict_t> (xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as),
ROUTING_PROP_ASR_LEVEL));
return static_cast<const char*>(xbt_dict_get_or_null(dict, name));
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t as)
+{
return as->hosts();
}