change handling of nested <prop> declarations.

Before: distinctions between zone props and other props with a boolean
and a single set of properties at a time.

Issue: As host can declare props and disks that in turn may declare
props, it enforces a declaration order: disks then props.

Now: stack a new property set when parsing a opening tag to store props
declared at this level. When closing a tag, we assign the set at the
top the stack where it has to and remove it from the stack.

diff --git a/examples/platforms/hosts_with_disks.xml b/examples/platforms/hosts_with_disks.xml
index cb22063..c964cdd 100644 (file)
--- a/examples/platforms/hosts_with_disks.xml
+++ b/examples/platforms/hosts_with_disks.xml
@@ -3,6 +3,7 @@
 <platform version="4.1">
   <zone id="AS0" routing="Full">
     <host id="bob" speed="1Gf">
+      <prop id="ram" value="100B" />
       <disk id="Disk1" read_bw="100MBps" write_bw="40MBps">
         <prop id="size" value="500GiB"/>
         <prop id="mount" value="/scratch"/>
@@ -15,6 +16,7 @@
       <disk id="Disk1" read_bw="200MBps" write_bw="80MBps">
         <prop id="content" value="storage/content/small_content.txt"/>
       </disk>
+      <prop id="ram" value="100B" />
     </host>
 
     <host id="carl" speed="1Gf">

diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp b/examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp
index 2152a10..fadd0d8 100644 (file)
--- a/examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp
+++ b/examples/s4u/io-disk-raw/s4u-io-disk-raw.cpp
@@ -48,6 +48,13 @@ int main(int argc, char** argv)
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
+  /* - Display Host properties */
+  for (auto h : e.get_all_hosts()) {
+    XBT_INFO("*** %s properties ****", h->get_cname());
+    for (auto kv : *h->get_properties())
+      XBT_INFO("  %s -> %s", kv.first.c_str(), kv.second.c_str());
+  }
+
   simgrid::s4u::Actor::create("", simgrid::s4u::Host::by_name("bob"), host);
 
   e.run();

diff --git a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
index f1906a8..1dcba40 100644 (file)
--- a/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
+++ b/examples/s4u/io-disk-raw/s4u-io-disk-raw.tesh
@@ -1,6 +1,12 @@
 #!/usr/bin/env tesh
 
 $ ${bindir}/s4u-io-disk-raw ${platfdir}/hosts_with_disks.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) *** alice properties ****
+> [  0.000000] (0:maestro@)   ram -> 100B
+> [  0.000000] (0:maestro@) *** bob properties ****
+> [  0.000000] (0:maestro@)   ram -> 100B
+> [  0.000000] (0:maestro@) *** carl properties ****
+> [  0.000000] (0:maestro@)   remote_disk -> /scratch:Disk1:bob
 > [  0.000000] (1:@bob) *** Storage info on bob ***
 > [  0.000000] (1:@bob) Disk name: Disk1
 > [  0.000000] (1:@bob) Disk name: Disk2

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 67a3538..93fb932 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -642,6 +642,14 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::
   return new_zone;
 }
 
+void sg_platf_new_Zone_set_properties(std::unordered_map<std::string, std::string>* props)
+{
+  xbt_assert(current_routing, "Cannot set properties of the current Zone: none under construction");
+
+  for (auto kv = props->begin(); kv != props->end(); ++kv)
+    current_routing->get_iface()->set_property(kv->first, kv->second);
+}
+
 /**
  * @brief Specify that the description of the current AS is finished
  *

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 679a312..23ce827 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -196,6 +196,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

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 86ab5cb..cf6f7af 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -281,27 +281,26 @@ static std::vector<double> surf_parse_get_all_speeds(char* speeds, const char* e
 
 /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
 
+std::vector<std::unordered_map<std::string, std::string>*> property_sets;
+
 /* The default current property receiver. Setup in the corresponding opening callbacks. */
-std::unordered_map<std::string, std::string>* current_property_set       = nullptr;
 std::unordered_map<std::string, std::string>* current_model_property_set = nullptr;
-int ZONE_TAG                            = 0; // Whether we just opened a zone tag (to see what to do with the properties)
 
 FILE *surf_file_to_parse = nullptr;
 
 /* Stuff relative to storage */
 void STag_surfxml_storage()
 {
-  ZONE_TAG = 0;
   XBT_DEBUG("STag_surfxml_storage");
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
 }
 
 void ETag_surfxml_storage()
 {
   simgrid::kernel::routing::StorageCreationArgs storage;
 
-  storage.properties   = current_property_set;
-  current_property_set = nullptr;
+  storage.properties = property_sets.back();
+  property_sets.pop_back();
 
   storage.id           = A_surfxml_storage_id;
   storage.type_id      = A_surfxml_storage_typeId;
@@ -312,17 +311,16 @@ void ETag_surfxml_storage()
 }
 void STag_surfxml_storage___type()
 {
-  ZONE_TAG = 0;
   XBT_DEBUG("STag_surfxml_storage___type");
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
   xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)");
 }
 void ETag_surfxml_storage___type()
 {
   simgrid::kernel::routing::StorageTypeCreationArgs storage_type;
 
-  storage_type.properties = current_property_set;
-  current_property_set    = nullptr;
+  storage_type.properties = property_sets.back();
+  property_sets.pop_back();
 
   storage_type.model_properties = current_model_property_set;
   current_model_property_set    = nullptr;
@@ -413,31 +411,21 @@ void ETag_surfxml_platform(){
 }
 
 void STag_surfxml_host(){
-  ZONE_TAG = 0;
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
 }
 
 void STag_surfxml_prop()
 {
-  if (ZONE_TAG) { // We need to retrieve the most recently opened zone
-    XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value);
-    simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(A_surfxml_zone_id);
-
-    netzone->set_property(std::string(A_surfxml_prop_id), A_surfxml_prop_value);
-  } else {
-    if (not current_property_set)
-      current_property_set = new std::unordered_map<std::string, std::string>; // Maybe, it should raise an error
-    current_property_set->insert({A_surfxml_prop_id, A_surfxml_prop_value});
-    XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value,
-              current_property_set);
-  }
+  property_sets.back()->insert({A_surfxml_prop_id, A_surfxml_prop_value});
+  XBT_DEBUG("add prop %s=%s into current property set %p", A_surfxml_prop_id, A_surfxml_prop_value,
+            property_sets.back());
 }
 
 void ETag_surfxml_host()    {
   simgrid::kernel::routing::HostCreationArgs host;
 
-  host.properties = current_property_set;
-  current_property_set = nullptr;
+  host.properties = property_sets.back();
+  property_sets.pop_back();
 
   host.id = A_surfxml_host_id;
 
@@ -464,15 +452,13 @@ void ETag_surfxml_host()    {
 }
 
 void STag_surfxml_disk() {
-  ZONE_TAG = 0;
-  xbt_assert(current_property_set == nullptr,
-             "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
 }
 
 void ETag_surfxml_disk() {
   simgrid::kernel::routing::DiskCreationArgs disk;
-  disk.properties      = current_property_set;
-  current_property_set = nullptr;
+  disk.properties = property_sets.back();
+  property_sets.pop_back();
 
   disk.id       = A_surfxml_disk_id;
   disk.read_bw  = surf_parse_get_bandwidth(A_surfxml_disk_read___bw, "read_bw of disk ", disk.id);
@@ -497,8 +483,8 @@ void STag_surfxml_router(){
 
 void ETag_surfxml_cluster(){
   simgrid::kernel::routing::ClusterCreationArgs cluster;
-  cluster.properties   = current_property_set;
-  current_property_set = nullptr;
+  cluster.properties = property_sets.back();
+  property_sets.pop_back();
 
   cluster.id          = A_surfxml_cluster_id;
   cluster.prefix      = A_surfxml_cluster_prefix;
@@ -570,8 +556,7 @@ void ETag_surfxml_cluster(){
 }
 
 void STag_surfxml_cluster(){
-  ZONE_TAG = 0;
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
 }
 
 void STag_surfxml_cabinet(){
@@ -614,15 +599,14 @@ void STag_surfxml_peer(){
 }
 
 void STag_surfxml_link(){
-  ZONE_TAG = 0;
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
 }
 
 void ETag_surfxml_link(){
   simgrid::kernel::routing::LinkCreationArgs link;
 
-  link.properties          = current_property_set;
-  current_property_set     = nullptr;
+  link.properties = property_sets.back();
+  property_sets.pop_back();
 
   link.id                  = std::string(A_surfxml_link_id);
   link.bandwidths          = surf_parse_get_bandwidths(A_surfxml_link_bandwidth, "bandwidth of link", link.id.c_str());
@@ -888,24 +872,25 @@ void ETag_surfxml_AS()
 
 void STag_surfxml_zone()
 {
-  ZONE_TAG                 = 1;
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
   simgrid::kernel::routing::ZoneCreationArgs zone;
   zone.id      = A_surfxml_zone_id;
   zone.routing = static_cast<int>(A_surfxml_zone_routing);
-
   sg_platf_new_Zone_begin(&zone);
 }
 
 void ETag_surfxml_zone()
 {
+  sg_platf_new_Zone_set_properties(property_sets.back());
+  delete property_sets.back();
+  property_sets.pop_back();
+
   sg_platf_new_Zone_seal();
 }
 
 void STag_surfxml_config()
 {
-  ZONE_TAG = 0;
-  xbt_assert(current_property_set == nullptr,
-             "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
   if (_sg_cfg_init_status == 2) {
     surf_parse_error("All <config> tags must be given before any platform elements (such as <zone>, <host>, <cluster>, "
@@ -917,6 +902,8 @@ void ETag_surfxml_config()
 {
   // Sort config elements before applying.
   // That's a little waste of time, but not doing so would break the tests
+  auto current_property_set = property_sets.back();
+
   std::vector<std::string> keys;
   for (auto const& kv : *current_property_set) {
     keys.push_back(kv.first);
@@ -932,7 +919,7 @@ void ETag_surfxml_config()
   XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
 
   delete current_property_set;
-  current_property_set = nullptr;
+  property_sets.pop_back();
 }
 
 static std::vector<std::string> arguments;
@@ -945,9 +932,8 @@ void STag_surfxml_process()
 
 void STag_surfxml_actor()
 {
-  ZONE_TAG  = 0;
+  property_sets.push_back(new std::unordered_map<std::string, std::string>());
   arguments.assign(1, A_surfxml_actor_function);
-  xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)");
 }
 
 void ETag_surfxml_process()
@@ -964,8 +950,8 @@ void ETag_surfxml_actor()
 {
   simgrid::kernel::routing::ActorCreationArgs actor;
 
-  actor.properties     = current_property_set;
-  current_property_set = nullptr;
+  actor.properties = property_sets.back();
+  property_sets.pop_back();
 
   actor.args.swap(arguments);
   actor.host       = A_surfxml_actor_host;