sanitize C API of sg_link

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index 3d9854d..ea0d9fa 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -16,12 +16,12 @@ typedef struct Link Link;
 
 /* C interface */
 SG_BEGIN_DECL()
 
 /* C interface */
 SG_BEGIN_DECL()

-XBT_PUBLIC(int) surf_network_link_is_shared(Link *link);
-XBT_PUBLIC(double) surf_network_link_get_bandwidth(Link *link);
-XBT_PUBLIC(double) surf_network_link_get_latency(Link *link);
-XBT_PUBLIC(const char*) surf_network_link_get_name(Link *link);
-XBT_PUBLIC(void*) surf_network_link_data(Link *link);
-XBT_PUBLIC(void) surf_network_link_data_set(Link *link,void *data);
+XBT_PUBLIC(int) sg_link_is_shared(Link *link);
+XBT_PUBLIC(double) sg_link_bandwidth(Link *link);
+XBT_PUBLIC(double) sg_link_latency(Link *link);
+XBT_PUBLIC(const char*) sg_link_name(Link *link);
+XBT_PUBLIC(void*) sg_link_data(Link *link);
+XBT_PUBLIC(void) sg_link_data_set(Link *link,void *data);

 SG_END_DECL()
 
 #endif /* INCLUDE_SIMGRID_LINK_H_ */
 SG_END_DECL()
 
 #endif /* INCLUDE_SIMGRID_LINK_H_ */

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 5e79eeb..89ec19c 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -120,7 +120,7 @@ XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
 XBT_PUBLIC(int) SD_link_get_number(void);
 /** @brief Returns the user data of a link */
 static inline void *SD_link_get_data(SD_link_t link) {
 XBT_PUBLIC(int) SD_link_get_number(void);
 /** @brief Returns the user data of a link */
 static inline void *SD_link_get_data(SD_link_t link) {

-  return surf_network_link_data(link);
+  return sg_link_data(link);

 }
 
 /** @brief Sets the user data of a link
 }
 
 /** @brief Sets the user data of a link


@@ -129,25 +129,25 @@ static inline void *SD_link_get_data(SD_link_t link) {
  * if it was not \c NULL.
  */
 static inline void SD_link_set_data(SD_link_t link, void *data) {
  * if it was not \c NULL.
  */
 static inline void SD_link_set_data(SD_link_t link, void *data) {

-       surf_network_link_data_set(link, data);
+       sg_link_data_set(link, data);

 }
 /** @Returns the name of a link  */
 static inline const char *SD_link_get_name(SD_link_t link) {
 }
 /** @Returns the name of a link  */
 static inline const char *SD_link_get_name(SD_link_t link) {

-  return surf_network_link_get_name(link);
+  return sg_link_name(link);

 }
 /** @brief Returns the current bandwidth of a link (in bytes per second) */
 static inline double SD_link_get_current_bandwidth(SD_link_t link) {
 }
 /** @brief Returns the current bandwidth of a link (in bytes per second) */
 static inline double SD_link_get_current_bandwidth(SD_link_t link) {

-  return surf_network_link_get_bandwidth(link);
+  return sg_link_bandwidth(link);

 }
 /** @brief Returns the current latency of a link (in seconds) */
 static inline double SD_link_get_current_latency(SD_link_t link){
 }
 /** @brief Returns the current latency of a link (in seconds) */
 static inline double SD_link_get_current_latency(SD_link_t link){

-  return surf_network_link_get_latency(link);
+  return sg_link_latency(link);

 }
 /** @brief Returns the sharing policy of this workstation.
  *  @return true if the link is shared, and false if it's a fatpipe
  */
 static inline int SD_link_is_shared(SD_link_t link) {
 }
 /** @brief Returns the sharing policy of this workstation.
  *  @return true if the link is shared, and false if it's a fatpipe
  */
 static inline int SD_link_is_shared(SD_link_t link) {

-  return surf_network_link_is_shared(link);
+  return sg_link_is_shared(link);

 }
 /** @} */
 
 }
 /** @} */
 

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index bbe2420..ff1a603 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -17,22 +17,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
  * C API *
  *********/
 SG_BEGIN_DECL()
  * C API *
  *********/
 SG_BEGIN_DECL()

-int surf_network_link_is_shared(Link *link){
+int sg_link_is_shared(Link *link){

   return link->isShared();
 }
   return link->isShared();
 }

-double surf_network_link_get_bandwidth(Link *link){
+double sg_link_bandwidth(Link *link){

   return link->getBandwidth();
 }
   return link->getBandwidth();
 }

-double surf_network_link_get_latency(Link *link){
+double sg_link_latency(Link *link){

   return link->getLatency();
 }
   return link->getLatency();
 }

-const char* surf_network_link_get_name(Link *link) {
+const char* sg_link_name(Link *link) {

   return link->getName();
 }
   return link->getName();
 }

-void* surf_network_link_data(Link *link) {
+void* sg_link_data(Link *link) {

        return link->getData();
 }
        return link->getData();
 }

-void surf_network_link_data_set(Link *link,void *data) {
+void sg_link_data_set(Link *link,void *data) {

        link->setData(data);
 }
 
        link->setData(data);
 }