/* 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 "surf/surf.h"
#include "simgrid/host.h"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/sg_config.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
int main(int argc, char **argv)
{
- double now = -1.0;
int running;
surf_init(&argc, argv); /* Initialize some common structures */
/* Let's do something on it */
hostA->pimpl_cpu->execution_start(1000.0);
hostB->pimpl_cpu->execution_start(1000.0);
- surf_host_sleep(hostB, 7.32);
+ hostB->pimpl_cpu->sleep(7.32);
surf_network_model->communicate(hostA, hostB, 150.0, -1.0);
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;
- now = surf_get_clock();
+ double now = surf_get_clock();
XBT_INFO("Next Event : %g", now);
- for (auto model: *all_existing_models) {
+ for (auto const& model : *all_existing_models) {
if (surf_model_running_action_set_size(model)) {
XBT_DEBUG("\t Running that model");
running = 1;