-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2017. 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 <xbt/base.h>
#include "network_interface.hpp"
-#include "xbt/fifo.h"
#include "xbt/graph.h"
-
/***********
* Classes *
***********/
namespace simgrid {
-namespace surf {
+ namespace surf {
-class XBT_PRIVATE NetworkCm02Model;
-class XBT_PRIVATE NetworkCm02Action;
-class XBT_PRIVATE NetworkSmpiModel;
+ class XBT_PRIVATE NetworkCm02Model;
+ class XBT_PRIVATE NetworkCm02Action;
+ class XBT_PRIVATE NetworkSmpiModel;
+ }
}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
/*********
* Model *
class NetworkCm02Model : public NetworkModel {
public:
NetworkCm02Model();
- ~NetworkCm02Model() { }
- Link* createLink(const char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- int initiallyOn,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties) override;
- void addTraces() override;
+ explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self));
+ 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;
- Action *communicate(NetCard *src, NetCard *dst,
- double size, double rate) override;
- bool shareResourcesIsIdempotent() override {return true;}
- virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+ 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 m_haveGap = false;
+ bool haveGap_ = false;
};
/************
* Resource *
************/
-class NetworkCm02Link : public Link {
+class NetworkCm02Link : public LinkImpl {
public:
- NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
- lmm_system_t system,
- double constraint_value,
- int initiallyOn,
- tmgr_trace_t state_trace,
- double metric_peak,
- tmgr_trace_t metric_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_link_sharing_policy_t policy);
- void updateState(tmgr_trace_iterator_t event_type, double value) override;
- void updateBandwidth(double value) override;
- void updateLatency(double value) override;
- virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-
-
+ NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy, lmm_system_t 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);
};
-
/**********
* Action *
**********/
class NetworkCm02Action : public NetworkAction {
- friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
+ friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
friend NetworkSmpiModel;
public:
- NetworkCm02Action(Model *model, double cost, bool failed)
- : NetworkAction(model, cost, failed) {};
- void updateRemainingLazy(double now);
+ NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+ virtual ~NetworkCm02Action() = default;
+ void updateRemainingLazy(double now) override;
+
protected:
- double m_senderGap;
+ double senderGap_;
};
-
}
}