From: Martin Quinson Date: Fri, 4 Mar 2016 10:01:38 +0000 (+0100) Subject: kill the latency_bound experiment in our codebase X-Git-Tag: v3_13~568 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/003b7aaee07e00a400955049410d4dc5165417c4 kill the latency_bound experiment in our codebase --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fd5fe393de..914ee76c7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -375,12 +375,6 @@ if(enable_jedule) set(HAVE_JEDULE 1) endif() -if(enable_latency_bound_tracking) - SET(HAVE_LATENCY_BOUND_TRACKING 1) -else() - SET(HAVE_LATENCY_BOUND_TRACKING 0) -endif() - if(enable_mallocators) SET(MALLOCATOR_IS_WANTED 1) else() diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc index 10d3360b6a..bc070bebbd 100644 --- a/doc/doxygen/install.doc +++ b/doc/doxygen/install.doc @@ -216,9 +216,6 @@ accepts several options, as listed below. @li enable_ns3 (ON/OFF): whether you want to use ns3. See section @ref pls_simgrid_configuration_ns3. @li NS3_HINT (path): Where to search for NS3 (eg /usr or /opt). - @li enable_latency_bound_tracking (ON/OFF): enable it if you - want to be warned when communications are limited by round trip - time while doing packet-level simulation. @li enable_documentation (ON/OFF) : whether the documentation should be generated during the compilation. Default is ON. diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c index 83758ac032..19d2b0b588 100644 --- a/examples/msg/gtnets/gtnets.c +++ b/examples/msg/gtnets/gtnets.c @@ -74,9 +74,6 @@ static int master(int argc, char *argv[]) static int slave(int argc, char *argv[]) { msg_task_t task = NULL; -#ifdef HAVE_LATENCY_BOUND_TRACKING - int limited_latency = 0; -#endif double remaining = 0; char id_alias[10]; @@ -103,25 +100,12 @@ static int slave(int argc, char *argv[]) for (id = 0; id < NTASKS; id++) { if (gl_task_array[id] == NULL) continue; if (gl_task_array[id] == task) { -#ifdef HAVE_LATENCY_BOUND_TRACKING - limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]); - if (limited_latency) { - XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id); - } -#endif XBT_INFO ("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f", id, gl_data_size[id] / elapsed_time, masternames[id], slavenames[id], 0.0); MSG_task_destroy(gl_task_array[id]); gl_task_array[id]=NULL; } else { remaining = MSG_task_get_remaining_communication(gl_task_array[id]); -#ifdef HAVE_LATENCY_BOUND_TRACKING - limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]); - - if (limited_latency) { - XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id); - } -#endif XBT_INFO ("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f", id, (gl_data_size[id] - remaining) / elapsed_time, masternames[id], slavenames[id], remaining); if(remaining==0) { diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 5eff1ca084..5e930ff5ec 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -423,10 +423,6 @@ XBT_PUBLIC(void *) simcall_comm_get_dst_data(smx_synchro_t comm); XBT_PUBLIC(smx_process_t) simcall_comm_get_src_proc(smx_synchro_t comm); XBT_PUBLIC(smx_process_t) simcall_comm_get_dst_proc(smx_synchro_t comm); -#ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) simcall_comm_is_latency_bounded(smx_synchro_t comm); -#endif - /************************** Tracing handling **********************************/ XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *category); diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in index 0f4db4c84c..47e50f554f 100644 --- a/include/simgrid_config.h.in +++ b/include/simgrid_config.h.in @@ -48,9 +48,6 @@ /* Define if xbt contexts are based on our threads implementation or not */ #cmakedefine HAVE_THREAD_CONTEXTS @HAVE_THREAD_CONTEXTS@ -/* Tracking of latency bound */ -#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@ - /* If __thread is available */ #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@ diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index 297683fa4e..9aa09d257c 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -354,10 +354,6 @@ XBT_PUBLIC(lmm_constraint_t) lmm_get_first_active_constraint(lmm_system_t sys); */ XBT_PUBLIC(lmm_constraint_t) lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst); -#ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) lmm_is_variable_limited_by_latency(lmm_variable_t var); -#endif - /** * @brief Get the data associated to a constraint * @param cnst A constraint diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 8c3a95f0c3..b7e6a6d1a8 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -326,18 +326,6 @@ double MSG_task_get_remaining_communication(msg_task_t task) return simcall_comm_get_remains(task->simdata->comm); } -#ifdef HAVE_LATENCY_BOUND_TRACKING -/** \ingroup m_task_management - * \brief Return 1 if communication task is limited by latency, 0 otherwise - */ -int MSG_task_is_latency_bounded(msg_task_t task) -{ - xbt_assert((task != NULL) && (task->simdata != NULL), "Invalid parameter"); - XBT_DEBUG("calling simcall_communication_is_latency_bounded(%p)", task->simdata->comm); - return simcall_comm_is_latency_bounded(task->simdata->comm); -} -#endif - /** \ingroup m_task_management * \brief Returns the size of the data attached to a task #msg_task_t. */ diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 6e476ecd74..cdd3b404b5 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -1011,13 +1011,6 @@ smx_process_t simcall_comm_get_dst_proc(smx_synchro_t comm) return simcall_BODY_comm_get_dst_proc(comm); } -#ifdef HAVE_LATENCY_BOUND_TRACKING -int simcall_comm_is_latency_bounded(smx_synchro_t comm) -{ - return simcall_BODY_comm_is_latency_bounded(comm); -} -#endif - /** * \ingroup simix_synchro_management * diff --git a/src/simix/popping_accessors.h b/src/simix/popping_accessors.h index 6806eb0e2c..d3c67e9775 100644 --- a/src/simix/popping_accessors.h +++ b/src/simix/popping_accessors.h @@ -1380,22 +1380,6 @@ static inline void* simcall_run_kernel__get__code(smx_simcall_t simcall) { static inline void simcall_run_kernel__set__code(smx_simcall_t simcall, void* arg) { simcall->args[0].dp = arg; } -#ifdef HAVE_LATENCY_BOUND_TRACKING - -static inline smx_synchro_t simcall_comm_is_latency_bounded__get__comm(smx_simcall_t simcall) { - return (smx_synchro_t) simcall->args[0].dp; -} -static inline void simcall_comm_is_latency_bounded__set__comm(smx_simcall_t simcall, void* arg) { - simcall->args[0].dp = arg; -} -static inline int simcall_comm_is_latency_bounded__get__result(smx_simcall_t simcall){ - return simcall->result.i; -} -static inline void simcall_comm_is_latency_bounded__set__result(smx_simcall_t simcall, int result){ - simcall->result.i = result; -} -#endif - #ifdef HAVE_MC static inline mc_snapshot_t simcall_mc_snapshot__get__result(smx_simcall_t simcall){ @@ -1477,10 +1461,6 @@ XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_free_size(smx_simcall_t simcal XBT_PRIVATE sg_size_t simcall_HANDLER_storage_get_used_size(smx_simcall_t simcall, smx_storage_t name); XBT_PRIVATE xbt_dict_t simcall_HANDLER_asr_get_properties(smx_simcall_t simcall, const char* name); XBT_PRIVATE int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max); -#ifdef HAVE_LATENCY_BOUND_TRACKING - -#endif - #ifdef HAVE_MC XBT_PRIVATE mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall); XBT_PRIVATE int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2); diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index bdc2c1dc63..2a0c62d516 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -1845,30 +1845,6 @@ inline static void simcall_BODY_run_kernel(void* code) { } } -#ifdef HAVE_LATENCY_BOUND_TRACKING - -inline static int simcall_BODY_comm_is_latency_bounded(smx_synchro_t comm) { - smx_process_t self = SIMIX_process_self(); - - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_comm_is_latency_bounded(comm); - /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */ - - self->simcall.call = SIMCALL_COMM_IS_LATENCY_BOUNDED; - memset(&self->simcall.result, 0, sizeof(self->simcall.result)); - memset(self->simcall.args, 0, sizeof(self->simcall.args)); - self->simcall.args[0].dp = (void*) comm; - if (self != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name, - SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); - SIMIX_process_yield(self); - } else { - SIMIX_simcall_handle(&self->simcall, 0); - } - return (int) self->simcall.result.i; - } -#endif - #ifdef HAVE_MC inline static mc_snapshot_t simcall_BODY_mc_snapshot() { diff --git a/src/simix/popping_enum.h b/src/simix/popping_enum.h index a523f45b11..4f357d8bd9 100644 --- a/src/simix/popping_enum.h +++ b/src/simix/popping_enum.h @@ -101,10 +101,6 @@ typedef enum { SIMCALL_MC_RANDOM, SIMCALL_SET_CATEGORY, SIMCALL_RUN_KERNEL, -#ifdef HAVE_LATENCY_BOUND_TRACKING - SIMCALL_COMM_IS_LATENCY_BOUNDED, -#endif - #ifdef HAVE_MC SIMCALL_MC_SNAPSHOT, SIMCALL_MC_COMPARE_SNAPSHOTS, diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp index 67e05999a0..2306854f1f 100644 --- a/src/simix/popping_generated.cpp +++ b/src/simix/popping_generated.cpp @@ -106,10 +106,6 @@ const char* simcall_names[] = { "SIMCALL_MC_RANDOM", "SIMCALL_SET_CATEGORY", "SIMCALL_RUN_KERNEL", -#ifdef HAVE_LATENCY_BOUND_TRACKING - "SIMCALL_COMM_IS_LATENCY_BOUNDED", -#endif - #ifdef HAVE_MC "SIMCALL_MC_SNAPSHOT", "SIMCALL_MC_COMPARE_SNAPSHOTS", @@ -523,14 +519,6 @@ case SIMCALL_RUN_KERNEL: SIMIX_simcall_answer(simcall); break; -#ifdef HAVE_LATENCY_BOUND_TRACKING -case SIMCALL_COMM_IS_LATENCY_BOUNDED: - simcall->result.i = SIMIX_comm_is_latency_bounded((smx_synchro_t) simcall->args[0].dp); - SIMIX_simcall_answer(simcall); - break; - -#endif - #ifdef HAVE_MC case SIMCALL_MC_SNAPSHOT: simcall->result.dp = simcall_HANDLER_mc_snapshot(simcall ); diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index 90e4e5f507..a98a6d3550 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -142,8 +142,6 @@ Proc - set_category (void) (synchro, void*, smx_synchro_t) (category, const char Proc - run_kernel (void) (code, void*) -## HAVE_LATENCY_BOUND_TRACKING -Func - comm_is_latency_bounded (int) (comm, void*, smx_synchro_t) ## HAVE_MC Func H mc_snapshot (void*, mc_snapshot_t) Func H mc_compare_snapshots (int) (s1, void*, mc_snapshot_t) (s2, void*, mc_snapshot_t) diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index b71564792b..58b1ac1f1d 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -252,12 +252,6 @@ smx_synchro_t SIMIX_comm_new(e_smx_comm_type_t type) synchro->comm.src_data=NULL; synchro->comm.dst_data=NULL; - -#ifdef HAVE_LATENCY_BOUND_TRACKING - //initialize with unknown value - synchro->latency_limited = -1; -#endif - synchro->category = NULL; XBT_DEBUG("Create communicate synchro %p", synchro); @@ -286,10 +280,6 @@ void SIMIX_comm_destroy(smx_synchro_t synchro) XBT_DEBUG("Really free communication %p; refcount is now %d", synchro, synchro->comm.refcount); -#ifdef HAVE_LATENCY_BOUND_TRACKING - synchro->latency_limited = SIMIX_comm_is_latency_bounded( synchro ) ; -#endif - xbt_free(synchro->name); SIMIX_comm_destroy_internal_actions(synchro); @@ -311,9 +301,6 @@ void SIMIX_comm_destroy(smx_synchro_t synchro) void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro) { if (synchro->comm.surf_comm){ -#ifdef HAVE_LATENCY_BOUND_TRACKING - synchro->latency_limited = SIMIX_comm_is_latency_bounded(synchro); -#endif synchro->comm.surf_comm->unref(); synchro->comm.surf_comm = NULL; } @@ -1018,25 +1005,6 @@ smx_process_t SIMIX_comm_get_dst_proc(smx_synchro_t synchro) return synchro->comm.dst_proc; } -#ifdef HAVE_LATENCY_BOUND_TRACKING -/** - * \brief verify if communication is latency bounded - * \param comm The communication - */ -int SIMIX_comm_is_latency_bounded(smx_synchro_t synchro) -{ - if(!synchro){ - return 0; - } - if (synchro->comm.surf_comm){ - XBT_DEBUG("Getting latency limited for surf_action (%p)", synchro->comm.surf_comm); - synchro->latency_limited = surf_network_action_get_latency_limited(synchro->comm.surf_comm); - XBT_DEBUG("synchro limited is %d", synchro->latency_limited); - } - return synchro->latency_limited; -} -#endif - /******************************************************************************/ /* SIMIX_comm_copy_data callbacks */ /******************************************************************************/ diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index 6fa2f7e2d5..a1039d6551 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -24,10 +24,6 @@ typedef struct s_smx_rvpoint { XBT_PRIVATE void SIMIX_network_init(void); XBT_PRIVATE void SIMIX_network_exit(void); -#ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) SIMIX_comm_is_latency_bounded(smx_synchro_t comm); -#endif - XBT_PRIVATE smx_mailbox_t SIMIX_rdv_create(const char *name); XBT_PRIVATE void SIMIX_rdv_destroy(smx_mailbox_t rdv); XBT_PRIVATE smx_mailbox_t SIMIX_rdv_get_by_name(const char *name); diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 067611d6fa..89efe32e35 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -203,10 +203,6 @@ typedef struct s_smx_synchro { } io; }; -#ifdef HAVE_LATENCY_BOUND_TRACKING - int latency_limited; -#endif - char *category; /* simix action category for instrumentation */ } s_smx_synchro_t; diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index bf00e283fc..9ec893fd5c 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -1254,14 +1254,6 @@ XBT_INLINE lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t return (lmm_constraint_t)xbt_swag_getNext(cnst, (sys->active_constraint_set).offset); } -#ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) lmm_is_variable_limited_by_latency(lmm_variable_t var) -{ - return (double_equals(var->bound, var->value, var->bound*sg_maxmin_precision)); -} -#endif - - /** \brief Update the constraint set propagating recursively to * other constraints so the system should not be entirely computed. * diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 1f075189ca..35dae591bb 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -305,11 +305,9 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) } } -Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, - double size, double rate) +Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate) { int failed = 0; - NetworkCm02Action *action = NULL; double bandwidth_bound; double latency = 0.0; std::vector * back_route = NULL; @@ -336,11 +334,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, failed = 1; } - action = new NetworkCm02Action(this, size, failed); - -#ifdef HAVE_LATENCY_BOUND_TRACKING - action->m_latencyLimited = 0; -#endif + NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); action->m_weight = action->m_latency = latency; action->m_rate = rate; @@ -375,8 +369,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, constraints_per_variable += back_route->size(); if (action->m_latency > 0) { - action->p_variable = lmm_variable_new(p_maxminSystem, action, 0.0, -1.0, - constraints_per_variable); + action->p_variable = lmm_variable_new(p_maxminSystem, action, 0.0, -1.0, constraints_per_variable); if (p_updateMechanism == UM_LAZY) { // add to the heap the event when the latency is payed XBT_DEBUG("Added action (%p) one latency event at date %f", action, action->m_latency + action->m_lastUpdate); diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 4629706ab3..d3ce07e193 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -166,13 +166,6 @@ namespace simgrid { for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end()) ; it != itend ; ++it) { action = static_cast(&*it); -#ifdef HAVE_LATENCY_BOUND_TRACKING - if (lmm_is_variable_limited_by_latency(action->getVariable())) { - action->m_latencyLimited = 1; - } else { - action->m_latencyLimited = 0; - } -#endif if (action->m_latency > 0) { minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency); } diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 1b69f74584..0bda751e59 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -290,15 +290,6 @@ namespace simgrid { void setState(e_surf_action_state_t state); -#ifdef HAVE_LATENCY_BOUND_TRACKING - /** - * @brief Check if the action is limited by latency. - * - * @return 1 if action is limited by latency, 0 otherwise - */ - virtual int getLatencyLimited() {return m_latencyLimited;} -#endif - double m_latency; double m_latCurrent; double m_weight; @@ -306,12 +297,7 @@ namespace simgrid { const char* p_senderLinkName; double m_senderSize; xbt_fifo_item_t p_senderFifoItem; -#ifdef HAVE_LATENCY_BOUND_TRACKING - int m_latencyLimited; -#endif - }; - } } diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index ea21715f1d..dbd4db1cb5 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -399,13 +399,7 @@ NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {} -#ifdef HAVE_LATENCY_BOUND_TRACKING - int NetworkNS3Action::getLatencyLimited() { - return m_latencyLimited; - } -#endif - - void NetworkNS3Action::suspend() +void NetworkNS3Action::suspend() { THROW_UNIMPLEMENTED; } diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 0a0dd90aaf..3807ebe724 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -79,10 +79,6 @@ class NetworkNS3Action : public NetworkAction { public: NetworkNS3Action(Model *model, double cost, bool failed); -#ifdef HAVE_LATENCY_BOUND_TRACKING - int getLatencyLimited(); -#endif - bool isSuspended(); int unref(); void suspend(); diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 803c9349b1..fb652db524 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -308,12 +308,6 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) { static_cast(action)->setBound(bound); } -#ifdef HAVE_LATENCY_BOUND_TRACKING -double surf_network_action_get_latency_limited(surf_action_t action) { - return static_cast(action)->getLatencyLimited(); -} -#endif - surf_file_t surf_storage_action_get_file(surf_action_t action){ return static_cast(action)->p_file; } diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 4b3a940dd0..9cba1d1d55 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -226,9 +226,6 @@ private: double m_start; /**< start time */ char *p_category = NULL; /**< tracing category for categorized resource utilization monitoring */ - #ifdef HAVE_LATENCY_BOUND_TRACKING - int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */ - #endif double m_cost; simgrid::surf::Model *p_model; void *p_data = NULL; /**< for your convenience */ diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake index 540753a98c..28df01f65d 100644 --- a/tools/cmake/Option.cmake +++ b/tools/cmake/Option.cmake @@ -18,7 +18,6 @@ option(enable_lua "Whether the Lua bindings are activated." off) option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off) option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off) option(enable_tracing "Tracing simulations for visualization." on) -option(enable_latency_bound_tracking "" off) option(enable_coverage "Whether coverage should be enabled." off) mark_as_advanced(enable_coverage) diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake index e991a291c5..c159e77b8b 100644 --- a/tools/cmake/PrintArgs.cmake +++ b/tools/cmake/PrintArgs.cmake @@ -113,7 +113,6 @@ message(" Documentation................: ${enable_documentation}") message(" Model checking ..............: ${HAVE_MC}") message(" Tracing mode ................: ${enable_tracing}") message(" Jedule mode ................: ${enable_jedule}") -message(" Latency bound ...............: ${enable_latency_bound_tracking}") message(" Graphviz mode ...............: ${HAVE_GRAPHVIZ}") message(" Sigc++ mode .................: ${SIMGRID_HAVE_LIBSIG}") message(" Mallocators .................: ${enable_mallocators}") diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in index de04a60007..dcff601775 100644 --- a/tools/cmake/src/internal_config.h.in +++ b/tools/cmake/src/internal_config.h.in @@ -147,11 +147,7 @@ /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS @STDC_HEADERS@ -/* Tracking of latency bound */ -#cmakedefine HAVE_LATENCY_BOUND_TRACKING @HAVE_LATENCY_BOUND_TRACKING@ - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ #cmakedefine YYTEXT_POINTER /* Define to `unsigned int' if does not define. */ diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 40629124ce..095a4746b6 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -49,7 +49,7 @@ ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \ -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ - -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \ + -Denable_jedule=OFF -Denable_mallocators=OFF \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \ -Denable_memcheck_xml=ON $WORKSPACE @@ -67,7 +67,7 @@ ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON -Denable_tracing=ON \ -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ - -Denable_latency_bound_tracking=ON -Denable_jedule=ON -Denable_mallocators=ON \ + -Denable_jedule=ON -Denable_mallocators=ON \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index ebf9aacfb9..345caffd22 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -121,8 +121,7 @@ cmake -G"$GENERATOR"\ -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \ -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \ -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \ - -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \ - -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF $SRCFOLDER + -Denable_jedule=OFF -Denable_tracing=ON -Denable_java=ON -Denable_lua=OFF $SRCFOLDER # -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \ make -j$NUMBER_OF_PROCESSORS VERBOSE=1