X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c9ba8fe774965e25baca201356dd6da90f9bb5d..c9309ca5ce7b71208ec162d803972feabe4e42da:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index 4a2d68dc9a..3b944a36bd 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ class NetworkL07Model : public NetworkModel { public: NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys); ~NetworkL07Model(); - LinkImpl* createLink(const char* name, double bandwidth, double latency, + LinkImpl* createLink(const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) override; Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; @@ -75,7 +75,7 @@ public: CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector * speedPerPstate, int core); ~CpuL07() override; bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event, double value) override; + void apply_event(tmgr_trace_event_t event, double value) override; Action *execution_start(double size) override; Action *sleep(double duration) override; protected: @@ -84,11 +84,11 @@ protected: class LinkL07 : public LinkImpl { public: - LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency, + LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy); ~LinkL07() override; bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event, double value) override; + void apply_event(tmgr_trace_event_t event, double value) override; void setBandwidth(double value) override; void setLatency(double value) override; };