X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce6136d5f1a9ce68cfa6c968c257bd6c00c531d7..a784ea0b57101613a92e9fe1403d224e7ea4d501:/src/instr/jedule/jedule_platform.cpp

diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp
index e774f9dd40..5109fd7dc5 100644
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -1,274 +1,232 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <stdlib.h>
-#include <string.h>
+#include "simgrid/jedule/jedule.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 #include "xbt/asserts.h"
-#include "xbt/dynar.h"
+#include <algorithm>
 
-#include "simgrid/jedule/jedule_platform.h"
+#if SIMGRID_HAVE_JEDULE
 
-#ifdef HAVE_JEDULE
-
-/********************************************************************/
-
-static xbt_dict_t host2_simgrid_parent_container;
-static xbt_dict_t container_name2container;
-
-/********************************************************************/
-
-static void add_subset_to(xbt_dynar_t subset_list, int start, int end,
-    jed_simgrid_container_t parent);
+namespace simgrid {
+namespace jedule {
+Subset::Subset(int start_idx, int end_idx, Container* parent)
+: start_idx(start_idx), parent(parent)
+{
+  nres=end_idx-start_idx+1;
+}
 
-static void add_subsets_to(xbt_dynar_t subset_list, xbt_dynar_t hostgroup,
-    jed_simgrid_container_t parent);
 
-static void jed_free_container(jed_simgrid_container_t container);
+Container::Container(std::string name): name(name)
+{
+  container_name2container.insert({this->name, this});
+}
 
-/********************************************************************/
+Container::~Container()
+{
+  if (not this->children.empty())
+    for (auto child: this->children)
+      delete child;
+}
 
-static int compare_ids(const void *num1, const void *num2) {
-  int *i1 = (int*) num1;
-  int *i2 = (int*) num2;
-  return *i1 - *i2;
+void Container::addChild(jed_container_t child)
+{
+  xbt_assert(this != nullptr);
+  xbt_assert(child != nullptr);
+  this->children.push_back(child);
+  child->parent = this;
 }
 
-static void jed_free_container(jed_simgrid_container_t container) {
+void Container::addResources(std::vector<sg_host_t> hosts)
+{
+  this->is_lowest = 1;
+  this->children.clear();
+  this->last_id = 0;
+
+  //FIXME do we need to sort?: xbt_dynar_sort_strings(host_names);
+
+  for (auto host : hosts) {
+    const char *host_name = sg_host_get_name(host);
+    this->name2id.insert({host_name, this->last_id});
+    (this->last_id)++;
+    host2_simgrid_parent_container.insert({host_name, this});
+    this->resource_list.push_back(host);
+  }
+}
 
-  xbt_dict_free(&container->name2id);
-  xbt_dynar_free(&container->resource_list);
+void Container::createHierarchy(sg_netzone_t from_as)
+{
 
-  if( container->container_children != NULL ) {
-    unsigned int iter;
-    jed_simgrid_container_t child_container;
-    xbt_dynar_foreach(container->container_children, iter, child_container) {
-      jed_free_container(child_container);
+  if (from_as->getChildren()->empty()) {
+    // I am no AS
+    // add hosts to jedule platform
+    std::vector<sg_host_t> table;
+    from_as->getHosts(&table);
+    this->addResources(table);
+  } else {
+    for (auto nz : *from_as->getChildren()) {
+      jed_container_t child_container = new simgrid::jedule::Container(std::string(nz->getCname()));
+      this->addChild(child_container);
+      child_container->createHierarchy(nz);
     }
-    xbt_dynar_free(&container->container_children);
   }
-
-  xbt_free(container->name);
-  xbt_free(container);
 }
 
-void jed_simgrid_create_container(jed_simgrid_container_t *container,
-                                  const char *name)
+std::vector<int> Container::getHierarchy()
 {
-  xbt_assert( name != NULL );
+  xbt_assert( this!= nullptr );
 
-  *container = xbt_new0(s_jed_simgrid_container_t,1);
-  (*container)->name = xbt_strdup(name);
-  (*container)->is_lowest = 0;
-  (*container)->container_children = xbt_dynar_new(sizeof(jed_simgrid_container_t), NULL);
-  (*container)->parent = NULL;
+  if(this->parent != nullptr ) {
 
-  xbt_dict_set(container_name2container, (*container)->name, *container, NULL);
-}
+    if (not this->parent->children.empty()) {
+      // we are in the last level
+      return this->parent->getHierarchy();
+    } else {
+      unsigned int i =0;
+      int child_nb = -1;
 
+      for (auto child : this->parent->children) {
+        if( child == this) {
+          child_nb = i;
+          break;
+        }
+        i++;
+      }
 
-void jed_simgrid_add_container(jed_simgrid_container_t parent,
-    jed_simgrid_container_t child) {
-  xbt_assert(parent != NULL);
-  xbt_assert(child != NULL);
-  xbt_dynar_push(parent->container_children, &child);
-  child->parent = parent;
+      xbt_assert( child_nb > - 1);
+      std::vector<int> heir_list = this->parent->getHierarchy();
+      heir_list.insert(heir_list.begin(), child_nb);
+      return heir_list;
+    }
+  } else {
+    int top_level = 0;
+    std::vector<int> heir_list = {top_level};
+    return heir_list;
+  }
 }
 
-void jed_simgrid_add_resources(jed_simgrid_container_t parent,
-    xbt_dynar_t host_names) {
-
-  unsigned int iter;
-  char *host_name;
-  char *buf;
-
-  parent->is_lowest = 1;
-  xbt_dynar_free(&parent->container_children);
-  parent->container_children = NULL;
-  parent->name2id = xbt_dict_new_homogeneous(xbt_free_f);
-  parent->last_id = 0;
-  parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
+std::string Container::getHierarchyAsString()
+{
+  std::string output("");
 
-  xbt_dynar_sort_strings(host_names);
+  std::vector<int> heir_list = this->getHierarchy();
 
-  xbt_dynar_foreach(host_names, iter, host_name) {
-    buf = bprintf("%d", parent->last_id);
-    (parent->last_id)++;
-    xbt_dict_set(parent->name2id, host_name, buf, NULL);
-    xbt_dict_set(host2_simgrid_parent_container, host_name, parent, NULL);
-    xbt_dynar_push(parent->resource_list, &host_name);
+  unsigned int length = heir_list.size();
+  unsigned int i = 0;
+  for (auto id : heir_list) {
+    output += std::to_string(id);
+    if( i != length-1 ) {
+      output += ".";
+    }
   }
 
+  return output;
 }
 
-static void add_subset_to(xbt_dynar_t subset_list, int start, int end,
-    jed_simgrid_container_t parent) {
-
-  jed_res_subset_t subset;
-
-  xbt_assert( subset_list != NULL );
-  xbt_assert( parent != NULL );
-
-  // printf(">>> start=%d end=%d\n", start, end);
-
-  subset = xbt_new0(s_jed_res_subset_t,1);
-  subset->start_idx = start;
-  subset->nres      = end-start+1;
-  subset->parent    = parent;
-
-  xbt_dynar_push(subset_list, &subset);
-
+void Container::printResources(FILE * jed_file)
+{
+  unsigned int i=0;
+  xbt_assert(not this->resource_list.empty());
+
+  unsigned int res_nb = this->resource_list.size();
+  std::string resid = this->getHierarchyAsString();
+
+  fprintf(jed_file, "      <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);
+  for (auto res: this->resource_list) {
+    const char * res_name = sg_host_get_name(res);
+    fprintf(jed_file, "%s", res_name);
+    if( i != res_nb-1 ) {
+      fprintf(jed_file, "|");
+    }
+    i++;
+  }
+  fprintf(jed_file, "\" />\n");
 }
 
-static void add_subsets_to(xbt_dynar_t subset_list, xbt_dynar_t hostgroup,
-    jed_simgrid_container_t parent) {
+void Container::print(FILE* jed_file)
+{
+  xbt_assert( this != nullptr );
+  fprintf(jed_file, "    <res name=\"%s\">\n", this->name.c_str());
+  if (not this->children.empty()) {
+    for (auto child: this->children) {
+      child->print(jed_file);
+    }
+  } else {
+    this->printResources(jed_file);
+  }
+  fprintf(jed_file, "    </res>\n");
+}
 
-  unsigned int iter;
-  char *host_name;
-  xbt_dynar_t id_list;
-  int *id_ar;
-  int nb_ids;
-  char *id_str;
+}
+}
 
+static void add_subsets_to(std::vector<jed_subset_t> *subset_list, std::vector<const char*> hostgroup, jed_container_t parent)
+{
   // get ids for each host
   // sort ids
   // compact ids
   // create subset for each id group
 
-  xbt_assert( host2_simgrid_parent_container != NULL );
-  xbt_assert( subset_list != NULL );
-  xbt_assert( hostgroup != NULL );
-  xbt_assert( parent != NULL );
+  xbt_assert( parent != nullptr );
 
-  id_list = xbt_dynar_new(sizeof(char *), NULL);
+  std::vector<unsigned int> id_list;
 
-  xbt_dynar_foreach(hostgroup, iter, host_name) {
-    jed_simgrid_container_t parent;
-    xbt_assert( host_name != NULL );
-    parent = (jed_simgrid_container_t)xbt_dict_get(host2_simgrid_parent_container, host_name);
-    id_str = (char*)xbt_dict_get(parent->name2id, host_name);
-    xbt_dynar_push(id_list, &id_str);
+  for (auto host_name : hostgroup) {
+    xbt_assert( host_name != nullptr );
+    jed_container_t parent = host2_simgrid_parent_container.at(host_name);
+    unsigned int id = parent->name2id.at(host_name);
+    id_list.push_back(id);
   }
-
-  nb_ids = xbt_dynar_length(id_list);
-  id_ar = xbt_new0(int,nb_ids);
-  xbt_dynar_foreach(id_list, iter, id_str) {
-    id_ar[iter] = atoi(id_str);
-  }
-
-  qsort (id_ar, nb_ids, sizeof(int), &compare_ids);
+  unsigned int nb_ids = id_list.size();
+  std::sort(id_list.begin(), id_list.end());
 
   if( nb_ids > 0 ) {
     int start = 0;
-    int pos;
-    int i;
-
-    pos = start;
-    for(i=0; i<nb_ids; i++) {
-
-      if( id_ar[i] - id_ar[pos] > 1 ) {
-
-        add_subset_to( subset_list, id_ar[start], id_ar[pos], parent );
+    int pos = start;
+    for(unsigned int i=0; i<nb_ids; i++) {
+      if( id_list[i] - id_list[pos] > 1 ) {
+        subset_list->push_back(new simgrid::jedule::Subset(id_list[start], id_list[pos], parent));
         start = i;
 
         if( i == nb_ids-1 ) {
-          add_subset_to( subset_list, id_ar[i], id_ar[i], parent );
+         subset_list->push_back(new simgrid::jedule::Subset(id_list[i], id_list[i], parent));
         }
-
       } else {
         if( i == nb_ids-1 ) {
-          add_subset_to( subset_list, id_ar[start], id_ar[i], parent );
+          subset_list->push_back(new simgrid::jedule::Subset(id_list[start], id_list[i], parent));
         }
       }
-
       pos = i;
     }
   }
 
-  free(id_ar);
-  xbt_dynar_free(&id_list);
-
-
 }
 
-void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
-    xbt_dynar_t host_names) {
-
-  char *host_name;
-  unsigned int iter;
-  xbt_dict_t parent2hostgroup;  // group hosts by parent
-
-  parent2hostgroup = xbt_dict_new_homogeneous(NULL);
-
-  xbt_assert( host_names != NULL );
-
+void get_resource_selection_by_hosts(std::vector<jed_subset_t> *subset_list, std::vector<sg_host_t> *host_list)
+{
+  xbt_assert( host_list != nullptr );
   // for each host name
   //  find parent container
   //  group by parent container
-
-  xbt_dynar_foreach(host_names, iter, host_name) {
-    //printf("checking %s \n", host_name);
-
-    jed_simgrid_container_t parent = (jed_simgrid_container_t)xbt_dict_get(host2_simgrid_parent_container, host_name);
-    xbt_assert( parent != NULL );
-
-    xbt_dynar_t hostgroup = (xbt_dynar_t)xbt_dict_get_or_null (parent2hostgroup, parent->name);
-    if( hostgroup == NULL ) {
-      hostgroup = xbt_dynar_new(sizeof(char*), NULL);
-      xbt_dict_set(parent2hostgroup, parent->name, hostgroup, NULL);
-    }
-
-    xbt_dynar_push(hostgroup, &host_name);
+  std::unordered_map<const char*, std::vector<const char*>> parent2hostgroup;
+  for (auto host: *host_list) {
+    const char *host_name = sg_host_get_name(host);
+    jed_container_t parent = host2_simgrid_parent_container.at(host_name);
+    xbt_assert( parent != nullptr );
+
+    auto host_group = parent2hostgroup.find(parent->name.c_str());
+    if (host_group == parent2hostgroup.end())
+      parent2hostgroup.insert({parent->name.c_str(), std::vector<const char*>(1,host_name)});
+    else
+      host_group->second.push_back(host_name);
   }
 
-  {
-    xbt_dict_cursor_t cursor=NULL;
-    char *parent_name;
-    xbt_dynar_t hostgroup;
-    jed_simgrid_container_t parent;
-
-    xbt_dict_foreach(parent2hostgroup,cursor,parent_name,hostgroup) {
-      parent = (jed_simgrid_container_t)xbt_dict_get(container_name2container, parent_name);
-      // printf("subset parent >>> %s\n", parent->name);
-      add_subsets_to(subset_list, hostgroup, parent);
-    }
-    xbt_dynar_free(&hostgroup);
+  for (auto elm: parent2hostgroup) {
+    jed_container_t parent = container_name2container.at(elm.first);
+    add_subsets_to(subset_list, elm.second, parent);
   }
-
-  xbt_dict_free(&parent2hostgroup);
-
-}
-
-
-void jedule_add_meta_info(jedule_t jedule, char *key, char *value) {
-
-  char *val_cp;
-
-  xbt_assert(key != NULL);
-  xbt_assert(value != NULL);
-
-  val_cp = xbt_strdup(value);
-  xbt_dict_set(jedule->jedule_meta_info, key, val_cp, NULL);
-}
-
-void jed_create_jedule(jedule_t *jedule) {
-  *jedule = xbt_new0(s_jedule_t,1);
-  host2_simgrid_parent_container = xbt_dict_new_homogeneous(NULL);
-  container_name2container       = xbt_dict_new_homogeneous(NULL);
-  (*jedule)->jedule_meta_info    = xbt_dict_new_homogeneous(NULL);
-}
-
-void jed_free_jedule(jedule_t jedule) {
-
-  jed_free_container(jedule->root_container);
-
-  xbt_dict_free(&jedule->jedule_meta_info);
-  xbt_free(jedule);
-
-  xbt_dict_free(&host2_simgrid_parent_container);
-  xbt_dict_free(&container_name2container);
 }
 
 #endif