/* A few basic tests for the surf library */
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/zone.h"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
int main(int argc, char** argv)
{
simgrid::s4u::Engine e(&argc, argv);
- e.set_config("cpu/model:Cas01");
- e.set_config("network/model:CM02");
+ simgrid::s4u::Engine::set_config("cpu/model:Cas01");
+ simgrid::s4u::Engine::set_config("network/model:CM02");
xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
e.load_platform(argv[1]);
/* Let's do something on it */
net_model->communicate(hostA, hostB, 150.0, -1.0);
- surf_solve(-1.0);
+ e.get_impl()->solve(-1.0);
do {
- XBT_INFO("Next Event : %g", e.get_clock());
+ XBT_INFO("Next Event : %g", simgrid::s4u::Engine::get_clock());
XBT_DEBUG("\t CPU actions");
simgrid::kernel::resource::Action::StateSet* action_list = cpu_model_pm->get_failed_action_set();
action.unref();
}
} while ((net_model->get_started_action_set()->size() || cpu_model_pm->get_started_action_set()->size()) &&
- surf_solve(-1.0) >= 0.0);
+ e.get_impl()->solve(-1.0) >= 0.0);
XBT_DEBUG("Simulation Terminated");