/* A few basic tests for the surf library */
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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 "simgrid/host.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
surf_init(&argc, argv); /* Initialize some common structures */
- xbt_cfg_set_parse("network/model:CM02");
- xbt_cfg_set_parse("cpu/model:Cas01");
+ simgrid::config::set_parse("network/model:CM02");
+ simgrid::config::set_parse("cpu/model:Cas01");
xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
parse_platform_file(argv[1]);
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
- surf_action_t action = nullptr;
+ simgrid::kernel::resource::Action* action = nullptr;
running = 0;
double now = surf_get_clock();
XBT_INFO("Next Event : %g", now);
- for (auto const& model : *all_existing_models) {
- if (surf_model_running_action_set_size(model)) {
+ for (auto const& model : all_existing_models) {
+ if (model->get_started_action_set()->size() != 0) {
XBT_DEBUG("\t Running that model");
running = 1;
}
- action = surf_model_extract_failed_action_set(model);
+ action = model->extract_failed_action();
while (action != nullptr) {
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Failed Action: %p", action);
action->unref();
- action = surf_model_extract_failed_action_set(model);
+ action = model->extract_failed_action();
}
- action = surf_model_extract_done_action_set(model);
+ action = model->extract_done_action();
while (action != nullptr){
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Done Action: %p", action);
action->unref();
- action = surf_model_extract_done_action_set(model);
+ action = model->extract_done_action();
}
}
} while (running && surf_solve(-1.0) >= 0.0);