From fc8857bd24b1a222e1d1466a34d7f17bc9513544 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 3 Sep 2016 15:45:17 +0200 Subject: [PATCH] make the NS3 network model more visible --- src/include/surf/surf.h | 2 -- src/surf/surf_interface.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 9a7ae1a1c5..ea2b4bdcfa 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -541,7 +541,6 @@ XBT_PUBLIC(void) surf_network_model_init_Constant(); */ XBT_PUBLIC(void) surf_network_model_init_CM02(); -#if HAVE_NS3 /** \ingroup SURF_models * \brief Initializes the platform with the network model NS3 * @@ -551,7 +550,6 @@ XBT_PUBLIC(void) surf_network_model_init_CM02(); * \see surf_host_model_init_NS3() */ XBT_PUBLIC(void) surf_network_model_init_NS3(); -#endif /** \ingroup SURF_models * \brief Initializes the platform with the network model Reno diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index c18df99d40..ac574f2df3 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -64,9 +64,7 @@ s_surf_model_description_t surf_network_model_description[] = { surf_network_model_init_IB}, {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", surf_network_model_init_CM02}, -#if HAVE_NS3 {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3}, -#endif {"Reno", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Reno}, {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", @@ -84,6 +82,11 @@ void surf_network_model_init_IB() { xbt_die("Please activate SMPI support in cmake to use the IB network model."); } #endif +#if !HAVE_NS3 +void surf_network_model_init_NS3() { + xbt_die("Please activate NS3 support in cmake and install the dependencies to use the NS3 network model."); +} +#endif s_surf_model_description_t surf_cpu_model_description[] = { {"Cas01", "Simplistic CPU model (time=size/power).", surf_cpu_model_init_Cas01}, -- 2.20.1