A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add all- (or X-) comp. iterations, counting empty iterations too.
[loba.git]
/
hostdata.cpp
diff --git
a/hostdata.cpp
b/hostdata.cpp
index 3ac7b0b540b02f4a5cc3063dadfc0ac2496ae12b..ee8fadce107447fa32c0a3e7da307130ac89758f 100644
(file)
--- a/
hostdata.cpp
+++ b/
hostdata.cpp
@@
-1,43
+1,42
@@
-#include "hostdata.h"
-
-#include <cstring>
#include <algorithm>
#include <algorithm>
+#include <cstring>
+#include <functional>
#include <stdexcept>
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <stdexcept>
#include <xbt/log.h>
#include <xbt/sysdep.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
+
#include "misc.h"
#include "options.h"
#include "misc.h"
#include "options.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
+#include "hostdata.h"
std::vector<hostdata> hostdata::hosts;
std::vector<hostdata> hostdata::hosts;
-// used to compare m_host_t's by name
-struct hostdata::m_host_less {
- bool operator()(const m_host_t& a, const m_host_t& b)
- {
- const char* na = MSG_host_get_name(a);
- const char* nb = MSG_host_get_name(b);
- return strcmp(na, nb) < 0;
- }
-};
-
void hostdata::create()
{
void hostdata::create()
{
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+
int nhosts = MSG_get_host_number();
m_host_t* host_list = MSG_get_host_table();
// only sort hosts for automatically created deployment
if (opt::auto_depl::enabled)
int nhosts = MSG_get_host_number();
m_host_t* host_list = MSG_get_host_table();
// only sort hosts for automatically created deployment
if (opt::auto_depl::enabled)
- std::sort(host_list, host_list + nhosts, m_host_less());
+ std::sort(host_list, host_list + nhosts,
+ std::bind(std::less<int>(),
+ std::bind(strcmp,
+ std::bind(MSG_host_get_name, _1),
+ std::bind(MSG_host_get_name, _2)), 0));
hosts.assign(host_list, host_list + nhosts);
xbt_free(host_list);
e_xbt_log_priority_t logp = xbt_log_priority_verbose;
if (!LOG_ISENABLED(logp))
return;
hosts.assign(host_list, host_list + nhosts);
xbt_free(host_list);
e_xbt_log_priority_t logp = xbt_log_priority_verbose;
if (!LOG_ISENABLED(logp))
return;
-
LOG1(logp, "Got %lu hosts.", (unsigned long)
hosts.size());
+
XBT_LOG(logp, "Got %zu hosts.",
hosts.size());
for (int i = 0; i < nhosts; i++) {
for (int i = 0; i < nhosts; i++) {
-
LOG2
(logp, "Host #%d named \"%s\".", i, hosts[i].get_name());
+
XBT_LOG
(logp, "Host #%d named \"%s\".", i, hosts[i].get_name());
}
}
}
}