rename some C type for consistency

diff --git a/examples/simdag/test/sd_test.cpp b/examples/simdag/test/sd_test.cpp
index 37066ff..9b0f886 100644 (file)
--- a/examples/simdag/test/sd_test.cpp
+++ b/examples/simdag/test/sd_test.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
   XBT_INFO("Computation time for %f flops on %s: %f", comp_amount2, h2->cname(), comp_amount2/h2->speed());
 
   XBT_INFO("Route between %s and %s:", h1->cname(), h2->cname());
-  std::vector<Link*> route;
+  std::vector<sg_link_t> route;
   double latency = 0;
   h1->routeTo(h2, &route, &latency);
 

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index b412700..334caa1 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -13,10 +13,11 @@
 
 namespace simgrid {
   namespace s4u {
-  class NetZone;
+  class Actor;
   class Host;
   class Link;
   class Mailbox;
+  class NetZone;
   }
   namespace kernel {
      namespace activity {
@@ -41,9 +42,10 @@ namespace simgrid {
   }
 }
 
-typedef simgrid::s4u::NetZone simgrid_NetZone;
-typedef simgrid::s4u::Host simgrid_Host;
-typedef simgrid::s4u::Link Link;
+typedef simgrid::s4u::Actor s4u_Actor;
+typedef simgrid::s4u::Host s4u_Host;
+typedef simgrid::s4u::Link s4u_Link;
+typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
 typedef simgrid::surf::Cpu surf_Cpu;
@@ -52,19 +54,21 @@ typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 #else
 
-typedef struct simgrid_NetZone simgrid_NetZone;
-typedef struct simgrid_Host simgrid_Host;
+typedef struct s4u_Actor s4u_Actor;
+typedef struct s4u_Host s4u_Host;
+typedef struct s4u_Link s4u_Link;
+typedef struct s4u_NetZone s4u_NetZone;
 typedef struct kernel_Activity kernel_Activity;
 typedef struct surf_Cpu surf_Cpu;
 typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
-typedef struct Link Link;
 typedef struct Trace tmgr_Trace;
 
 #endif
 
-typedef simgrid_NetZone* NetZone_t;
-typedef simgrid_Host* sg_host_t;
+typedef s4u_NetZone* sg_netzone_t;
+typedef s4u_Host* sg_host_t;
+typedef s4u_Link* sg_link_t;
 
 typedef kernel_Activity *smx_activity_t;
 

diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp
index 86b134d..195ca91 100644 (file)
--- a/include/simgrid/jedule/jedule_platform.hpp
+++ b/include/simgrid/jedule/jedule_platform.hpp
@@ -32,7 +32,7 @@ public:
   std::vector<sg_host_t> resource_list;
   void addChild(Container* child);
   void addResources(std::vector<sg_host_t> hosts);
-  void createHierarchy(NetZone_t from_as);
+  void createHierarchy(sg_netzone_t from_as);
   std::vector<int> getHierarchy();
   std::string getHierarchyAsString();
   void print(FILE *file);

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index a2c64bd..9dea554 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -14,15 +14,15 @@
 
 /* C interface */
 SG_BEGIN_DECL()
-XBT_PUBLIC(const char*) sg_link_name(Link *link);
-XBT_PUBLIC(Link *) sg_link_by_name(const char *name);
-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(void*) sg_link_data(Link *link);
-XBT_PUBLIC(void) sg_link_data_set(Link *link,void *data);
+XBT_PUBLIC(const char*) sg_link_name(sg_link_t link);
+XBT_PUBLIC(sg_link_t) sg_link_by_name(const char* name);
+XBT_PUBLIC(int) sg_link_is_shared(sg_link_t link);
+XBT_PUBLIC(double) sg_link_bandwidth(sg_link_t link);
+XBT_PUBLIC(double) sg_link_latency(sg_link_t link);
+XBT_PUBLIC(void*) sg_link_data(sg_link_t link);
+XBT_PUBLIC(void) sg_link_data_set(sg_link_t link, void* data);
 XBT_PUBLIC(int) sg_link_count();
-XBT_PUBLIC(Link**) sg_link_list();
+XBT_PUBLIC(sg_link_t*) sg_link_list();
 XBT_PUBLIC(void) sg_link_exit();
 SG_END_DECL()
 

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index ef9b314..c65b456 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -16,7 +16,7 @@ SG_BEGIN_DECL()
 
 /* *************************** Network Zones ******************************** */
 #define msg_as_t msg_netzone_t /* portability macro */
-typedef simgrid_NetZone* msg_netzone_t;
+typedef s4u_NetZone* msg_netzone_t;
 
 /* ******************************** Host ************************************ */
 
@@ -279,9 +279,7 @@ XBT_PUBLIC(msg_process_t)
 MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc,
                                     char** argv, xbt_dict_t properties);
 
-XBT_PUBLIC(msg_process_t) MSG_process_attach(
-  const char *name, void *data,
-  msg_host_t host, xbt_dict_t properties);
+XBT_PUBLIC(msg_process_t) MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties);
 XBT_PUBLIC(void) MSG_process_detach();
 
 XBT_PUBLIC(void) MSG_process_kill(msg_process_t process);

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 2edb7b0..144677d 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -22,7 +22,7 @@ SG_BEGIN_DECL()
     A link is a network node represented as a <em>name</em>, a <em>bandwidth</em> and a <em>latency</em>.
     A route is a list of links between two hosts.
  */
-typedef Link *SD_link_t;
+typedef sg_link_t SD_link_t;
 
 /** @brief Task opaque datatype
     @ingroup SD_task_api

diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp
index 6aedb79..c945b1c 100644 (file)
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -59,11 +59,11 @@ void Container::addResources(std::vector<sg_host_t> hosts)
   }
 }
 
-void Container::createHierarchy(NetZone_t from_as)
+void Container::createHierarchy(sg_netzone_t from_as)
 {
   xbt_dict_cursor_t cursor = nullptr;
-  char *key;
-  NetZone_t elem;
+  char* key;
+  sg_netzone_t elem;
   xbt_dict_t routing_sons = from_as->children();
 
   if (xbt_dict_is_empty(routing_sons)) {

diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp
index 1790483..4206fdb 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -33,7 +33,7 @@ void jedule_log_sd_event(SD_task_t task)
 
 void jedule_sd_init()
 {
-  NetZone_t root_comp = simgrid::s4u::Engine::instance()->netRoot();
+  sg_netzone_t root_comp = simgrid::s4u::Engine::instance()->netRoot();
   XBT_DEBUG("root name %s\n", root_comp->name());
 
   my_jedule = new simgrid::jedule::Jedule();

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 0fc822e..7c23adc 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -98,8 +98,8 @@ static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* n
     return current;
 
   xbt_dict_cursor_t cursor = nullptr;
-  char *key;
-  NetZone_t elem;
+  char* key;
+  s4u::NetZone* elem;
   xbt_dict_foreach(current->children(), cursor, key, elem) {
     simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
     if (tmp != nullptr) {

diff --git a/src/s4u/s4u_link.cpp b/src/s4u/s4u_link.cpp
index 4fd78e8..24561ff 100644 (file)
--- a/src/s4u/s4u_link.cpp
+++ b/src/s4u/s4u_link.cpp
@@ -19,32 +19,32 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U link
 
 extern "C" {
 
-const char* sg_link_name(Link* link)
+const char* sg_link_name(sg_link_t link)
 {
   return link->name();
 }
-Link* sg_link_by_name(const char* name)
+sg_link_t sg_link_by_name(const char* name)
 {
-  return Link::byName(name);
+  return simgrid::s4u::Link::byName(name);
 }
 
-int sg_link_is_shared(Link* link)
+int sg_link_is_shared(sg_link_t link)
 {
   return link->sharingPolicy();
 }
-double sg_link_bandwidth(Link* link)
+double sg_link_bandwidth(sg_link_t link)
 {
   return link->bandwidth();
 }
-double sg_link_latency(Link* link)
+double sg_link_latency(sg_link_t link)
 {
   return link->latency();
 }
-void* sg_link_data(Link* link)
+void* sg_link_data(sg_link_t link)
 {
   return link->getData();
 }
-void sg_link_data_set(Link* link, void* data)
+void sg_link_data_set(sg_link_t link, void* data)
 {
   link->setData(data);
 }
@@ -52,10 +52,10 @@ int sg_link_count()
 {
   return simgrid::surf::LinkImpl::linksCount();
 }
-Link** sg_link_list()
+sg_link_t* sg_link_list()
 {
   simgrid::surf::LinkImpl** list = simgrid::surf::LinkImpl::linksList();
-  Link** res                     = (Link**)list; // Use the same memory area
+  sg_link_t* res                 = (sg_link_t*)list; // Use the same memory area
 
   int size = sg_link_count();
   for (int i = 0; i < size; i++)

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index a1a0911..e2149e6 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -32,7 +32,7 @@ NetZone::~NetZone()
 {
   xbt_dict_cursor_t cursor = nullptr;
   char* key;
-  NetZone_t elem;
+  NetZone* elem;
   xbt_dict_foreach (children_, cursor, key, elem) {
     delete static_cast<NetZone*>(elem);
   }

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 3fdbcfd..6077a30 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -136,7 +136,7 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
   XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name());
   if (!xbt_dict_is_empty(netzone->children())) {
     xbt_dict_cursor_t cursor = nullptr;
-    NetZone_t nz_son;
+    sg_netzone_t nz_son;
     char *child_name;
     //bottom-up recursion
     xbt_dict_foreach (netzone->children(), cursor, child_name, nz_son) {
@@ -423,12 +423,12 @@ int instr_platform_traced ()
 
 #define GRAPHICATOR_SUPPORT_FUNCTIONS
 
-static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t netzone,
+static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone,
                                         container_t container)
 {
   if (!xbt_dict_is_empty(netzone->children())) {
     xbt_dict_cursor_t cursor = nullptr;
-    NetZone_t netzone_child;
+    sg_netzone_t netzone_child;
     char *child_name;
     //bottom-up recursion
     xbt_dict_foreach (netzone->children(), cursor, child_name, netzone_child) {

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 7d97da1..13c24e0 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -99,7 +99,7 @@ namespace simgrid {
      ************/
 
     LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint)
-        : Resource(model, name, constraint), piface_(Link(this))
+        : Resource(model, name, constraint), piface_(this)
     {
 
       if (strcmp(name,"__loopback__"))

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index afce32e..0e59409 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -45,7 +45,7 @@ extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
 
 XBT_PUBLIC(void) storage_register_callbacks();
 
-XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t rc);
+XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t rc);
 XBT_PRIVATE void parse_after_config();
 
 /********** Tracing **********/

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 8d876f8..31b4c75 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -207,7 +207,7 @@ void parse_platform_file(const char *file)
     xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
       tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
       xbt_assert(trace, "Trace %s undefined", trace_name);
-      Link *link = Link::byName(elm);
+      sg_link_t link = simgrid::s4u::Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
       link->setStateTrace(trace);
     }
@@ -215,7 +215,7 @@ void parse_platform_file(const char *file)
     xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
       tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
       xbt_assert(trace, "Trace %s undefined", trace_name);
-      Link *link = Link::byName(elm);
+      sg_link_t link = simgrid::s4u::Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
       link->setBandwidthTrace(trace);
     }
@@ -223,7 +223,7 @@ void parse_platform_file(const char *file)
     xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
       tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
       xbt_assert(trace, "Trace %s undefined", trace_name);
-      Link *link = Link::byName(elm);
+      sg_link_t link = simgrid::s4u::Link::byName(elm);
       xbt_assert(link, "Link %s undefined", elm);
       link->setLatencyTrace(trace);
     }