-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. 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. */
***********/
namespace simgrid {
- namespace surf {
+namespace kernel {
+namespace resource {
- class XBT_PRIVATE NetworkCm02Model;
- class XBT_PRIVATE NetworkCm02Action;
- class XBT_PRIVATE NetworkSmpiModel;
-
- }
-}
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
/*********
* Model *
*********/
-namespace simgrid {
-namespace surf {
-
class NetworkCm02Model : public NetworkModel {
public:
- NetworkCm02Model();
- explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
+ explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
virtual ~NetworkCm02Model() = default;
- LinkImpl* createLink(const char* name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy) override;
- void updateActionsStateLazy(double now, double delta) override;
- void updateActionsStateFull(double now, double delta) override;
+ LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy) override;
+ void update_actions_state_lazy(double now, double delta) override;
+ void update_actions_state_full(double now, double delta) override;
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
- virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
-
-protected:
- bool haveGap_ = false;
};
/************
class NetworkCm02Link : public LinkImpl {
public:
- NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency,
- e_surf_link_sharing_policy_t policy, lmm_system_t system);
+ NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy, lmm::System* system);
virtual ~NetworkCm02Link() = default;
void apply_event(tmgr_trace_event_t event, double value) override;
- void setBandwidth(double value) override;
- void setLatency(double value) override;
- virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action);
+ void set_bandwidth(double value) override;
+ void set_latency(double value) override;
};
/**********
public:
NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
virtual ~NetworkCm02Action() = default;
- void updateRemainingLazy(double now) override;
-
-protected:
- double senderGap_;
+ void update_remains_lazy(double now) override;
};
}
}
-
+} // namespace simgrid
#endif /* SURF_NETWORK_CM02_HPP_ */