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
fix make distcheck with documentation
[simgrid.git]
/
src
/
surf
/
network_ib.hpp
diff --git
a/src/surf/network_ib.hpp
b/src/surf/network_ib.hpp
index
f132f83
..
df41a88
100644
(file)
--- a/
src/surf/network_ib.hpp
+++ b/
src/surf/network_ib.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-201
5
. The SimGrid Team.
+/* Copyright (c) 2014-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-10,7
+10,8
@@
#include "src/surf/network_smpi.hpp"
#include "xbt/base.h"
#include "src/surf/network_smpi.hpp"
#include "xbt/base.h"
-#include <map>
+#include <unordered_map>
+#include <vector>
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-42,7
+43,7
@@
namespace simgrid {
class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
private:
class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
private:
- void updateIBfactors_rec(IBNode
*root, bool*
updatedlist);
+ void updateIBfactors_rec(IBNode
* root, std::vector<bool>&
updatedlist);
void computeIBfactors(IBNode *root);
public:
NetworkIBModel();
void computeIBfactors(IBNode *root);
public:
NetworkIBModel();
@@
-50,8
+51,8
@@
namespace simgrid {
~NetworkIBModel() override;
void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
~NetworkIBModel() override;
void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
-
xbt_dict_t
active_nodes;
- std::
map<NetworkAction *, std::pair<IBNode*,IBNode*>
> active_comms;
+
std::unordered_map<std::string, IBNode*>
active_nodes;
+ std::
unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>
> active_comms;
double Bs;
double Be;
double Bs;
double Be;