use more s4u calls in MSG

[simgrid.git] / src / surf / xml / platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 8ae587d..750de26 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -1,6 +1,6 @@
 /* platf_private.h - Interface to the SimGrid platforms which visibility should be limited to this directory */
 
-/* Copyright (c) 2004-2018. The SimGrid Team.
+/* Copyright (c) 2004-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@ struct HostCreationArgs {
   std::vector<double> speed_per_pstate;
   int pstate               = 0;
   int core_amount          = 0;
-  tmgr_trace_t speed_trace = nullptr;
-  tmgr_trace_t state_trace = nullptr;
+  profile::Profile* speed_trace                            = nullptr;
+  profile::Profile* state_trace                            = nullptr;
   const char* coord        = nullptr;
   std::unordered_map<std::string, std::string>* properties = nullptr;
 };
@@ -54,10 +54,10 @@ class LinkCreationArgs {
 public:
   std::string id;
   double bandwidth                    = 0;
-  tmgr_trace_t bandwidth_trace        = nullptr;
+  profile::Profile* bandwidth_trace                        = nullptr;
   double latency                      = 0;
-  tmgr_trace_t latency_trace          = nullptr;
-  tmgr_trace_t state_trace            = nullptr;
+  profile::Profile* latency_trace                          = nullptr;
+  profile::Profile* state_trace                            = nullptr;
   simgrid::s4u::Link::SharingPolicy policy       = simgrid::s4u::Link::SharingPolicy::FATPIPE;
   std::unordered_map<std::string, std::string>* properties = nullptr;
 };
@@ -69,8 +69,8 @@ public:
   double bw_in;
   double bw_out;
   std::string coord;
-  tmgr_trace_t speed_trace;
-  tmgr_trace_t state_trace;
+  profile::Profile* speed_trace;
+  profile::Profile* state_trace;
 };
 
 class RouteCreationArgs {
@@ -144,7 +144,7 @@ public:
   std::string name;
 };
 
-class TraceCreationArgs {
+class ProfileCreationArgs {
 public:
   std::string id;
   std::string file;
@@ -185,7 +185,8 @@ public:
 void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb);
 /*** END of the parsing cruft ***/
 
-XBT_PUBLIC simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone); // Begin description of new Zone
+XBT_PUBLIC simgrid::kernel::routing::NetZoneImpl*
+sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone);         // Begin description of new Zone
 XBT_PUBLIC void sg_platf_new_Zone_seal();                                          // That Zone is fully described
 
 XBT_PUBLIC void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* host);      // Add a host      to the current Zone
@@ -200,7 +201,7 @@ XBT_PUBLIC simgrid::kernel::routing::NetPoint*                      // Add a rou
 XBT_PUBLIC void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route);             // Add a route
 XBT_PUBLIC void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassroute); // Add a bypassRoute
 
-XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace);
+XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace);
 
 XBT_PUBLIC void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage); // Add a storage to the current Zone
 XBT_PUBLIC void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type);