#include "simgrid/host.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
static const char* string_action(simgrid::kernel::resource::Action::State state)
{
switch (state) {
- case simgrid::kernel::resource::Action::State::ready:
- return "SURF_ACTION_READY";
- case simgrid::kernel::resource::Action::State::running:
+ case simgrid::kernel::resource::Action::State::INITED:
+ return "SURF_ACTION_INITED";
+ case simgrid::kernel::resource::Action::State::STARTED:
return "SURF_ACTION_RUNNING";
- case simgrid::kernel::resource::Action::State::failed:
+ case simgrid::kernel::resource::Action::State::FAILED:
return "SURF_ACTION_FAILED";
- case simgrid::kernel::resource::Action::State::done:
+ case simgrid::kernel::resource::Action::State::FINISHED:
return "SURF_ACTION_DONE";
- case simgrid::kernel::resource::Action::State::not_in_the_system:
- return "SURF_ACTION_NOT_IN_THE_SYSTEM";
+ case simgrid::kernel::resource::Action::State::IGNORED:
+ return "SURF_ACTION_IGNORED";
default:
return "INVALID STATE";
}
int main(int argc, char **argv)
{
surf_init(&argc, argv); /* Initialize some common structures */
- xbt_cfg_set_parse("cpu/model:Cas01");
- xbt_cfg_set_parse("network/model:CM02");
+ simgrid::config::set_parse("cpu/model:Cas01");
+ simgrid::config::set_parse("network/model:CM02");
xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
parse_platform_file(argv[1]);
XBT_INFO("Next Event : %g", surf_get_clock());
XBT_DEBUG("\t CPU actions");
- simgrid::kernel::resource::Action::StateSet* action_list = surf_cpu_model_pm->getFailedActionSet();
+ simgrid::kernel::resource::Action::StateSet* action_list = surf_cpu_model_pm->get_failed_action_set();
while (not action_list->empty()) {
simgrid::kernel::resource::Action& action = action_list->front();
XBT_INFO(" CPU Failed action");
action.unref();
}
- action_list = surf_cpu_model_pm->getDoneActionSet();
+ action_list = surf_cpu_model_pm->get_finished_action_set();
while (not action_list->empty()) {
simgrid::kernel::resource::Action& action = action_list->front();
XBT_INFO(" CPU Done action");
action.unref();
}
- action_list = surf_network_model->getFailedActionSet();
+ action_list = surf_network_model->get_failed_action_set();
while (not action_list->empty()) {
simgrid::kernel::resource::Action& action = action_list->front();
XBT_INFO(" Network Failed action");
action.unref();
}
- action_list = surf_network_model->getDoneActionSet();
+ action_list = surf_network_model->get_finished_action_set();
while (not action_list->empty()) {
simgrid::kernel::resource::Action& action = action_list->front();
XBT_INFO(" Network Done action");
action.unref();
}
- } while ((surf_network_model->getRunningActionSet()->size() ||
- surf_cpu_model_pm->getRunningActionSet()->size()) && surf_solve(-1.0) >= 0.0);
+ } while (
+ (surf_network_model->get_started_action_set()->size() || surf_cpu_model_pm->get_started_action_set()->size()) &&
+ surf_solve(-1.0) >= 0.0);
XBT_DEBUG("Simulation Terminated");