X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7444a715278a4bad33c0200162286c50f03bcaef..3cbf54871089cc3dc50b6832652b5765e1601039:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 7872929702..b6f81fd0c4 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -147,11 +147,11 @@ SIMIX_execution_start(const char* name, double flops_amount, double priority, do if (not MC_is_active() && not MC_record_replay_is_active()) { exec->surfAction_ = host->pimpl_cpu->execution_start(flops_amount); - exec->surfAction_->setData(exec.get()); - exec->surfAction_->setSharingWeight(priority); + exec->surfAction_->set_data(exec.get()); + exec->surfAction_->set_priority(priority); if (bound > 0) - static_cast(exec->surfAction_)->setBound(bound); + static_cast(exec->surfAction_)->set_bound(bound); } XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str()); @@ -182,10 +182,10 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li sg_host_t* host_list_cpy = new sg_host_t[host_nb]; std::copy_n(host_list, host_nb, host_list_cpy); exec->surfAction_ = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - exec->surfAction_->setData(exec.get()); + exec->surfAction_->set_data(exec.get()); if (timeout > 0) { exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); - exec->timeoutDetector->setData(exec.get()); + exec->timeoutDetector->set_data(exec.get()); } } XBT_DEBUG("Create parallel execute synchro %p", exec.get()); @@ -280,13 +280,13 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category) simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(synchro); if (exec != nullptr) { - exec->surfAction_->setCategory(category); + exec->surfAction_->set_category(category); return; } simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { - comm->surfAction_->setCategory(category); + comm->surfAction_->set_category(category); } }