From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 23 Oct 2020 13:55:53 +0000 (+0200)
Subject: Follow coding style for sg_host_{get,set}_data.
X-Git-Tag: v3.26~252
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cdcc1673b336818fcd4c37f93e8c7cb184015fd1

Follow coding style for sg_host_{get,set}_data.
---

diff --git a/examples/deprecated/simdag/scheduling/sd_scheduling.c b/examples/deprecated/simdag/scheduling/sd_scheduling.c
index 927e7a52a6..0b2034950f 100644
--- a/examples/deprecated/simdag/scheduling/sd_scheduling.c
+++ b/examples/deprecated/simdag/scheduling/sd_scheduling.c
@@ -24,27 +24,27 @@ struct _HostAttribute {
 
 static double sg_host_get_available_at(const_sg_host_t host)
 {
-  const struct _HostAttribute* attr = (HostAttribute)sg_host_data(host);
+  const struct _HostAttribute* attr = (HostAttribute)sg_host_get_data(host);
   return attr->available_at;
 }
 
 static void sg_host_set_available_at(sg_host_t host, double time)
 {
-  HostAttribute attr = (HostAttribute)sg_host_data(host);
+  HostAttribute attr = (HostAttribute)sg_host_get_data(host);
   attr->available_at = time;
-  sg_host_data_set(host, attr);
+  sg_host_set_data(host, attr);
 }
 
 static SD_task_t sg_host_get_last_scheduled_task(const_sg_host_t host)
 {
-  const struct _HostAttribute* attr = (HostAttribute)sg_host_data(host);
+  const struct _HostAttribute* attr = (HostAttribute)sg_host_get_data(host);
   return attr->last_scheduled_task;
 }
 
 static void sg_host_set_last_scheduled_task(sg_host_t host, SD_task_t task){
-  HostAttribute attr       = (HostAttribute)sg_host_data(host);
+  HostAttribute attr       = (HostAttribute)sg_host_get_data(host);
   attr->last_scheduled_task=task;
-  sg_host_data_set(host, attr);
+  sg_host_set_data(host, attr);
 }
 
 static xbt_dynar_t get_ready_tasks(const_xbt_dynar_t dax)
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
   sg_host_t *hosts = sg_host_list();
 
   for (cursor = 0; cursor < total_nhosts; cursor++)
-    sg_host_data_set(hosts[cursor], xbt_new0(struct _HostAttribute, 1));
+    sg_host_set_data(hosts[cursor], xbt_new0(struct _HostAttribute, 1));
 
   /* load the DAX file */
   xbt_dynar_t dax = SD_daxload(argv[2]);
@@ -247,8 +247,8 @@ int main(int argc, char **argv)
   xbt_dynar_free_container(&dax);
 
   for (cursor = 0; cursor < total_nhosts; cursor++) {
-    free(sg_host_data(hosts[cursor]));
-    sg_host_data_set(hosts[cursor], NULL);
+    free(sg_host_get_data(hosts[cursor]));
+    sg_host_set_data(hosts[cursor], NULL);
   }
 
   xbt_free(hosts);
diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index a3ec5415b9..4e618c2d34 100644
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -44,16 +44,19 @@ XBT_PUBLIC const char* sg_host_get_name(const_sg_host_t host);
  *
  * This functions returns the user data associated to @a host if any.
  */
-XBT_PUBLIC void* sg_host_data(const_sg_host_t host);
-XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data()") XBT_PUBLIC void* sg_host_user(sg_host_t host);
+XBT_PUBLIC void* sg_host_get_data(const_sg_host_t host);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_data()") XBT_PUBLIC void* sg_host_data(const_sg_host_t host);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_get_data()") XBT_PUBLIC void* sg_host_user(sg_host_t host);
 /** @brief Set the user data of a #sg_host_t.
  *
  * This functions attach @a data to @a host.
  */
-XBT_PUBLIC void sg_host_data_set(sg_host_t host, void* userdata);
-XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data_set()") XBT_PUBLIC
+XBT_PUBLIC void sg_host_set_data(sg_host_t host, void* userdata);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_set_data()") XBT_PUBLIC
+    void sg_host_data_set(sg_host_t host, void* userdata);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_set_data()") XBT_PUBLIC
     void sg_host_user_set(sg_host_t host, void* userdata);
-XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data_set(h, NULL)") XBT_PUBLIC void sg_host_user_destroy(sg_host_t host);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_set_data(h, NULL)") XBT_PUBLIC void sg_host_user_destroy(sg_host_t host);
 #endif
 
 // ========= storage related functions ============
diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp
index b3f9c702b3..aa909f4db7 100644
--- a/src/msg/msg_legacy.cpp
+++ b/src/msg/msg_legacy.cpp
@@ -331,11 +331,11 @@ const char* MSG_host_get_name(const_sg_host_t host)
 }
 void* MSG_host_get_data(const_sg_host_t host)
 {
-  return sg_host_data(host);
+  return sg_host_get_data(host);
 }
 void MSG_host_set_data(sg_host_t host, void* data)
 {
-  return sg_host_data_set(host, data);
+  return sg_host_set_data(host, data);
 }
 xbt_dict_t MSG_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
 {
diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index ff0a2f6294..59db81d570 100644
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -369,14 +369,22 @@ xbt_dynar_t sg_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330
 // ========= Layering madness ==============*
 
 // ========== User data Layer ==========
-void* sg_host_data(const_sg_host_t host)
+void* sg_host_get_data(const_sg_host_t host)
 {
   return host->get_data();
 }
-void sg_host_data_set(sg_host_t host, void* userdata)
+void sg_host_set_data(sg_host_t host, void* userdata)
 {
   host->set_data(userdata);
 }
+void* sg_host_data(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_host_get_data(host);
+}
+void sg_host_data_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v330
+{
+  sg_host_set_data(host, userdata);
+}
 void* sg_host_user(sg_host_t host) // deprecated
 {
   return host->get_data();