X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/d43e446400ac7b65d7d2dd3acd57f8f669484449..c2e3e8bc788aa97edc116a151feb705cf77fce57:/hostdata.cpp?ds=inline diff --git a/hostdata.cpp b/hostdata.cpp index a92527e..ee8fadc 100644 --- a/hostdata.cpp +++ b/hostdata.cpp @@ -1,41 +1,42 @@ -#include "hostdata.h" - -#include <cstring> #include <algorithm> +#include <cstring> +#include <functional> #include <stdexcept> #include <xbt/log.h> -#include "misc.h" +#include <xbt/sysdep.h> XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); -std::vector<hostdata> hostdata::hosts; +#include "misc.h" +#include "options.h" -// 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; - } -}; +#include "hostdata.h" + +std::vector<hostdata> hostdata::hosts; 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(); - // fixme: only sort hosts for automatically created deployment - // fixme: add an option to disable sorting - std::sort(host_list, host_list + nhosts, m_host_less()); + // only sort hosts for automatically created deployment + if (opt::auto_depl::enabled) + 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; - LOG1(logp, "Got %lu hosts.", (unsigned long)hosts.size()); + XBT_LOG(logp, "Got %zu hosts.", hosts.size()); 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()); } }