A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now it works (if you don't look at the leaks)
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
998d260
..
a5987f5
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-6,21
+6,15
@@
#ifndef SURF_MODEL_H_
#define SURF_MODEL_H_
#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 "surf/surf_routing.h"
+#include "xbt/str.h"
#include <boost/intrusive/list.hpp>
#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
#define NO_MAX_DURATION -1.0
@@
-35,7
+29,7
@@
extern XBT_PRIVATE double sg_latency_factor;
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 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);
extern "C" {
XBT_PUBLIC(double) surf_get_clock(void);
@@
-114,14
+108,6
@@
public:
not_in_the_system /**< Not in the system anymore. Why did you ask ? */
};
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
*
/**
* @brief Action constructor
*
@@
-229,7
+215,7
@@
public:
s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr};
s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr};
- simgrid::surf::Model
*getModel() {return model_;
}
+ simgrid::surf::Model
* getModel() { return model_;
}
protected:
ActionList* stateSet_;
protected:
ActionList* stateSet_;
@@
-395,10
+381,10
@@
public:
virtual ~Resource();
/** @brief Get the Model of the current Resource */
virtual ~Resource();
/** @brief Get the Model of the current Resource */
- Model
*getM
odel() const;
+ Model
* m
odel() const;
/** @brief Get the name of the current Resource */
/** @brief Get the name of the current Resource */
- const char
*getN
ame() const;
+ const char
* cn
ame() const;
bool operator==(const Resource &other) const;
bool operator==(const Resource &other) const;
@@
-429,7
+415,8
@@
private:
public: /* LMM */
/** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */
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:
const lmm_constraint_t constraint_ = nullptr;
};
protected:
const lmm_constraint_t constraint_ = nullptr;
};
@@
-443,7
+430,7
@@
namespace std {
{
std::size_t operator()(const simgrid::surf::Resource& r) const
{
{
std::size_t operator()(const simgrid::surf::Resource& r) const
{
- return (std::size_t) xbt_str_hash(r.
getN
ame());
+ return (std::size_t) xbt_str_hash(r.
cn
ame());
}
};
}
}
};
}