#ifndef SURF_MODEL_H_
#define SURF_MODEL_H_
-#include <cstddef>
+#include "xbt/signal.hpp"
-#include <xbt.h>
-#include <memory>
-#include <utility>
+#include "src/surf/surf_private.h"
+#include "surf/surf.h"
+#include "xbt/str.h"
#include <boost/intrusive/list.hpp>
-
-#include <xbt/signal.hpp>
-
-#include "xbt/lib.h"
-#include "surf/surf_routing.h"
-#include "surf/surf.h"
-#include "src/surf/surf_private.h"
-#include "src/internal_config.h"
+#include <string>
#define NO_MAX_DURATION -1.0
extern XBT_PRIVATE double sg_bandwidth_factor;
extern XBT_PRIVATE double sg_weight_S_parameter;
extern XBT_PRIVATE int sg_network_crosstraffic;
-extern XBT_PRIVATE xbt_dynar_t surf_path;
+extern XBT_PRIVATE std::vector<std::string> surf_path;
extern "C" {
-XBT_PUBLIC(double) surf_get_clock(void);
+XBT_PUBLIC(double) surf_get_clock();
}
/** \ingroup SURF_simulation
* \brief List of hosts that have just restarted and whose autorestart process should be restarted.
namespace simgrid {
namespace surf {
-extern XBT_PRIVATE simgrid::xbt::signal<void(void)> surfExitCallbacks;
-
+extern XBT_PRIVATE simgrid::xbt::signal<void()> surfExitCallbacks;
}
}
int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path);
-static inline char* sg_storage_name(sg_storage_t storage) {
- return storage->key;
-}
-
/***********
* Classes *
***********/
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
-private:
- /**
- * @brief Common initializations for the constructors
- */
- void initialize(simgrid::surf::Model *model, double cost, bool failed,
- lmm_variable_t var = nullptr);
-
-public:
/**
* @brief Action constructor
*
s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr};
- simgrid::surf::Model *getModel() {return model_;}
+ simgrid::surf::Model* getModel() { return model_; }
protected:
ActionList* stateSet_;
* The only model that is not is NS3: computing the next timestamp moves the model up to that point,
* so we need to call it only when the next timestamp of other sources is computed.
*/
- virtual bool next_occuring_event_isIdempotent()=0;
+ virtual bool nextOccuringEventIsIdempotent() { return true;}
protected:
ActionLmmListPtr modifiedSet_;
typedef struct {
double peak; /**< The peak of the metric, ie its max value */
double scale; /**< Current availability of the metric according to the traces, in [0,1] */
- tmgr_trace_iterator_t event; /**< The associated trace event associated to the metric */
+ tmgr_trace_event_t event; /**< The associated trace event associated to the metric */
} s_surf_metric_t;
namespace simgrid {
*/
XBT_PUBLIC_CLASS Resource {
public:
- /**
- * @brief Constructor of non-LMM Resources
- *
- * @param model Model associated to this Resource
- * @param name The name of the Resource
- */
- Resource(Model *model, const char *name);
-
/**
* @brief Constructor of LMM Resources
*
virtual ~Resource();
/** @brief Get the Model of the current Resource */
- Model *getModel() const;
+ Model* model() const;
/** @brief Get the name of the current Resource */
- const char *getName() const;
+ const char* cname() const;
bool operator==(const Resource &other) const;
* @param event What happened
* @param value [TODO]
*/
- virtual void apply_event(tmgr_trace_iterator_t event, double value)=0;
+ virtual void apply_event(tmgr_trace_event_t event, double value) = 0;
/** @brief Check if the current Resource is used (if it currently serves an action) */
virtual bool isUsed()=0;
virtual void turnOff();
private:
- const char *name_;
+ std::string name_;
Model *model_;
bool isOn_ = true;
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
- lmm_constraint_t getConstraint() const;
+ lmm_constraint_t constraint() const;
+
protected:
- lmm_constraint_t constraint_ = nullptr;
+ const lmm_constraint_t constraint_ = nullptr;
};
}
{
std::size_t operator()(const simgrid::surf::Resource& r) const
{
- return (std::size_t) xbt_str_hash(r.getName());
+ return (std::size_t) xbt_str_hash(r.cname());
}
};
}