X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7191e0a0c80df374d7bc4d00696578d106bd03c..12e37132d1b9b141fa8497e17b0629cfd4173c36:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index ea5c913d80..6cba667c1b 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -1,15 +1,11 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-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. */ #include - #include - #include - #include "src/surf/HostImpl.hpp" #ifndef HOST_L07_HPP_ @@ -40,37 +36,33 @@ class XBT_PRIVATE L07Action; class HostL07Model : public HostModel { public: HostL07Model(); - ~HostL07Model(); + ~HostL07Model() override; double next_occuring_event(double now) override; - void updateActionsState(double now, double delta) override; - Action *executeParallelTask(int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount, - double rate) override; + void update_actions_state(double now, double delta) override; + kernel::resource::Action* execute_parallel(size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, + const double* bytes_amount, double rate) override; }; class CpuL07Model : public CpuModel { public: - CpuL07Model(HostL07Model *hmodel,lmm_system_t sys); + CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); ~CpuL07Model(); - Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, - tmgr_trace_t speedTrace, int core) override; - HostL07Model *p_hostModel; + Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; + HostL07Model *hostModel_; }; -class NetworkL07Model : public NetworkModel { +class NetworkL07Model : public kernel::resource::NetworkModel { public: - NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys); + NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); ~NetworkL07Model(); - Link* createLink(const char *name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) override; + kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) override; - Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override; - bool next_occuring_event_isIdempotent() override {return true;} + kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - HostL07Model *p_hostModel; + HostL07Model *hostModel_; }; /************ @@ -79,25 +71,31 @@ public: class CpuL07 : public Cpu { public: - CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, tmgr_trace_t power_trace, int core); - ~CpuL07(); - bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event, double value) override; - Action *execution_start(double size) override; - Action *sleep(double duration) override; + CpuL07(CpuL07Model* model, s4u::Host* host, std::vector* speed_per_pstate, int core); + ~CpuL07() override; + bool is_used() override; + void apply_event(kernel::profile::Event* event, double value) override; + kernel::resource::Action* execution_start(double size) override; + kernel::resource::Action* execution_start(double, int) override + { + THROW_UNIMPLEMENTED; + return nullptr; + } + kernel::resource::Action* sleep(double duration) override; + protected: - void onSpeedChange() override; + void on_speed_change() override; }; -class LinkL07 : public Link { +class LinkL07 : public kernel::resource::LinkImpl { public: - LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, - double bandwidth, double latency, e_surf_link_sharing_policy_t policy); - ~LinkL07(){ }; - bool isUsed() override; - void apply_event(tmgr_trace_iterator_t event, double value) override; - void updateBandwidth(double value) override; - void updateLatency(double value) override; + LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy); + ~LinkL07() override; + bool is_used() override; + void apply_event(kernel::profile::Event* event, double value) override; + void set_bandwidth(double value) override; + void set_latency(double value) override; }; /********** @@ -106,28 +104,28 @@ public: class L07Action : public CpuAction { friend Action *CpuL07::execution_start(double size); friend Action *CpuL07::sleep(double duration); - friend Action *HostL07Model::executeParallelTask(int host_nb, - sg_host_t*host_list, - double *flops_amount, - double *bytes_amount, - double rate); + friend Action* HostL07Model::execute_parallel(size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, + const double* bytes_amount, double rate); + friend Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); + public: - L07Action(Model *model, int host_nb, - sg_host_t*host_list, - double *flops_amount, - double *bytes_amount, - double rate); - ~L07Action(); + L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, + const double* bytes_amount, double rate); + ~L07Action(); void updateBound(); - int unref() override; - - std::vector * p_netcardList = new std::vector(); - double *p_computationAmount; - double *p_communicationAmount; - double m_latency; - double m_rate; + std::vector hostList_; + const double* computationAmount_; /* pointer to the data that lives in s4u action -- do not free unless if + * free_arrays */ + const double* communicationAmount_; /* pointer to the data that lives in s4u action -- do not free unless if + * free_arrays */ + double latency_; + double rate_; + +private: + bool free_arrays_ = false; // By default, computationAmount_ and friends are freed by caller. But not for sequential + // exec and regular comms }; }