msg_as_t -> msg_netzone_t

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 9070e53..2cf2afd 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -15,7 +15,8 @@
 SG_BEGIN_DECL()
 
 /* *************************** Network Zones ******************************** */
 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 ************************************ */
 
 
 /* ******************************** Host ************************************ */
 


@@ -184,12 +185,12 @@ XBT_PUBLIC(double) MSG_get_clock();
 XBT_PUBLIC(unsigned long int) MSG_get_sent_msg();
 
 /************************** Environment ***********************************/
 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);
 
 /************************** File handling ***********************************/
 XBT_PUBLIC(sg_size_t) MSG_file_read(msg_file_t fd, sg_size_t size);

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 0bb97c3..66a6ebb 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -185,7 +185,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env,
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls)
 {
 
 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");
   jobject jas = jas_new_instance(env);
   if (!jas) {
     jxbt_throw_jni(env, "java As instantiation failed");

diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp
index ea41349..05745cb 100644 (file)
--- a/src/bindings/java/jmsg_as.cpp
+++ b/src/bindings/java/jmsg_as.cpp
@@ -36,12 +36,14 @@ void jas_unref(JNIEnv * env, jobject jas) {
   env->DeleteGlobalRef(jas);
 }
 
   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));
 }
 
   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 void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) {


@@ -54,7 +56,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cl
 }
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) {
 }
 
 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));
 }
 
   return env->NewStringUTF(MSG_environment_as_get_name(as));
 }
 


@@ -62,9 +64,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, job
   int index = 0;
   jobjectArray jtable;
   jobject tmp_jas;
   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");
   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");


@@ -103,7 +105,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, job
 }
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) {
 }
 
 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);
 
   if (!as) {
     jxbt_throw_notbound(env, "as", jas);


@@ -130,7 +132,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jo
   jobject jhost;
   jstring jname;
   msg_host_t host;
   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);
 
   xbt_dynar_t table =  MSG_environment_as_get_hosts(as);
   int count = xbt_dynar_length(table);

diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h
index 68b62a7..f22148d 100644 (file)
--- a/src/bindings/java/jmsg_as.h
+++ b/src/bindings/java/jmsg_as.h
@@ -16,8 +16,8 @@ SG_BEGIN_DECL()
 jobject jas_new_instance(JNIEnv * env);
 jobject jas_ref(JNIEnv * env, jobject jas);
 void jas_unref(JNIEnv * env, jobject jas);
 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);
 
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls);
 

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 2fbb89d..bf29367 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -50,23 +50,27 @@ void MSG_post_create_environment() {
   }
 }
 
   }
 }
 

-msg_as_t MSG_environment_get_routing_root() {
+msg_netzone_t MSG_environment_get_routing_root()
+{

   return simgrid::s4u::Engine::instance()->netRoot();
 }
 
   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();
 }
 
   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);
 }
 
   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();
 }
 
   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));
 {
   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));


@@ -75,6 +79,7 @@ const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
   return static_cast<const char*>(xbt_dict_get_or_null(dict, name));
 }
 
   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();
 }
   return as->hosts();
 }