More coding style updates for sg_link.

diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst
index 459d26f..08edf11 100644 (file)
--- a/docs/source/app_s4u.rst
+++ b/docs/source/app_s4u.rst
@@ -1360,10 +1360,10 @@ Querying info
 
    .. group-tab:: C
 
-      .. autodoxymethod:: sg_link_bandwidth(const_sg_link_t link)
+      .. autodoxymethod:: sg_link_get_bandwidth(const_sg_link_t link)
+      .. autodoxymethod:: sg_link_get_latency(const_sg_link_t link)
+      .. autodoxymethod:: sg_link_get_name(const_sg_link_t link)
       .. autodoxymethod:: sg_link_is_shared(const_sg_link_t link)
-      .. autodoxymethod:: sg_link_latency(const_sg_link_t link)
-      .. autodoxymethod:: sg_link_name(const_sg_link_t link)
 
 Modifying characteristics
 -------------------------
@@ -1375,6 +1375,11 @@ Modifying characteristics
       .. autodoxymethod:: simgrid::s4u::Link::set_bandwidth(double value)
       .. autodoxymethod:: simgrid::s4u::Link::set_latency(double value)
 
+   .. group-tab:: C
+
+      .. autodoxymethod:: sg_link_set_bandwidth(const_sg_link_t link, double value)
+      .. autodoxymethod:: sg_link_set_latency(const_sg_link_t link, double value)
+
 User data and properties
 ------------------------
 

diff --git a/examples/deprecated/simdag/test/sd_test.cpp b/examples/deprecated/simdag/test/sd_test.cpp
index c6b4c51..8fd8b55 100644 (file)
--- a/examples/deprecated/simdag/test/sd_test.cpp
+++ b/examples/deprecated/simdag/test/sd_test.cpp
@@ -40,8 +40,8 @@ int main(int argc, char **argv)
   h1->route_to(h2, route, &latency);
 
   for (auto const& link : route)
-    XBT_INFO("   Link %s: latency = %f, bandwidth = %f", sg_link_name(link), sg_link_latency(link),
-             sg_link_bandwidth(link));
+    XBT_INFO("   Link %s: latency = %f, bandwidth = %f", sg_link_get_name(link), sg_link_get_latency(link),
+             sg_link_get_bandwidth(link));
 
   XBT_INFO("Route latency = %f, route bandwidth = %f", latency, sg_host_route_bandwidth(h1, h2));
   XBT_INFO("Communication time for %f bytes between %s and %s: %f", comm_amount12, h1->get_cname(), h2->get_cname(),

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index 9567465..1d6ad17 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -13,13 +13,21 @@
 
 /* C interface */
 SG_BEGIN_DECL
-XBT_PUBLIC const char* sg_link_name(const_sg_link_t link);
+XBT_PUBLIC const char* sg_link_get_name(const_sg_link_t link);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_get_name()") XBT_PUBLIC const char* sg_link_name(const_sg_link_t link);
 XBT_PUBLIC sg_link_t sg_link_by_name(const char* name);
 XBT_PUBLIC int sg_link_is_shared(const_sg_link_t link);
-XBT_PUBLIC double sg_link_bandwidth(const_sg_link_t link);
-XBT_PUBLIC void sg_link_bandwidth_set(sg_link_t link, double value);
-XBT_PUBLIC double sg_link_latency(const_sg_link_t link);
-XBT_PUBLIC void sg_link_latency_set(sg_link_t link, double value);
+XBT_PUBLIC double sg_link_get_bandwidth(const_sg_link_t link);
+XBT_PUBLIC void sg_link_set_bandwidth(sg_link_t link, double value);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_get_bandwidth()") XBT_PUBLIC
+    double sg_link_bandwidth(const_sg_link_t link);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_set_bandwidth()") XBT_PUBLIC
+    void sg_link_bandwidth_set(sg_link_t link, double value);
+XBT_PUBLIC double sg_link_get_latency(const_sg_link_t link);
+XBT_PUBLIC void sg_link_set_latency(sg_link_t link, double value);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_get_latency()") XBT_PUBLIC double sg_link_latency(const_sg_link_t link);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_set_latency()") XBT_PUBLIC
+    void sg_link_latency_set(sg_link_t link, double value);
 XBT_PUBLIC void* sg_link_get_data(const_sg_link_t link);
 XBT_PUBLIC void sg_link_set_data(sg_link_t link, void* data);
 XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_get_data()") XBT_PUBLIC void* sg_link_data(const_sg_link_t link);

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 0ca0928..e808e0c 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -165,9 +165,9 @@ XBT_PUBLIC xbt_dynar_t SD_PTG_dotload(const char* filename);
 /* Support some backward compatibility */
 #define SD_workstation_t sg_host_t
 
-#define SD_link_get_name sg_link_name
-#define SD_link_get_current_latency sg_link_latency
-#define SD_link_get_current_bandwidth sg_link_bandwidth
+#define SD_link_get_name sg_link_get_name
+#define SD_link_get_current_latency sg_link_get_latency
+#define SD_link_get_current_bandwidth sg_link_get_bandwidth
 
 #define SD_route_get_current_latency SD_route_get_latency
 #define SD_route_get_current_bandwidth SD_route_get_bandwidth

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index a6fc902..8c3b456 100644 (file)
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -130,10 +130,16 @@ void Link::set_property(const std::string& key, const std::string& value)
 
 /* **************************** Public C interface *************************** */
 
-const char* sg_link_name(const_sg_link_t link)
+const char* sg_link_get_name(const_sg_link_t link)
 {
   return link->get_cname();
 }
+
+const char* sg_link_name(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_link_get_name(link);
+}
+
 sg_link_t sg_link_by_name(const char* name)
 {
   return simgrid::s4u::Link::by_name(name);
@@ -143,40 +149,67 @@ int sg_link_is_shared(const_sg_link_t link)
 {
   return link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::FATPIPE;
 }
-double sg_link_bandwidth(const_sg_link_t link)
+
+double sg_link_get_bandwidth(const_sg_link_t link)
 {
   return link->get_bandwidth();
 }
 
-void sg_link_bandwidth_set(sg_link_t link, double value)
+void sg_link_set_bandwidth(sg_link_t link, double value)
 {
   return link->set_bandwidth(value);
 }
 
-double sg_link_latency(const_sg_link_t link)
+double sg_link_bandwidth(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_link_get_bandwidth(link);
+}
+
+void sg_link_bandwidth_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_link_set_bandwidth(link, value);
+}
+
+double sg_link_get_latency(const_sg_link_t link)
 {
   return link->get_latency();
 }
-void sg_link_latency_set(sg_link_t link, double value)
+
+void sg_link_set_latency(sg_link_t link, double value)
 {
   return link->set_latency(value);
 }
+
+double sg_link_latency(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_link_get_latency(link);
+}
+
+void sg_link_latency_set(sg_link_t link, double value) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_link_set_latency(link, value);
+}
+
 void* sg_link_get_data(const_sg_link_t link)
 {
   return link->get_data();
 }
+
 void sg_link_set_data(sg_link_t link, void* data)
 {
   link->set_data(data);
 }
+
 void* sg_link_data(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330
 {
   return sg_link_get_data(link);
 }
+
 void sg_link_data_set(sg_link_t link, void* data) // XBT_ATTRIB_DEPRECATED_v330
 {
   sg_link_set_data(link, data);
 }
+
 int sg_link_count()
 {
   return simgrid::s4u::Engine::get_instance()->get_link_count();

diff --git a/teshsuite/s4u/basic-link-test/basic-link-test.cpp b/teshsuite/s4u/basic-link-test/basic-link-test.cpp
index c129a21..a2b8bf4 100644 (file)
--- a/teshsuite/s4u/basic-link-test/basic-link-test.cpp
+++ b/teshsuite/s4u/basic-link-test/basic-link-test.cpp
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
   XBT_INFO("Link count: %zu", links.size());
 
   std::sort(links.begin(), links.end(), [](const simgrid::s4u::Link* a, const simgrid::s4u::Link* b) {
-    return strcmp(sg_link_name(a), sg_link_name(b)) < 0;
+    return strcmp(sg_link_get_name(a), sg_link_get_name(b)) < 0;
   });
 
   for (const auto& l : links) {

diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
index 5464341..b1088ef 100644 (file)
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test.c
@@ -30,8 +30,8 @@ int main(int argc, char **argv)
       unsigned int i;
       SD_link_t link;
       xbt_dynar_foreach(route, i, link)
-        fprintf(stderr, "  Link %s: latency = %f, bandwidth = %f\n", sg_link_name(link),
-               sg_link_latency(link), sg_link_bandwidth(link));
+        fprintf(stderr, "  Link %s: latency = %f, bandwidth = %f\n", sg_link_get_name(link), sg_link_get_latency(link),
+                sg_link_get_bandwidth(link));
       fprintf(stderr, "Route latency = %f, route bandwidth = %f\n",
              sg_host_route_latency(h1, h2), sg_host_route_bandwidth(h1, h2));
       xbt_dynar_free_container(&route);
@@ -51,8 +51,8 @@ int main(int argc, char **argv)
           unsigned int k;
           SD_link_t link;
           xbt_dynar_foreach(route, k, link)
-            fprintf(stderr, "  Link %s: latency = %f, bandwidth = %f\n",
-                sg_link_name(link), sg_link_latency(link), sg_link_bandwidth(link));
+            fprintf(stderr, "  Link %s: latency = %f, bandwidth = %f\n", sg_link_get_name(link),
+                    sg_link_get_latency(link), sg_link_get_bandwidth(link));
           fprintf(stderr, "  Route latency = %f, route bandwidth = %f\n",
                  sg_host_route_latency(h1, h2), sg_host_route_bandwidth(h1, h2));
           xbt_dynar_free_container(&route);

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 0c02db1..af95d1c 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -77,7 +77,7 @@ static void dump_links()
   simgrid::s4u::Link** links = sg_link_list();
 
   std::sort(links, links + totalLinks, [](const simgrid::s4u::Link* a, const simgrid::s4u::Link* b) {
-    return strcmp(sg_link_name(a), sg_link_name(b)) < 0;
+    return strcmp(sg_link_get_name(a), sg_link_get_name(b)) < 0;
   });
 
   for (size_t i = 0; i < totalLinks; i++) {