#include <simgrid/jedule/jedule_events.hpp>
#include <simgrid/jedule/jedule_platform.hpp>
+#include <simgrid/s4u/Engine.hpp>
#include <cstdio>
namespace jedule{
class XBT_PUBLIC Jedule {
-public:
- explicit Jedule(const std::string& name) : root_container_(name) {}
+ std::unordered_map<char*, char*> meta_info_;
std::vector<Event> event_set_;
Container root_container_;
+
+public:
+ explicit Jedule(const std::string& name) : root_container_(name)
+ {
+ root_container_.create_hierarchy(s4u::Engine::get_instance()->get_netzone_root());
+ }
void add_meta_info(char* key, char* value);
+ void add_event(const Event& event);
void cleanup_output();
void write_output(FILE* file);
-
-private:
- std::unordered_map<char*, char*> meta_info_;
};
-}
-}
+} // namespace jedule
+} // namespace simgrid
typedef simgrid::jedule::Jedule *jedule_t;
namespace simgrid {
namespace jedule{
class XBT_PUBLIC Container {
+ int last_id_ = 0;
+ std::string name;
+ std::unordered_map<const char*, unsigned int> name2id;
+ Container* parent_ = nullptr;
+ std::vector<std::unique_ptr<Container>> children_;
+ std::vector<sg_host_t> resource_list;
+
public:
explicit Container(const std::string& name);
Container(const Container&) = delete;
Container& operator=(const Container&) = delete;
-private:
- int last_id_ = 0;
+ const char* get_cname() const { return name.c_str(); }
+ void set_parent(Container* parent) { parent_ = parent; }
+ bool has_children() { return not children_.empty(); }
+ int get_child_position(Container* child);
+ unsigned int get_id_by_name(const char* name) { return name2id.at(name); }
-public:
- std::string name;
- std::unordered_map<const char*, unsigned int> name2id;
- Container *parent = nullptr;
- std::vector<std::unique_ptr<Container>> children;
- std::vector<sg_host_t> resource_list;
void add_child(Container* child);
void add_resources(std::vector<sg_host_t> hosts);
void create_hierarchy(const_sg_netzone_t from_as);
Container *parent;
};
-}
-}
+} // namespace jedule
+} // namespace simgrid
typedef simgrid::jedule::Container * jed_container_t;
void get_resource_selection_by_hosts(std::vector<simgrid::jedule::Subset>& subset_list,
const std::vector<sg_host_t>& host_list);
this->meta_info_.insert({key, value});
}
+void Jedule::add_event(const Event& event)
+{
+ event_set_.emplace_back(event);
+}
+
void Jedule::write_output(FILE* file)
{
if (not this->event_set_.empty()) {
}
}
-}
-}
+} // namespace jedule
+} // namespace simgrid
#endif
void Container::add_child(jed_container_t child)
{
xbt_assert(child != nullptr);
- this->children.emplace_back(child);
- child->parent = this;
+ children_.emplace_back(child);
+ child->set_parent(this);
}
void Container::add_resources(std::vector<sg_host_t> hosts)
{
- this->children.clear();
- this->last_id_ = 0;
+ children_.clear();
+ last_id_ = 0;
for (auto const& host : hosts) {
const char *host_name = sg_host_get_name(host);
}
}
+int Container::get_child_position(Container* child)
+{
+ unsigned int i = 0;
+ int child_nb = -1;
+
+ for (auto const& c : children_) {
+ if (c.get() == child) {
+ child_nb = i;
+ break;
+ }
+ i++;
+ }
+ return child_nb;
+}
+
std::vector<int> Container::get_hierarchy()
{
- if(this->parent != nullptr ) {
- if (not this->parent->children.empty()) {
+ if (parent_ != nullptr) {
+ if (not parent_->has_children()) {
// we are in the last level
- return this->parent->get_hierarchy();
+ return parent_->get_hierarchy();
} else {
- unsigned int i =0;
- int child_nb = -1;
-
- for (auto const& child : this->parent->children) {
- if (child.get() == this) {
- child_nb = i;
- break;
- }
- i++;
- }
+ int child_nb = parent_->get_child_position(this);
xbt_assert( child_nb > - 1);
- std::vector<int> heir_list = this->parent->get_hierarchy();
+ std::vector<int> heir_list = parent_->get_hierarchy();
heir_list.insert(heir_list.begin(), child_nb);
return heir_list;
}
void Container::print(FILE* jed_file)
{
fprintf(jed_file, " <res name=\"%s\">\n", this->name.c_str());
- if (not this->children.empty()) {
- for (auto const& child : this->children) {
+ if (not children_.empty()) {
+ for (auto const& child : children_) {
child->print(jed_file);
}
} else {
for (auto const& host_name : hostgroup) {
xbt_assert( host_name != nullptr );
jed_container_t parent_cont = host2_simgrid_parent_container.at(host_name);
- unsigned int id = parent_cont->name2id.at(host_name);
+ unsigned int id = parent_cont->get_id_by_name(host_name);
id_list.push_back(id);
}
unsigned int nb_ids = id_list.size();
const simgrid::jedule::Container* parent = host2_simgrid_parent_container.at(host_name);
xbt_assert( parent != nullptr );
- auto host_group = parent2hostgroup.find(parent->name.c_str());
+ auto host_group = parent2hostgroup.find(parent->get_cname());
if (host_group == parent2hostgroup.end())
- parent2hostgroup.insert({parent->name.c_str(), std::vector<const char*>(1,host_name)});
+ parent2hostgroup.insert({parent->get_cname(), std::vector<const char*>(1, host_name)});
else
host_group->second.push_back(host_name);
}
simgrid::jedule::Event event(std::string(SD_task_get_name(task)), SD_task_get_start_time(task),
SD_task_get_finish_time(task), "SD");
event.add_resources(*task->allocation);
- my_jedule->event_set_.emplace_back(std::move(event));
+ my_jedule->add_event(std::move(event));
}
void jedule_sd_init()
XBT_DEBUG("root name %s\n", root_comp->get_cname());
my_jedule = new simgrid::jedule::Jedule(root_comp->get_name());
- my_jedule->root_container_.create_hierarchy(root_comp);
}
void jedule_sd_exit()