-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2020. 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. */
HostL07Model& operator=(const HostL07Model&) = delete;
~HostL07Model() override;
- double next_occuring_event(double now) override;
+ double next_occurring_event(double now) override;
void update_actions_state(double now, double delta) override;
- kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
- const double* bytes_amount, double rate) override;
+ kernel::resource::CpuAction* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+ const double* bytes_amount, double rate) override;
};
class CpuL07Model : public kernel::resource::CpuModel {
NetworkL07Model(const NetworkL07Model&) = delete;
NetworkL07Model& operator=(const NetworkL07Model&) = delete;
~NetworkL07Model();
- kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy) override;
+ kernel::resource::LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths,
+ double latency, s4u::Link::SharingPolicy policy) override;
kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
~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
+ kernel::resource::CpuAction* execution_start(double size) override;
+ kernel::resource::CpuAction* execution_start(double, int) override
{
THROW_UNIMPLEMENTED;
return nullptr;
}
- kernel::resource::Action* sleep(double duration) override;
+ kernel::resource::CpuAction* sleep(double duration) override;
protected:
void on_speed_change() override;
* Action *
**********/
class L07Action : public kernel::resource::CpuAction {
- friend Action *CpuL07::execution_start(double size);
- friend Action *CpuL07::sleep(double duration);
- friend Action* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
- const double* bytes_amount, double rate);
+ std::vector<s4u::Host*> hostList_;
+ bool free_arrays_ = false; // By default, computationAmount_ and friends are freed by caller. But not for sequential
+ // exec and regular comms
+ 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_;
+
+ friend CpuAction* CpuL07::execution_start(double size);
+ friend CpuAction* CpuL07::sleep(double duration);
+ friend CpuAction* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& 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();
void updateBound();
-
- std::vector<s4u::Host*> 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
+ double get_latency() const { return latency_; }
+ void set_latency(double latency) { latency_ = latency; }
+ void update_latency(double delta, double precision) { double_update(&latency_, delta, precision); }
};
} // namespace surf