X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/80a1fe1a200a4309c36598571b1f4ccb76a8788f..01d46f8470e36e1823d897496e0d915770bc867b:/hostdata.cpp diff --git a/hostdata.cpp b/hostdata.cpp index ee8fadc..403e13c 100644 --- a/hostdata.cpp +++ b/hostdata.cpp @@ -19,8 +19,14 @@ void hostdata::create() using std::placeholders::_1; using std::placeholders::_2; +#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 7, 0) int nhosts = MSG_get_host_number(); - m_host_t* host_list = MSG_get_host_table(); + msg_host_t* host_list = MSG_get_host_table(); +#else // API changed with SG 3.7.0 + xbt_dynar_t host_dynar = MSG_hosts_as_dynar(); + int nhosts = xbt_dynar_length(host_dynar); + msg_host_t* host_list = static_cast(xbt_dynar_to_array(host_dynar)); +#endif // only sort hosts for automatically created deployment if (opt::auto_depl::enabled) std::sort(host_list, host_list + nhosts, @@ -45,7 +51,7 @@ void hostdata::destroy() // hosts are automatically destroyed... } -hostdata::hostdata(m_host_t host) +hostdata::hostdata(msg_host_t host) : name(MSG_host_get_name(host)) , ctrl_mbox(std::string(name) + "_ctrl") , data_mbox(std::string(name) + "_data")