X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6d03a0a88c2673c9e5c604d63912b77bc17fdd4..c8f4cd32fa6bfe50360ed8c9f61aa43b33d4e005:/src/instr/jedule/jedule_sd_binding.cpp diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp index e22d6a8e6e..1541655160 100644 --- a/src/instr/jedule/jedule_sd_binding.cpp +++ b/src/instr/jedule/jedule_sd_binding.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ @@ -22,23 +22,23 @@ void jedule_log_sd_event(SD_task_t task) jed_event_t event = new simgrid::jedule::Event(std::string(SD_task_get_name(task)), SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD"); - event->addResources(task->allocation); - my_jedule->event_set.push_back(event); + event->add_resources(task->allocation); + my_jedule->event_set_.push_back(event); } void jedule_sd_init() { - sg_netzone_t root_comp = simgrid::s4u::Engine::instance()->netRoot(); - XBT_DEBUG("root name %s\n", root_comp->name()); + sg_netzone_t root_comp = simgrid::s4u::Engine::get_instance()->get_netzone_root(); + XBT_DEBUG("root name %s\n", root_comp->get_cname()); my_jedule = new simgrid::jedule::Jedule(); - jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->name())); - root_container->createHierarchy(root_comp); - my_jedule->root_container = root_container; + jed_container_t root_container = new simgrid::jedule::Container(root_comp->get_name()); + root_container->create_hierarchy(root_comp); + my_jedule->root_container_ = root_container; } -void jedule_sd_exit(void) +void jedule_sd_exit() { delete my_jedule; } @@ -47,7 +47,7 @@ void jedule_sd_dump(const char * filename) { if (my_jedule) { char *fname; - if (!filename) { + if (not filename) { fname = bprintf("%s.jed", xbt_binary_name); } else { fname = xbt_strdup(filename); @@ -55,7 +55,7 @@ void jedule_sd_dump(const char * filename) FILE *fh = fopen(fname, "w"); - my_jedule->writeOutput(fh); + my_jedule->write_output(fh); fclose(fh); xbt_free(fname);