apply some coding standard in function naming (agier has to be in

vacations ... ;))

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 059122a..7b4748d 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -100,7 +100,7 @@ XBT_PUBLIC(msg_host_t) MSG_host_self(void);
 XBT_PUBLIC(int) MSG_get_host_msgload(msg_host_t host);
 /* int MSG_get_msgload(void); This function lacks specification; discard it */
 XBT_PUBLIC(double) MSG_get_host_speed(msg_host_t h);
-XBT_PUBLIC(int) MSG_get_host_core(msg_host_t h);
+XBT_PUBLIC(int) MSG_host_get_core_number(msg_host_t h);
 XBT_PUBLIC(int) MSG_host_is_avail(msg_host_t h);
 XBT_PUBLIC(void) __MSG_host_destroy(msg_host_priv_t host);
 

diff --git a/src/bindings/java/jmsg_host.c b/src/bindings/java/jmsg_host.c
index b32b9b5..21cfc8a 100644 (file)
--- a/src/bindings/java/jmsg_host.c
+++ b/src/bindings/java/jmsg_host.c
@@ -176,7 +176,7 @@ Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env,
 }
 
 JNIEXPORT jdouble JNICALL
-Java_org_simgrid_msg_Host_getCore(JNIEnv * env,
+Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env,
                                         jobject jhost) {
   msg_host_t host = jhost_get_native(env, jhost);
 
@@ -185,7 +185,7 @@ Java_org_simgrid_msg_Host_getCore(JNIEnv * env,
     return -1;
   }
 
-  return (jdouble) MSG_get_host_core(host);
+  return (jdouble) MSG_host_get_core_number(host);
 }
 
 JNIEXPORT jint JNICALL

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 401d53b..47aef69 100644 (file)
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -136,10 +136,10 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed
     (JNIEnv *, jobject);
 /*
  * Class               org_simgrid_msg_Host
- * Method              getCore
+ * Method              getCoreNumber
  * Signature   ()D
  */
-JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCore
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber
     (JNIEnv *, jobject);
 /*
  * Class               org_simgrid_msg_Host

diff --git a/src/bindings/java/org/simgrid/msg/Host.java b/src/bindings/java/org/simgrid/msg/Host.java
index 3b7f41f..cc90166 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Host.java
+++ b/src/bindings/java/org/simgrid/msg/Host.java
@@ -171,7 +171,7 @@ public class Host {
         * @return                      The speed of the processor of the host in flops.
         *
         */ 
-       public native double getCore();
+       public native double getCoreNumber();
 
        /**
         * Returns the value of a given host property. 

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 6f01ec9..5e60908 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -206,7 +206,7 @@ double MSG_get_host_speed(msg_host_t h)
 /** \ingroup m_host_management
  * \brief Return the number of core.
  */
-int MSG_get_host_core(msg_host_t h)
+int MSG_host_get_core_number(msg_host_t h)
 {
   xbt_assert((h != NULL), "Invalid parameters");