From: Frederic Suter Date: Fri, 13 Dec 2019 11:29:20 +0000 (+0100) Subject: yet another bunch of cleanups X-Git-Tag: v3.25~279 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/020b717e6bebcacc1195c7b16929c670684dd1ff yet another bunch of cleanups --- diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp index 7b2941e583..d938b44f70 100644 --- a/include/simgrid/kernel/future.hpp +++ b/include/simgrid/kernel/future.hpp @@ -142,7 +142,6 @@ private: template class FutureState : public FutureStateBase { public: - void set_value(T value) { if (this->get_status() != FutureStatus::not_ready) diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp index 08627d5a1b..670e24a795 100644 --- a/src/kernel/lmm/maxmin.hpp +++ b/src/kernel/lmm/maxmin.hpp @@ -531,7 +531,6 @@ public: resource::Action::ModifiedSet* modified_set_ = nullptr; private: - typedef std::vector dyn_light_t; //Data used in lmm::solve diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index d390e513ef..ace3e9dc70 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -280,7 +280,6 @@ void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationA } if (targetRouter != myRouter) { - // are we on a different group ? if (targetRouter->group_ != currentRouter->group_) { // go to the router of our group connected to this one. diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index bc2e6421b5..b73547208e 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -116,15 +116,15 @@ static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern, namespace simgrid { namespace mc { -void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, simgrid::mc::PatternCommunication* comm, +void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, PatternCommunication* comm, int backtracking) { if (not backtracking) { - simgrid::mc::PatternCommunicationList& list = initial_communications_pattern[process]; + PatternCommunicationList& list = initial_communications_pattern[process]; e_mc_comm_pattern_difference_t diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); if (diff != NONE_DIFF) { - if (comm->type == simgrid::mc::PatternCommunicationType::send) { + if (comm->type == PatternCommunicationType::send) { this->send_deterministic = 0; if (this->send_diff != nullptr) xbt_free(this->send_diff); @@ -142,7 +142,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si XBT_INFO("%s", this->send_diff); xbt_free(this->send_diff); this->send_diff = nullptr; - simgrid::mc::session->log_state(); + mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } else if (_sg_mc_comms_determinism && (not this->send_deterministic && not this->recv_deterministic)) { XBT_INFO("****************************************************"); @@ -158,7 +158,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si xbt_free(this->recv_diff); this->recv_diff = nullptr; } - simgrid::mc::session->log_state(); + mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } @@ -171,35 +171,32 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ int backtracking) { const smx_actor_t issuer = MC_smx_simcall_get_issuer(request); - const simgrid::mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; - const std::vector& incomplete_pattern = - incomplete_communications_pattern[issuer->get_pid()]; + const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; + const std::vector& incomplete_pattern = incomplete_communications_pattern[issuer->get_pid()]; - std::unique_ptr pattern(new simgrid::mc::PatternCommunication()); + std::unique_ptr pattern(new PatternCommunication()); pattern->index = initial_pattern.index_comm + incomplete_pattern.size(); if (call_type == MC_CALL_TYPE_SEND) { /* Create comm pattern */ - pattern->type = simgrid::mc::PatternCommunicationType::send; - pattern->comm_addr = static_cast(simcall_comm_isend__getraw__result(request)); + pattern->type = PatternCommunicationType::send; + pattern->comm_addr = static_cast(simcall_comm_isend__getraw__result(request)); - simgrid::mc::Remote temp_synchro; + Remote temp_synchro; mc_model_checker->process().read(temp_synchro, - remote(static_cast(pattern->comm_addr))); - simgrid::kernel::activity::CommImpl* synchro = - static_cast(temp_synchro.get_buffer()); + remote(static_cast(pattern->comm_addr))); + kernel::activity::CommImpl* synchro = static_cast(temp_synchro.get_buffer()); char* remote_name = mc_model_checker->process().read(RemotePtr( (uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->name_ : &synchro->mbox_cpy->name_))); pattern->rdv = mc_model_checker->process().read_string(RemotePtr(remote_name)); - pattern->src_proc = - mc_model_checker->process().resolve_actor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid(); + pattern->src_proc = mc_model_checker->process().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid(); pattern->src_host = MC_smx_actor_get_host_name(issuer); #if HAVE_SMPI simgrid::smpi::Request mpi_request; - mc_model_checker->process().read( - &mpi_request, remote(static_cast(simcall_comm_isend__get__data(request)))); + mc_model_checker->process().read(&mpi_request, + remote(static_cast(simcall_comm_isend__get__data(request)))); pattern->tag = mpi_request.tag(); #endif @@ -221,29 +218,26 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ } #endif } else if (call_type == MC_CALL_TYPE_RECV) { - pattern->type = simgrid::mc::PatternCommunicationType::receive; - pattern->comm_addr = static_cast(simcall_comm_irecv__getraw__result(request)); + pattern->type = PatternCommunicationType::receive; + pattern->comm_addr = static_cast(simcall_comm_irecv__getraw__result(request)); #if HAVE_SMPI - simgrid::smpi::Request mpi_request; - mc_model_checker->process().read( - &mpi_request, remote(static_cast(simcall_comm_irecv__get__data(request)))); + smpi::Request mpi_request; + mc_model_checker->process().read(&mpi_request, + remote(static_cast(simcall_comm_irecv__get__data(request)))); pattern->tag = mpi_request.tag(); #endif - simgrid::mc::Remote temp_comm; - mc_model_checker->process().read(temp_comm, - remote(static_cast(pattern->comm_addr))); - simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + Remote temp_comm; + mc_model_checker->process().read(temp_comm, remote(static_cast(pattern->comm_addr))); + kernel::activity::CommImpl* comm = temp_comm.get_buffer(); char* remote_name; - mc_model_checker->process().read(&remote_name, - remote(comm->get_mailbox() - ? &simgrid::xbt::string::to_string_data(comm->get_mailbox()->name_).data - : &simgrid::xbt::string::to_string_data(comm->mbox_cpy->name_).data)); + mc_model_checker->process().read( + &remote_name, remote(comm->get_mailbox() ? &xbt::string::to_string_data(comm->get_mailbox()->name_).data + : &xbt::string::to_string_data(comm->mbox_cpy->name_).data)); pattern->rdv = mc_model_checker->process().read_string(RemotePtr(remote_name)); - pattern->dst_proc = - mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid(); + pattern->dst_proc = mc_model_checker->process().resolve_actor(mc::remote(comm->dst_actor_.get()))->get_pid(); pattern->dst_host = MC_smx_actor_get_host_name(issuer); } else xbt_die("Unexpected call_type %i", (int) call_type); @@ -252,19 +246,19 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern( - simgrid::mc::RemotePtr comm_addr, unsigned int issuer, int backtracking) +void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr comm_addr, + unsigned int issuer, int backtracking) { /* Complete comm pattern */ - std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; - auto current_comm_pattern = std::find_if( - begin(incomplete_pattern), end(incomplete_pattern), - [&comm_addr](simgrid::mc::PatternCommunication* comm) { return remote(comm->comm_addr) == comm_addr; }); + std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; + auto current_comm_pattern = + std::find_if(begin(incomplete_pattern), end(incomplete_pattern), + [&comm_addr](PatternCommunication* comm) { return remote(comm->comm_addr) == comm_addr; }); if (current_comm_pattern == std::end(incomplete_pattern)) xbt_die("Corresponding communication not found!"); update_comm_pattern(*current_comm_pattern, comm_addr); - std::unique_ptr comm_pattern(*current_comm_pattern); + std::unique_ptr comm_pattern(*current_comm_pattern); XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %zd", issuer, std::distance(begin(incomplete_pattern), current_comm_pattern)); incomplete_pattern.erase(current_comm_pattern); @@ -299,8 +293,7 @@ std::vector CommunicationDeterminismChecker::get_textual_trace() // for (auto const& state : stack_) { smx_simcall_t req = &state->executed_req_; if (req) - trace.push_back( - simgrid::mc::request_to_string(req, state->transition_.argument_, simgrid::mc::RequestType::executed)); + trace.push_back(request_to_string(req, state->transition_.argument_, RequestType::executed)); } return trace; } @@ -336,13 +329,13 @@ void CommunicationDeterminismChecker::prepare() initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); - std::unique_ptr initial_state(new simgrid::mc::State(++expanded_states_count_)); + std::unique_ptr initial_state(new State(++expanded_states_count_)); XBT_DEBUG("********* Start communication determinism verification *********"); /* Get an enabled actor and insert it in the interleave set of the initial state */ for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) + if (mc::actor_is_enabled(actor.copy.get_buffer())) initial_state->add_interleaving_set(actor.copy.get_buffer()); stack_.push_back(std::move(initial_state)); @@ -362,7 +355,7 @@ static inline bool all_communications_are_finished() void CommunicationDeterminismChecker::restoreState() { /* Intermediate backtracking */ - simgrid::mc::State* last_state = stack_.back().get(); + State* last_state = stack_.back().get(); if (last_state->system_state) { last_state->system_state->restore(&mc_model_checker->process()); MC_restore_communications_pattern(last_state); @@ -370,7 +363,7 @@ void CommunicationDeterminismChecker::restoreState() } /* Restore the initial state */ - simgrid::mc::session->restore_initial_state(); + mc::session->restore_initial_state(); unsigned n = MC_smx_get_maxpid(); assert(n == incomplete_communications_pattern.size()); @@ -409,12 +402,12 @@ void CommunicationDeterminismChecker::restoreState() void CommunicationDeterminismChecker::real_run() { - std::unique_ptr visited_state = nullptr; + std::unique_ptr visited_state = nullptr; smx_simcall_t req = nullptr; while (not stack_.empty()) { /* Get current state */ - simgrid::mc::State* cur_state = stack_.back().get(); + State* cur_state = stack_.back().get(); XBT_DEBUG("**************************************************"); XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_, @@ -429,14 +422,13 @@ void CommunicationDeterminismChecker::real_run() req = nullptr; if (req != nullptr && visited_state == nullptr) { - int req_num = cur_state->transition_.argument_; - XBT_DEBUG("Execute: %s", simgrid::mc::request_to_string(req, req_num, simgrid::mc::RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", request_to_string(req, req_num, RequestType::simix).c_str()); std::string req_str; if (dot_output != nullptr) - req_str = simgrid::mc::request_get_dot_output(req, req_num); + req_str = request_get_dot_output(req, req_num); mc_model_checker->executed_transitions++; @@ -455,7 +447,7 @@ void CommunicationDeterminismChecker::real_run() mc_model_checker->wait_for_requests(); /* Create the new expanded state */ - std::unique_ptr next_state(new simgrid::mc::State(++expanded_states_count_)); + std::unique_ptr next_state(new State(++expanded_states_count_)); /* If comm determinism verification, we cannot stop the exploration if some communications are not finished (at * least, data are transferred). These communications are incomplete and they cannot be analyzed and compared @@ -468,7 +460,6 @@ void CommunicationDeterminismChecker::real_run() visited_state = nullptr; if (visited_state == nullptr) { - /* Get enabled actors and insert them in the interleave set of the next state */ for (auto& actor : mc_model_checker->process().actors()) if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) @@ -482,9 +473,7 @@ void CommunicationDeterminismChecker::real_run() visited_state->original_num == -1 ? visited_state->num : visited_state->original_num, req_str.c_str()); stack_.push_back(std::move(next_state)); - } else { - if (stack_.size() > (std::size_t) _sg_mc_max_depth) XBT_WARN("/!\\ Max depth reached! /!\\ "); else if (visited_state != nullptr) @@ -508,7 +497,7 @@ void CommunicationDeterminismChecker::real_run() } while (not stack_.empty()) { - std::unique_ptr state(std::move(stack_.back())); + std::unique_ptr state(std::move(stack_.back())); stack_.pop_back(); if (state->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ @@ -527,13 +516,13 @@ void CommunicationDeterminismChecker::real_run() } } - simgrid::mc::session->log_state(); + mc::session->log_state(); } void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - simgrid::mc::session->initialize(); + mc::session->initialize(); this->prepare(); @@ -545,5 +534,5 @@ Checker* createCommunicationDeterminismChecker(Session& s) return new CommunicationDeterminismChecker(s); } -} -} +} // namespace mc +} // namespace simgrid diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index bbced3a3a6..9b9b937020 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -26,11 +26,11 @@ VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, std::shared_ptr graph_state) : num(pair_num), automaton_state(automaton_state) { - simgrid::mc::RemoteClient* process = &(mc_model_checker->process()); + RemoteClient* process = &(mc_model_checker->process()); this->graph_state = std::move(graph_state); if(this->graph_state->system_state == nullptr) - this->graph_state->system_state = std::make_shared(pair_num); + this->graph_state->system_state = std::make_shared(pair_num); this->heap_bytes_used = mmalloc_get_bytes_used_remote(process->get_heap()->heaplimit, process->get_malloc_info()); this->actors_count = mc_model_checker->process().actors().size(); @@ -75,7 +75,7 @@ std::shared_ptr> LivenessChecker::get_proposition_values( std::vector values; unsigned int cursor = 0; xbt_automaton_propositional_symbol_t ps = nullptr; - xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps) + xbt_dynar_foreach (mc::property_automaton->propositional_symbols, cursor, ps) values.push_back(xbt_automaton_propositional_symbol_evaluate(ps)); return std::make_shared>(std::move(values)); } @@ -86,8 +86,7 @@ std::shared_ptr LivenessChecker::insert_acceptance_pair(simgrid::mc pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); - auto res = boost::range::equal_range(acceptance_pairs_, new_pair.get(), - simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap()); + auto res = boost::range::equal_range(acceptance_pairs_, new_pair.get(), DerefAndCompareByActorsCountAndUsedHeap()); if (pair->search_cycle) for (auto i = res.first; i != res.second; ++i) { std::shared_ptr const& pair_test = *i; @@ -122,7 +121,7 @@ void LivenessChecker::replay() /* Intermediate backtracking */ if(_sg_mc_checkpoint > 0) { - simgrid::mc::Pair* pair = exploration_stack_.back().get(); + Pair* pair = exploration_stack_.back().get(); if(pair->graph_state->system_state){ pair->graph_state->system_state->restore(&mc_model_checker->process()); return; @@ -130,7 +129,7 @@ void LivenessChecker::replay() } /* Restore the initial state */ - simgrid::mc::session->restore_initial_state(); + mc::session->restore_initial_state(); /* Traverse the stack from the initial state and re-execute the transitions */ int depth = 1; @@ -141,7 +140,6 @@ void LivenessChecker::replay() std::shared_ptr state = pair->graph_state; if (pair->exploration_started) { - int req_num = state->transition_.argument_; smx_simcall_t saved_req = &state->executed_req_; @@ -154,11 +152,8 @@ void LivenessChecker::replay() req = &issuer->simcall; /* Debug information */ - XBT_DEBUG("Replay (depth = %d) : %s (%p)", - depth, - simgrid::mc::request_to_string( - req, req_num, simgrid::mc::RequestType::simix).c_str(), - state.get()); + XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, + request_to_string(req, req_num, simgrid::mc::RequestType::simix).c_str(), state.get()); } this->get_session().execute(state->transition_); @@ -187,8 +182,7 @@ int LivenessChecker::insert_visited_pair(std::shared_ptr visited_pa visited_pair = std::make_shared(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); - auto range = boost::range::equal_range(visited_pairs_, visited_pair.get(), - simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap()); + auto range = boost::range::equal_range(visited_pairs_, visited_pair.get(), DerefAndCompareByActorsCountAndUsedHeap()); for (auto i = range.first; i != range.second; ++i) { VisitedPair* pair_test = i->get(); @@ -251,8 +245,8 @@ void LivenessChecker::show_acceptance_cycle(std::size_t depth) XBT_INFO("Counter-example that violates formula:"); for (auto const& s : this->get_textual_trace()) XBT_INFO(" %s", s.c_str()); - simgrid::mc::dumpRecordPath(); - simgrid::mc::session->log_state(); + mc::dumpRecordPath(); + mc::session->log_state(); XBT_INFO("Counter-example depth: %zu", depth); } @@ -263,8 +257,7 @@ std::vector LivenessChecker::get_textual_trace() // override int req_num = pair->graph_state->transition_.argument_; smx_simcall_t req = &pair->graph_state->executed_req_; if (req && req->call_ != SIMCALL_NONE) - trace.push_back(simgrid::mc::request_to_string( - req, req_num, simgrid::mc::RequestType::executed)); + trace.push_back(request_to_string(req, req_num, RequestType::executed)); } return trace; } @@ -275,7 +268,7 @@ std::shared_ptr LivenessChecker::create_pair(Pair* current_pair, xbt_autom expanded_pairs_count_++; std::shared_ptr next_pair = std::make_shared(expanded_pairs_count_); next_pair->automaton_state = state; - next_pair->graph_state = std::shared_ptr(new simgrid::mc::State(++expanded_states_count_)); + next_pair->graph_state = std::shared_ptr(new State(++expanded_states_count_)); next_pair->atomic_propositions = std::move(propositions); if (current_pair) next_pair->depth = current_pair->depth + 1; @@ -283,7 +276,7 @@ std::shared_ptr LivenessChecker::create_pair(Pair* current_pair, xbt_autom next_pair->depth = 1; /* Get enabled actors and insert them in the interleave set of the next graph_state */ for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) + if (mc::actor_is_enabled(actor.copy.get_buffer())) next_pair->graph_state->add_interleaving_set(actor.copy.get_buffer()); next_pair->requests = next_pair->graph_state->interleave_size(); /* FIXME : get search_cycle value for each accepting state */ @@ -322,7 +315,7 @@ void LivenessChecker::run() MC_automaton_load(_sg_mc_property_file.get().c_str()); XBT_DEBUG("Starting the liveness algorithm"); - simgrid::mc::session->initialize(); + mc::session->initialize(); /* Initialize */ this->previous_pair_ = 0; @@ -333,7 +326,7 @@ void LivenessChecker::run() // (application_state, automaton_state) pair to the exploration stack: unsigned int cursor = 0; xbt_automaton_state_t automaton_state; - xbt_dynar_foreach (simgrid::mc::property_automaton->states, cursor, automaton_state) + xbt_dynar_foreach (mc::property_automaton->states, cursor, automaton_state) if (automaton_state->type == -1) exploration_stack_.push_back(this->create_pair(nullptr, automaton_state, propos)); @@ -342,7 +335,7 @@ void LivenessChecker::run() std::shared_ptr current_pair = exploration_stack_.back(); /* Update current state in buchi automaton */ - simgrid::mc::property_automaton->current_state = current_pair->automaton_state; + mc::property_automaton->current_state = current_pair->automaton_state; XBT_DEBUG( "********************* ( Depth = %d, search_cycle = %d, interleave size = %zu, pair_num = %d, requests = %d)", @@ -359,7 +352,7 @@ void LivenessChecker::run() reached_pair = this->insert_acceptance_pair(current_pair.get()); if (reached_pair == nullptr) { this->show_acceptance_cycle(current_pair->depth); - throw simgrid::mc::LivenessError(); + throw LivenessError(); } } @@ -395,9 +388,7 @@ void LivenessChecker::run() fflush(dot_output); } - XBT_DEBUG("Execute: %s", - simgrid::mc::request_to_string( - req, req_num, simgrid::mc::RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", request_to_string(req, req_num, RequestType::simix).c_str()); /* Update stats */ mc_model_checker->executed_transitions++; @@ -436,5 +427,5 @@ Checker* createLivenessChecker(Session& s) return new LivenessChecker(s); } -} -} +} // namespace mc +} // namespace simgrid diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index 3a8158137f..33268ad538 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -58,7 +58,7 @@ public: private: double get_power(); - simgrid::s4u::Link* link_{}; + s4u::Link* link_{}; bool inited_{false}; double idle_{0.0}; @@ -68,7 +68,7 @@ private: double last_updated_{0.0}; /*< Timestamp of the last energy update event*/ }; -simgrid::xbt::Extension LinkEnergy::EXTENSION_ID; +xbt::Extension LinkEnergy::EXTENSION_ID; void LinkEnergy::update() { @@ -126,7 +126,6 @@ void LinkEnergy::init_watts_range_list() double LinkEnergy::get_power() { - if (!inited_) return 0.0; @@ -141,7 +140,7 @@ double LinkEnergy::get_power() double LinkEnergy::get_consumed_energy() { if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment - simgrid::kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); + kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); return this->total_energy_; } } // namespace plugin @@ -155,7 +154,6 @@ static void on_communicate(simgrid::kernel::resource::NetworkAction const& actio { XBT_DEBUG("onCommunicate is called"); for (simgrid::kernel::resource::LinkImpl* link : action.links()) { - if (link == nullptr) continue; diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp index a828f8ad16..a013d2e690 100644 --- a/src/plugins/vm/VmLiveMigration.cpp +++ b/src/plugins/vm/VmLiveMigration.cpp @@ -13,12 +13,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(vm_live_migration, s4u, "S4U virtual machines li namespace simgrid { namespace vm { -simgrid::xbt::Extension VmMigrationExt::EXTENSION_ID; +xbt::Extension VmMigrationExt::EXTENSION_ID; void VmMigrationExt::ensureVmMigrationExtInstalled() { if (not EXTENSION_ID.valid()) - EXTENSION_ID = simgrid::s4u::Host::extension_create(); + EXTENSION_ID = s4u::Host::extension_create(); } void MigrationRx::operator()() @@ -59,18 +59,18 @@ void MigrationRx::operator()() counter++; // start link - container_t msg = simgrid::instr::Container::by_name(vm_->get_name()); - simgrid::instr::Container::get_root()->get_link("VM_LINK")->start_event(msg, "M", key); + container_t msg = instr::Container::by_name(vm_->get_name()); + instr::Container::get_root()->get_link("VM_LINK")->start_event(msg, "M", key); // destroy existing container of this vm - simgrid::instr::Container::by_name(vm_->get_name())->remove_from_parent(); + instr::Container::by_name(vm_->get_name())->remove_from_parent(); // create new container on the new_host location - new simgrid::instr::Container(vm_->get_name(), "VM", simgrid::instr::Container::by_name(dst_pm_->get_name())); + new instr::Container(vm_->get_name(), "VM", instr::Container::by_name(dst_pm_->get_name())); // end link - msg = simgrid::instr::Container::by_name(vm_->get_name()); - simgrid::instr::Container::get_root()->get_link("VM_LINK")->end_event(msg, "M", key); + msg = instr::Container::by_name(vm_->get_name()); + instr::Container::get_root()->get_link("VM_LINK")->end_event(msg, "M", key); } // Inform the SRC that the migration has been correctly performed std::string* payload = new std::string("__mig_stage4:"); @@ -181,7 +181,6 @@ void MigrationTx::operator()() skip_stage2 = true; } else if (sent > ramsize) XBT_CRITICAL("bug"); - } catch (const Exception&) { // hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code) // Stop the dirty page tracking an return (there is no memory space to release) @@ -203,7 +202,6 @@ void MigrationTx::operator()() /* Stage2: send update pages iteratively until the size of remaining states becomes smaller than threshold value. */ if (not skip_stage2) { - int stage2_round = 0; /* just after stage1, nothing has been updated. But, we have to send the data updated during stage1 */ sg_size_t updated_size = get_updated_size(computed_during_stage1, dp_rate, dp_cap); @@ -213,7 +211,6 @@ void MigrationTx::operator()() /* When the remaining size is below the threshold value, move to stage 3. */ while (threshold < remaining_size) { - XBT_DEBUG("mig-stage 2:%d updated_size %llu computed_during_stage1 %f dp_rate %f dp_cap %llu", stage2_round, updated_size, computed_during_stage1, dp_rate, dp_cap); @@ -277,8 +274,8 @@ void MigrationTx::operator()() // effectively the VM on the DST node. XBT_DEBUG("mig: tx_done"); } -} -} +} // namespace vm +} // namespace simgrid static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine const& vm) { diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index c8f084c9a7..0a8719814a 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -104,7 +104,6 @@ LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vect void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) { while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) { - auto* action = static_cast(get_action_heap().pop()); XBT_DEBUG("Something happened to action %p", action); diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 3b1ca2e893..b1cac899e8 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -395,7 +395,6 @@ void L07Action::updateBound() if (communicationAmount_ != nullptr) { for (size_t i = 0; i < host_count; i++) { for (size_t j = 0; j < host_count; j++) { - if (communicationAmount_[i * host_count + j] > 0) { double lat = 0.0; std::vector route;