From 1789eecd7c4b239e5a521231387b9d30731cdf64 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 30 Apr 2018 11:52:38 +0200
Subject: [PATCH] Drop support for SimGrid version before 3.7.
---
hostdata.cpp | 5 -----
simgrid_features.h | 12 ++++++------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/hostdata.cpp b/hostdata.cpp
index 403e13c..88ca6fd 100644
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -19,14 +19,9 @@ 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();
- 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<msg_host_t*>(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,
diff --git a/simgrid_features.h b/simgrid_features.h
index 4bcbb62..00ff3a7 100644
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -3,19 +3,19 @@
#include <simgrid_config.h>
-#if !defined(SIMGRID_VERSION) // ==================== SimGrid <= 3.5 === //
-# error "Unsupported SimGrid version. Need version > 3.5"
-#endif // ============================================================== //
+#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 30700UL // == SG < 3.7 == //
+# error "Unsupported SimGrid version. Need version >= 3.7"
+#endif // ================================================================== //
-#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 8, 0) // ==== SG < 3.8 === //
+#if SIMGRID_VERSION < 30800UL // ============================== SG < 3.8 === //
# define MSG_init(argc, argv) MSG_global_init(argc, argv)
# define msg_error_t MSG_error_t
# define msg_host_t m_host_t
# define msg_process_t m_process_t
# define msg_task_t m_task_t
-#else // =============================================================== //
+#else // =================================================================== //
# define MSG_clean() MSG_OK
-#endif // ============================================================== //
+#endif // ================================================================== //
#endif // !SIMGRID_FEATURES_H
--
2.39.5