/* A few basic tests for the surf library */
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2018. 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 <stdio.h>
-#include "simgrid/sg_config.h"
-#include "surf/surf.h"
-#include "surf/surfxml_parse.h" // for reset callback
+#include "simgrid/host.h"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/network_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.hpp"
-#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
- "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
-const char *string_action(e_surf_action_state_t state);
-const char *string_action(e_surf_action_state_t state)
+static const char* string_action(simgrid::kernel::resource::Action::State state)
{
switch (state) {
- case (SURF_ACTION_READY):
- return "SURF_ACTION_READY";
- case (SURF_ACTION_RUNNING):
- return "SURF_ACTION_RUNNING";
- case (SURF_ACTION_FAILED):
- return "SURF_ACTION_FAILED";
- case (SURF_ACTION_DONE):
- return "SURF_ACTION_DONE";
- case (SURF_ACTION_NOT_IN_THE_SYSTEM):
- return "SURF_ACTION_NOT_IN_THE_SYSTEM";
- default:
- return "INVALID STATE";
+ 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:
+ return "SURF_ACTION_FAILED";
+ case simgrid::kernel::resource::Action::State::FINISHED:
+ return "SURF_ACTION_DONE";
+ case simgrid::kernel::resource::Action::State::IGNORED:
+ return "SURF_ACTION_IGNORED";
+ default:
+ return "INVALID STATE";
}
}
-void test(char *platform);
-void test(char *platform)
+int main(int argc, char **argv)
{
- sg_host_t hostA = NULL;
- sg_host_t hostB = NULL;
- surf_action_t actionA = NULL;
- surf_action_t actionB = NULL;
- surf_action_t actionC = NULL;
- e_surf_action_state_t stateActionA;
- e_surf_action_state_t stateActionB;
- e_surf_action_state_t stateActionC;
- double now = -1.0;
- xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
- xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
- parse_platform_file(platform);
-
- /*********************** CPU ***********************************/
- XBT_DEBUG("%p", surf_cpu_model_pm);
- hostA = sg_host_by_name("Cpu A");
- hostB = sg_host_by_name("Cpu B");
-
- /* Let's check that those two processors exist */
- XBT_DEBUG("%s : %p", surf_cpu_name(hostA->p_cpu), hostA);
- XBT_DEBUG("%s : %p", surf_cpu_name(hostB->p_cpu), hostB);
+ surf_init(&argc, argv); /* Initialize some common structures */
+ 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_DEBUG("CPU model: %p", surf_cpu_model_pm);
+ XBT_DEBUG("Network model: %p", surf_network_model);
+ simgrid::s4u::Host* hostA = sg_host_by_name("Cpu A");
+ simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
/* Let's do something on it */
- actionA = surf_host_execute(hostA, 1000.0);
- actionB = surf_host_execute(hostB, 1000.0);
- actionC = surf_host_sleep(hostB, 7.32);
+ simgrid::kernel::resource::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0);
+ simgrid::kernel::resource::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0);
+ simgrid::kernel::resource::Action* actionC = hostB->pimpl_cpu->sleep(7.32);
- /* Use whatever calling style you want... */
- stateActionA = surf_action_get_state(actionA); /* When you know actionA model type */
- stateActionB = surf_action_get_state(actionB); /* If you're unsure about it's model type */
- stateActionC = surf_action_get_state(actionC); /* When you know actionA model type */
+ simgrid::kernel::resource::Action::State stateActionA = actionA->get_state();
+ simgrid::kernel::resource::Action::State stateActionB = actionB->get_state();
+ simgrid::kernel::resource::Action::State stateActionC = actionC->get_state();
/* And just look at the state of these tasks */
- XBT_DEBUG("actionA : %p (%s)", actionA, string_action(stateActionA));
- XBT_DEBUG("actionB : %p (%s)", actionB, string_action(stateActionB));
- XBT_DEBUG("actionC : %p (%s)", actionB, string_action(stateActionC));
+ XBT_INFO("actionA state: %s", string_action(stateActionA));
+ XBT_INFO("actionB state: %s", string_action(stateActionB));
+ XBT_INFO("actionC state: %s", string_action(stateActionC));
- /*********************** Network *******************************/
- XBT_DEBUG("%p", surf_network_model);
/* Let's do something on it */
- surf_network_model_communicate(surf_network_model, hostA, hostB, 150.0, -1.0);
+ surf_network_model->communicate(hostA, hostB, 150.0, -1.0);
- surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
+ surf_solve(-1.0);
do {
- surf_action_t action = NULL;
- now = surf_get_clock();
- XBT_DEBUG("Next Event : %g", now);
+ XBT_INFO("Next Event : %g", surf_get_clock());
XBT_DEBUG("\t CPU actions");
- while ((action =
- surf_model_extract_failed_action_set((surf_model_t)surf_cpu_model_pm))) {
- XBT_DEBUG("\t * Failed : %p", action);
- surf_action_unref(action);
+
+ 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");
+ XBT_DEBUG("\t * Failed : %p", &action);
+ action.unref();
}
- while ((action =
- surf_model_extract_done_action_set((surf_model_t)surf_cpu_model_pm))) {
- XBT_DEBUG("\t * Done : %p", action);
- surf_action_unref(action);
+
+ 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");
+ XBT_DEBUG("\t * Done : %p", &action);
+ action.unref();
}
- XBT_DEBUG("\t Network actions");
- while ((action =
- surf_model_extract_failed_action_set((surf_model_t)surf_network_model))) {
- XBT_DEBUG("\t * Failed : %p", action);
- surf_action_unref(action);
+
+ 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");
+ XBT_DEBUG("\t * Failed : %p", &action);
+ action.unref();
}
- while ((action =
- surf_model_extract_done_action_set((surf_model_t)surf_network_model))) {
- XBT_DEBUG("\t * Done : %p", action);
- surf_action_unref(action);
+
+ 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");
+ XBT_DEBUG("\t * Done : %p", &action);
+ action.unref();
}
- } while ((surf_model_running_action_set_size((surf_model_t)surf_network_model) ||
- surf_model_running_action_set_size((surf_model_t)surf_cpu_model_pm)) &&
- 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");
-}
-
-int main(int argc, char **argv)
-{
- surf_init(&argc, argv); /* Initialize some common structures */
- if (argc == 1) {
- fprintf(stderr, "Usage : %s platform.xml\n", argv[0]);
- return 1;
- }
- test(argv[1]);
- surf_exit();
return 0;
}
