X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/b4d90a50ce65a5efb75c0a28b269120ea51d57cf..HEAD:/process.h?ds=sidebyside diff --git a/process.h b/process.h index 14d514f..f01c3c6 100644 --- a/process.h +++ b/process.h @@ -1,27 +1,18 @@ #ifndef PROCESS_H #define PROCESS_H -#define USE_UNORDERED_MAP 1 -//#undef USE_UNORDERED_MAP - #include -#include -#ifdef USE_UNORDERED_MAP -# include -# define MAP_TEMPLATE std::unordered_map -#else -# include -# define MAP_TEMPLATE std::map -#endif +#include +#include #include -#include +#include #include -#include "atomic_compat.h" #include "communicator.h" #include "misc.h" #include "msg_thread.h" #include "neighbor.h" #include "options.h" +#include "simgrid_features.h" #include "synchro.h" class process { @@ -102,10 +93,10 @@ private: static std::atomic convergence_counter; - typedef MAP_TEMPLATE rev_neigh_type; + typedef std::unordered_map rev_neigh_type; neigh_type neigh; // list of neighbors (do not alter // after construction!) - rev_neigh_type rev_neigh; // map m_host_t -> neighbor + rev_neigh_type rev_neigh; // map msg_host_t -> neighbor communicator comm; // communicator for this process int ctrl_close_pending; // number of "close" messages to wait @@ -198,18 +189,16 @@ private: // infinite waiting, or any positive timeout. void ctrl_receive(double timeout); void data_receive(double timeout); - void handle_message(message* msg, m_host_t from); + void handle_message(message* msg, msg_host_t from); }; template void process::pneigh_sort_by_load(const Compare& comp) { - using std::placeholders::_1; - using std::placeholders::_2; std::sort(pneigh.begin(), pneigh.end(), - std::bind(comp, - std::bind(&neighbor::get_load, _1), - std::bind(&neighbor::get_load, _2))); + [&comp](const neighbor* a, const neighbor* b) { + return comp(a->get_load(), b->get_load()); + }); } #endif // !PROCESS_H