allow for programmatic creation of a disk

[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 75c9c1717cdbb72f1fa89e24522ad88d67d440df..1c3168bc781bafb944fdd16241f8ae14ad6fe5cd 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-2020. The SimGrid Team.
+/* Copyright (c) 2004-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -102,12 +102,12 @@ public:
   double loopback_bw  = 0;
   double loopback_lat = 0;
   double limiter_link = 0;
-  ClusterTopology topology;
+  ClusterTopology topology = ClusterTopology::FLAT;
   std::string topo_parameters;
-  std::unordered_map<std::string, std::string>* properties;
+  std::unordered_map<std::string, std::string>* properties = nullptr;
   std::string router_id;
-  simgrid::s4u::Link::SharingPolicy sharing_policy;
-  simgrid::s4u::Link::SharingPolicy bb_sharing_policy;
+  simgrid::s4u::Link::SharingPolicy sharing_policy    = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
+  simgrid::s4u::Link::SharingPolicy bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
 };
 
 class CabinetCreationArgs {
@@ -121,27 +121,6 @@ public:
   double lat;
 };
 
-class StorageCreationArgs {
-public:
-  std::string filename;
-  int lineno;
-  std::string id;
-  std::string type_id;
-  std::string content;
-  std::unordered_map<std::string, std::string>* properties;
-  std::string attach;
-};
-
-class StorageTypeCreationArgs {
-public:
-  std::string id;
-  std::string model;
-  std::string content;
-  std::unordered_map<std::string, std::string>* properties;
-  std::unordered_map<std::string, std::string>* model_properties;
-  sg_size_t size;
-};
-
 class DiskCreationArgs {
 public:
   std::string id;
@@ -150,12 +129,6 @@ public:
   double write_bw;
 };
 
-class MountCreationArgs {
-public:
-  std::string storageId;
-  std::string name;
-};
-
 class ProfileCreationArgs {
 public:
   std::string id;
@@ -227,10 +200,6 @@ XBT_PUBLIC void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs
 XBT_PUBLIC simgrid::kernel::resource::DiskImpl*
 sg_platf_new_disk(const 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(const simgrid::kernel::routing::StorageTypeCreationArgs* storage_type);
-XBT_PUBLIC void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount);
-
 XBT_PUBLIC void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor);
 XBT_PRIVATE void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect);