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
Flush output of energy tests.
[simgrid.git]
/
src
/
surf
/
network_ib.hpp
diff --git
a/src/surf/network_ib.hpp
b/src/surf/network_ib.hpp
index
b8357fb
..
f132f83
100644
(file)
--- a/
src/surf/network_ib.hpp
+++ b/
src/surf/network_ib.hpp
@@
-7,9
+7,10
@@
#ifndef SURF_NETWORK_IB_HPP_
#define SURF_NETWORK_IB_HPP_
#ifndef SURF_NETWORK_IB_HPP_
#define SURF_NETWORK_IB_HPP_
-#include <xbt/base.h>
+#include "src/surf/network_smpi.hpp"
+#include "xbt/base.h"
-#include
"network_smpi.hpp"
+#include
<map>
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-22,8
+23,8
@@
namespace simgrid {
IBNode* destination;
NetworkAction *action;
double init_rate;
IBNode* destination;
NetworkAction *action;
double init_rate;
- ActiveComm() : destination(
NULL),action(NULL
),init_rate(-1){};
-
~ActiveComm(){}
;
+ ActiveComm() : destination(
nullptr),action(nullptr
),init_rate(-1){};
+
virtual ~ActiveComm() = default
;
};
class IBNode{
};
class IBNode{
@@
-35,8
+36,8
@@
namespace simgrid {
std::map<IBNode*, int> ActiveCommsDown;
//number of comms the node is receiving
int nbActiveCommsDown;
std::map<IBNode*, int> ActiveCommsDown;
//number of comms the node is receiving
int nbActiveCommsDown;
- IBNode(int id) : id(id),nbActiveCommsDown(0){};
-
~IBNode(){}
;
+
explicit
IBNode(int id) : id(id),nbActiveCommsDown(0){};
+
virtual ~IBNode() = default
;
};
class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
};
class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
@@
-45,8
+46,8
@@
namespace simgrid {
void computeIBfactors(IBNode *root);
public:
NetworkIBModel();
void computeIBfactors(IBNode *root);
public:
NetworkIBModel();
- NetworkIBModel(const char *name);
- ~NetworkIBModel();
+
explicit
NetworkIBModel(const char *name);
+ ~NetworkIBModel()
override
;
void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
xbt_dict_t active_nodes;
void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
xbt_dict_t active_nodes;