X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b89437671ba572a199dd4ff5766ba82720cdf03..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/kernel/resource/profile/Profile.cpp diff --git a/src/kernel/resource/profile/Profile.cpp b/src/kernel/resource/profile/Profile.cpp index 25457dc4b3..234e2eb009 100644 --- a/src/kernel/resource/profile/Profile.cpp +++ b/src/kernel/resource/profile/Profile.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -8,10 +8,12 @@ #include "src/kernel/resource/profile/DatedValue.hpp" #include "src/kernel/resource/profile/Event.hpp" #include "src/kernel/resource/profile/FutureEvtSet.hpp" +#include "src/kernel/resource/profile/StochasticDatedValue.hpp" #include "src/surf/surf_interface.hpp" #include #include +#include #include #include #include @@ -26,8 +28,8 @@ namespace profile { Profile::Profile() { /* Add the first fake event storing the time at which the trace begins */ - DatedValue val(0, -1); - event_list.push_back(val); + event_list.emplace_back(0, -1); + stochastic_event_list.emplace_back(0, -1); } Profile::~Profile() = default; @@ -45,6 +47,10 @@ Event* Profile::schedule(FutureEvtSet* fes, resource::Resource* resource) fes_ = fes; fes_->add_event(0.0 /* start time */, event); + if (stochastic) { + xbt_assert(event->idx < stochastic_event_list.size(), "Your profile should have at least one stochastic event!"); + futureDV = stochastic_event_list.at(event->idx).get_datedvalue(); + } return event; } @@ -53,19 +59,36 @@ Event* Profile::schedule(FutureEvtSet* fes, resource::Resource* resource) DatedValue Profile::next(Event* event) { double event_date = fes_->next_date(); - DatedValue dateVal = event_list.at(event->idx); - - if (event->idx < event_list.size() - 1) { - fes_->add_event(event_date + dateVal.date_, event); - event->idx++; - } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */ - fes_->add_event(event_date + dateVal.date_, event); - event->idx = 1; /* idx=0 is a placeholder to store when events really start */ - } else { /* If we don't loop, we don't need this event anymore */ - event->free_me = true; - } - return dateVal; + if (not stochastic) { + DatedValue dateVal = event_list.at(event->idx); + + if (event->idx < event_list.size() - 1) { + fes_->add_event(event_date + dateVal.date_, event); + event->idx++; + } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */ + fes_->add_event(event_date + dateVal.date_, event); + event->idx = 1; /* idx=0 is a placeholder to store when events really start */ + } else { /* If we don't loop, we don't need this event anymore */ + event->free_me = true; + } + return dateVal; + } else { + DatedValue dateVal = futureDV; + if (event->idx < stochastic_event_list.size() - 1) { + event->idx++; + } else if (stochasticloop) { /* We have reached the last element and we have to loop. */ + event->idx = 1; + } else { + event->free_me = true; /* We have reached the last element, but we don't need to loop. */ + } + + if (not event->free_me) { // In the case there is an element, we draw the next event + futureDV = stochastic_event_list.at(event->idx).get_datedvalue(); + fes_->add_event(event_date + futureDV.date_, event); + } + return dateVal; + } } Profile* Profile::from_string(const std::string& name, const std::string& input, double periodicity) @@ -80,6 +103,7 @@ Profile* Profile::from_string(const std::string& name, const std::string& input, boost::split(list, input, boost::is_any_of("\n\r")); for (auto val : list) { simgrid::kernel::profile::DatedValue event; + simgrid::kernel::profile::StochasticDatedValue stochevent; linecount++; boost::trim(val); if (val[0] == '#' || val[0] == '\0' || val[0] == '%') // pass comments @@ -88,17 +112,86 @@ Profile* Profile::from_string(const std::string& name, const std::string& input, continue; if (sscanf(val.c_str(), "LOOPAFTER %lg\n", &periodicity) == 1) continue; + if (val == "STOCHASTIC LOOP") { + profile->stochastic = true; + profile->stochasticloop = true; + continue; + } + if (val == "STOCHASTIC") { + profile->stochastic = true; + continue; + } - XBT_ATTRIB_UNUSED int res = sscanf(val.c_str(), "%lg %lg\n", &event.date_, &event.value_); - xbt_assert(res == 2, "%s:%d: Syntax error in trace\n%s", name.c_str(), linecount, input.c_str()); + if (profile->stochastic) { + unsigned int i; + unsigned int j; + std::istringstream iss(val); + std::vector splittedval((std::istream_iterator(iss)), + std::istream_iterator()); + + xbt_assert(splittedval.size() > 0, "Invalid profile line"); + + if (splittedval[0] == "DET") { + stochevent.date_law = Distribution::DET; + i = 2; + } else if (splittedval[0] == "NORM" || splittedval[0] == "NORMAL" || splittedval[0] == "GAUSS" || + splittedval[0] == "GAUSSIAN") { + stochevent.date_law = Distribution::NORM; + i = 3; + } else if (splittedval[0] == "EXP" || splittedval[0] == "EXPONENTIAL") { + stochevent.date_law = Distribution::EXP; + i = 2; + } else if (splittedval[0] == "UNIF" || splittedval[0] == "UNIFORM") { + stochevent.date_law = Distribution::UNIF; + i = 3; + } else { + xbt_die("Unknown law %s", splittedval[0].c_str()); + } + + xbt_assert(splittedval.size() > i, "Invalid profile line"); + if (i == 2) { + stochevent.date_params = {std::stod(splittedval[1])}; + } else if (i == 3) { + stochevent.date_params = {std::stod(splittedval[1]), std::stod(splittedval[2])}; + } + + if (splittedval[i] == "DET") { + stochevent.value_law = Distribution::DET; + j = 1; + } else if (splittedval[i] == "NORM" || splittedval[i] == "NORMAL" || splittedval[i] == "GAUSS" || + splittedval[i] == "GAUSSIAN") { + stochevent.value_law = Distribution::NORM; + j = 2; + } else if (splittedval[i] == "EXP" || splittedval[i] == "EXPONENTIAL") { + stochevent.value_law = Distribution::EXP; + j = 1; + } else if (splittedval[i] == "UNIF" || splittedval[i] == "UNIFORM") { + stochevent.value_law = Distribution::UNIF; + j = 2; + } else { + xbt_die("Unknown law %s", splittedval[i].c_str()); + } + + xbt_assert(splittedval.size() > i + j, "Invalid profile line"); + if (j == 1) { + stochevent.value_params = {std::stod(splittedval[i + 1])}; + } else if (j == 2) { + stochevent.value_params = {std::stod(splittedval[i + 1]), std::stod(splittedval[i + 2])}; + } + + profile->stochastic_event_list.emplace_back(stochevent); + } else { + XBT_ATTRIB_UNUSED int res = sscanf(val.c_str(), "%lg %lg\n", &event.date_, &event.value_); + xbt_assert(res == 2, "%s:%d: Syntax error in trace\n%s", name.c_str(), linecount, input.c_str()); - xbt_assert(last_event->date_ <= event.date_, - "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount, - last_event->date_, event.date_, input.c_str()); - last_event->date_ = event.date_ - last_event->date_; + xbt_assert(last_event->date_ <= event.date_, + "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount, + last_event->date_, event.date_, input.c_str()); + last_event->date_ = event.date_ - last_event->date_; - profile->event_list.push_back(event); - last_event = &(profile->event_list.back()); + profile->event_list.emplace_back(event); + last_event = &(profile->event_list.back()); + } } if (last_event) { if (periodicity > 0) { @@ -117,12 +210,11 @@ Profile* Profile::from_file(const std::string& path) xbt_assert(not path.empty(), "Cannot parse a trace from an empty filename"); xbt_assert(trace_list.find(path) == trace_list.end(), "Refusing to define trace %s twice", path.c_str()); - const std::ifstream* f = surf_ifsopen(path); + auto f = std::unique_ptr(surf_ifsopen(path)); xbt_assert(not f->fail(), "Cannot open file '%s' (path=%s)", path.c_str(), (boost::join(surf_path, ":")).c_str()); std::stringstream buffer; buffer << f->rdbuf(); - delete f; return Profile::from_string(path, buffer.str(), -1); }