-/* Copyright (c) 2013-2018. 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 next_occuring_event(double now) override;
void update_actions_state(double now, double delta) override;
- kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+ kernel::resource::Action* execute_parallel(size_t host_nb, sg_host_t* host_list, double* flops_amount,
double* bytes_amount, double rate) override;
};
public:
NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys);
~NetworkL07Model();
- kernel::resource::LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy) override;
+ kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy) override;
kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
bool is_used() override;
void apply_event(tmgr_trace_event_t event, double value) override;
kernel::resource::Action* execution_start(double size) override;
- simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+ simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
{
THROW_UNIMPLEMENTED;
return nullptr;
class L07Action : public CpuAction {
friend Action *CpuL07::execution_start(double size);
friend Action *CpuL07::sleep(double duration);
- friend Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+ 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(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount,
+ 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();
- 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
};
}