X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eadbe829389f23151f79257824f3164d7801bbc7..cd7c99997320509f64f9a11948573f0a0d3e2b82:/src/surf/xml/platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 0ab1fa261e..6133bea223 100644
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -32,15 +32,17 @@ namespace routing {
  * used, instead of malloced structures.
  */
 
-struct HostCreationArgs {
-  const char* id = nullptr;
+class HostCreationArgs {
+public:
+  std::string id;
   std::vector<double> speed_per_pstate;
   int pstate               = 0;
   int core_amount          = 0;
   profile::Profile* speed_trace                            = nullptr;
   profile::Profile* state_trace                            = nullptr;
-  const char* coord        = nullptr;
+  std::string coord                                        = "";
   std::unordered_map<std::string, std::string>* properties = nullptr;
+  std::vector<simgrid::kernel::resource::DiskImpl*> disks;
 };
 
 class HostLinkCreationArgs {
@@ -53,7 +55,7 @@ public:
 class LinkCreationArgs {
 public:
   std::string id;
-  double bandwidth                    = 0;
+  std::vector<double> bandwidths;
   profile::Profile* bandwidth_trace                        = nullptr;
   double latency                      = 0;
   profile::Profile* latency_trace                          = nullptr;
@@ -138,6 +140,14 @@ public:
   sg_size_t size;
 };
 
+class DiskCreationArgs {
+public:
+  std::string id;
+  std::unordered_map<std::string, std::string>* properties;
+  double read_bw;
+  double write_bw;
+};
+
 class MountCreationArgs {
 public:
   std::string storageId;
@@ -161,8 +171,6 @@ public:
   std::string element;
 };
 
-enum class ActorOnFailure { DIE, RESTART }; // FIXME: move to a better namespace
-
 class ActorCreationArgs {
 public:
   std::vector<std::string> args;
@@ -171,7 +179,7 @@ public:
   const char* function                   = nullptr;
   double start_time                      = 0.0;
   double kill_time                       = 0.0;
-  ActorOnFailure on_failure;
+  bool restart_on_failure                                  = false;
 };
 
 class ZoneCreationArgs {
@@ -187,6 +195,7 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb);
 
 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_set_properties(std::unordered_map<std::string, std::string>* props);
 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
@@ -203,6 +212,9 @@ XBT_PUBLIC void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreation
 
 XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* trace);
 
+XBT_PUBLIC simgrid::kernel::resource::DiskImpl*
+sg_platf_new_disk(simgrid::kernel::routing::DiskCreationArgs* disk); // Add a disk to the current host
+
 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);
 XBT_PUBLIC void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount);