From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 11 Feb 2016 23:35:25 +0000 (+0100)
Subject: don't leak the routing name up to into Java
X-Git-Tag: v3_13~867
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/38b4184589d2bebb56268dca0ec93738df8f0772

don't leak the routing name up to into Java

we were implementing instanceof with char*...
That was during the (golden) C age of SimGrid.
---

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 97c370b44c..2c8c022171 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -233,7 +233,6 @@ 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(const char *) MSG_environment_as_get_model(msg_as_t as);
 XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as);
 
 /************************** File handling ***********************************/
diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp
index 474bccde01..e1d50eb384 100644
--- a/src/bindings/java/jmsg_as.cpp
+++ b/src/bindings/java/jmsg_as.cpp
@@ -125,12 +125,6 @@ Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) {
   return jproperty;
 }
 
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_As_getModel(JNIEnv * env, jobject jas) {
-  msg_as_t as = jas_get_native(env, jas);
-  return env->NewStringUTF(MSG_environment_as_get_model(as));
-}
-
 JNIEXPORT jobjectArray JNICALL
 Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas)
 {
diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h
index d8f14e5f9d..0c1d34631f 100644
--- a/src/bindings/java/jmsg_as.h
+++ b/src/bindings/java/jmsg_as.h
@@ -31,9 +31,6 @@ Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas);
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jhost, jobject jname);
 
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_As_getModel(JNIEnv * env, jobject jas);
-
 JNIEXPORT jobjectArray JNICALL
 Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas);
 
diff --git a/src/bindings/java/org/simgrid/msg/As.java b/src/bindings/java/org/simgrid/msg/As.java
index 35248f8cb0..40b68dcc77 100644
--- a/src/bindings/java/org/simgrid/msg/As.java
+++ b/src/bindings/java/org/simgrid/msg/As.java
@@ -22,8 +22,6 @@ public class As {
 
 	public native String getProperty(String name);
 
-	public native String getModel();
-
 	public native Host[] getHosts();
 
 	/**
diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 166ce02768..faf5f7e9da 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -904,7 +904,6 @@ XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void);
 XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as);
 XBT_PUBLIC_DATA(AS_t) surf_AS_get_by_name(const char * name);
 XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_routing_sons(AS_t as);
-XBT_PUBLIC_DATA(const char *) surf_AS_get_model(AS_t as);
 XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as);
 XBT_PUBLIC_DATA(void) surf_AS_get_graph(AS_t as, xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
 XBT_PUBLIC_DATA(AS_t) surf_platf_get_root(routing_platf_t platf);
diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index b1123b3f39..b9c604a6d9 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -75,10 +75,6 @@ const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
   return (char*) xbt_dict_get_or_null(dict, name);
 }
 
-const char *MSG_environment_as_get_model(msg_as_t as) {
-  return surf_AS_get_model(as);
-}
-
 xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
   return surf_AS_get_hosts(as);
 }
diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 119b9abb40..34b7ecf2f4 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -876,11 +876,6 @@ xbt_dict_t surf_AS_get_routing_sons(simgrid::surf::As *as)
   return as->p_routingSons;
 }
 
-const char *surf_AS_get_model(simgrid::surf::As *as)
-{
-  return as->p_modelDesc->name;
-}
-
 xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
 {
   xbt_dynar_t elms = as->p_indexNetworkElm;