-/* Copyright (c) 2013-2017. 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. */
class HostL07Model : public HostModel {
public:
HostL07Model();
- ~HostL07Model();
+ ~HostL07Model() override;
- double nextOccuringEvent(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;
+ double next_occuring_event(double now) override;
+ void update_actions_state(double now, double delta) override;
+ kernel::resource::Action* execute_parallel(size_t host_nb, sg_host_t* host_list, double* flops_amount,
+ 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, std::vector<double> *speedPerPstate, int core) override;
+ Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* 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();
- LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy) override;
+ kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy) override;
- Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+ kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
HostL07Model *hostModel_;
};
class CpuL07 : public Cpu {
public:
- CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> * speedPerPstate, int core);
+ CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
~CpuL07() override;
- bool isUsed() override;
+ bool is_used() override;
void apply_event(tmgr_trace_event_t event, double value) override;
- Action *execution_start(double size) override;
- Action *sleep(double duration) override;
+ kernel::resource::Action* execution_start(double size) override;
+ simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
+ {
+ THROW_UNIMPLEMENTED;
+ return nullptr;
+ }
+ kernel::resource::Action* sleep(double duration) override;
+
protected:
- void onSpeedChange() override;
+ void on_speed_change() override;
};
-class LinkL07 : public LinkImpl {
+class LinkL07 : public kernel::resource::LinkImpl {
public:
LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy);
+ s4u::Link::SharingPolicy policy);
~LinkL07() override;
- bool isUsed() override;
+ bool is_used() override;
void apply_event(tmgr_trace_event_t event, double value) override;
- void setBandwidth(double value) override;
- void setLatency(double value) override;
+ void set_bandwidth(double value) override;
+ void set_latency(double value) override;
};
/**********
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, sg_host_t* host_list, double* flops_amount,
+ 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, sg_host_t* host_list, double* flops_amount,
+ double* bytes_amount, double rate);
+ ~L07Action();
void updateBound();
- int unref() override;
-
- std::vector<s4u::Host*>* hostList_ = new std::vector<s4u::Host*>();
- double *computationAmount_;
- double *communicationAmount_;
+ std::vector<s4u::Host*> hostList_;
+ double* computationAmount_; /* pointer to the data that lives in s4u action -- do not free unless if free_arrays */
+ 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
};
}