From 5c193dfc57256298e9b04e4a2fe887135ca49b86 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 22 Aug 2017 19:20:06 +0200 Subject: [PATCH] Trivial formatting issues. --- examples/s4u/io/s4u_io.cpp | 2 +- src/instr/jedule/jedule.cpp | 2 +- src/mc/compare.cpp | 6 +++--- src/mc/mc_checkpoint.cpp | 9 ++++----- src/mc/mc_dwarf.cpp | 7 +++---- src/simdag/sd_global.cpp | 10 +++++----- src/simix/smx_global.cpp | 2 +- src/smpi/internals/smpi_shared.cpp | 8 ++++---- src/smpi/mpi/smpi_comm.cpp | 2 +- src/surf/network_smpi.cpp | 4 ++-- src/surf/surf_c_bindings.cpp | 2 +- 11 files changed, 26 insertions(+), 28 deletions(-) diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp index 8c60b637d0..789bf1cdb0 100644 --- a/examples/s4u/io/s4u_io.cpp +++ b/examples/s4u/io/s4u_io.cpp @@ -15,7 +15,7 @@ public: { XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->getCname()); - for (const auto&kv : mounts) { + for (auto const& kv : mounts) { std::string mountpoint = kv.first; simgrid::s4u::Storage* storage = kv.second; diff --git a/src/instr/jedule/jedule.cpp b/src/instr/jedule/jedule.cpp index 46b1611702..3138d6a45f 100644 --- a/src/instr/jedule/jedule.cpp +++ b/src/instr/jedule/jedule.cpp @@ -43,7 +43,7 @@ void Jedule::writeOutput(FILE *file) { fprintf(file, " \n"); for (auto const& event : this->event_set) - event->print(file); + event->print(file); fprintf(file, " \n"); fprintf(file, "\n"); diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 52de4f8027..2a1ddae3d0 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -865,7 +865,7 @@ top: return res; } } else { - for(simgrid::mc::Member& member : type->members) { + for (simgrid::mc::Member& member : type->members) { // TODO, optimize this? (for the offset case) void *real_member1 = simgrid::dwarf::resolve_member( real_area1, type, &member, (simgrid::mc::AddressSpace*) snapshot1, process_index); @@ -926,7 +926,7 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: return nullptr; } - for(simgrid::mc::Member& member : type->members) { + for (simgrid::mc::Member& member : type->members) { if (member.has_offset_location()) { // We have the offset, use it directly (shortcut): if (member.offset() == offset) @@ -1395,7 +1395,7 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, } case DW_TAG_structure_type: case DW_TAG_class_type: - for(simgrid::mc::Member& member : type->members) { + for (simgrid::mc::Member& member : type->members) { void *member1 = simgrid::dwarf::resolve_member( real_area1, type, &member, snapshot1, process_index); void *member2 = simgrid::dwarf::resolve_member( diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 9c3f060d14..44d50918eb 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -288,8 +288,7 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, if (not scope || not scope->range.contain(stack_frame->ip)) return; - for(simgrid::mc::Variable& current_variable : - scope->variables) { + for (simgrid::mc::Variable& current_variable : scope->variables) { if (not valid_variable(¤t_variable, scope, (void*)stack_frame->ip)) continue; @@ -331,7 +330,7 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, } // Recursive processing of nested scopes: - for(simgrid::mc::Frame& nested_scope : scope->scopes) + for (simgrid::mc::Frame& nested_scope : scope->scopes) fill_local_variables_values( stack_frame, &nested_scope, process_index, result); } @@ -453,7 +452,7 @@ static void snapshot_handle_ignore(simgrid::mc::Snapshot* snapshot) } // Zero the memory: - for(auto const& region : mc_model_checker->process().ignored_regions()) + for (auto const& region : mc_model_checker->process().ignored_regions()) snapshot->process()->clear_bytes(remote(region.addr), region.size); } @@ -588,7 +587,7 @@ std::shared_ptr take_snapshot(int num_state) static inline void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot) { - for(std::unique_ptr const& region : snapshot->snapshot_regions) { + for (std::unique_ptr const& region : snapshot->snapshot_regions) { // For privatized, variables we decided it was not necessary to take the snapshot: if (region) restore(region.get()); diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index 09dbac1f4b..8be805343d 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -1277,7 +1277,7 @@ static void MC_post_process_variables(simgrid::mc::ObjectInformation* info) // Someone needs this to be sorted but who? boost::range::sort(info->global_variables, MC_compare_variable); - for(simgrid::mc::Variable& variable : info->global_variables) + for (simgrid::mc::Variable& variable : info->global_variables) if (variable.type_id) variable.type = simgrid::util::find_map_ptr( info->types, variable.type_id); @@ -1303,8 +1303,7 @@ static void mc_post_process_scope(simgrid::mc::ObjectInformation* info, simgrid: // Recursive post-processing of nested-scopes: for (simgrid::mc::Frame& nested_scope : scope->scopes) - mc_post_process_scope(info, &nested_scope); - + mc_post_process_scope(info, &nested_scope); } static @@ -1337,7 +1336,7 @@ simgrid::mc::Type* MC_resolve_type( static void MC_post_process_types(simgrid::mc::ObjectInformation* info) { // Lookup "subtype" field: - for(auto& i : info->types) { + for (auto& i : info->types) { i.second.subtype = MC_resolve_type(info, i.second.type_id); for (simgrid::mc::Member& member : i.second.members) member.type = MC_resolve_type(info, member.type_id); diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 805dd0e092..9fe80207d0 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -55,7 +55,7 @@ std::set* simulate(double how_long){ total_time += elapsed_time; /* let's see which tasks are done */ - for (const auto& model : *all_existing_models) { + for (auto const& model : *all_existing_models) { surf_action_t action = surf_model_extract_done_action_set(model); while (action != nullptr) { SD_task_t task = static_cast(action->getData()); @@ -67,7 +67,7 @@ std::set* simulate(double how_long){ sd_global->return_set->insert(task); /* remove the dependencies after this task */ - for (const auto& succ : *task->successors) { + for (auto const& succ : *task->successors) { succ->predecessors->erase(task); succ->inputs->erase(task); XBT_DEBUG("Release dependency on %s: %zu remain(s). Becomes schedulable if %zu=0", SD_task_get_name(succ), @@ -84,7 +84,7 @@ std::set* simulate(double how_long){ } task->successors->clear(); - for (const auto& output : *task->outputs) { + for (auto const& output : *task->outputs) { output->start_time = task->finish_time; output->predecessors->erase(task); if (SD_task_get_state(output) == SD_SCHEDULED) @@ -119,7 +119,7 @@ std::set* simulate(double how_long){ if (not sd_global->watch_point_reached && how_long < 0 && not sd_global->initial_tasks->empty()) { XBT_WARN("Simulation is finished but %zu tasks are still not done", sd_global->initial_tasks->size()); - for (const auto& t : *sd_global->initial_tasks) + for (auto const& t : *sd_global->initial_tasks) XBT_WARN("%s is in %s state", SD_task_get_name(t), __get_state_name(SD_task_get_state(t))); } @@ -231,7 +231,7 @@ void SD_simulate(double how_long) void SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar) { std::set *changed_tasks = simgrid::sd::simulate(how_long); - for (const auto& task : *changed_tasks) + for (auto const& task : *changed_tasks) xbt_dynar_push(changed_tasks_dynar, &task); } diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 6d89e4ca53..1babc159c4 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -493,7 +493,7 @@ void SIMIX_run() /* If only daemon processes remain, cancel their actions, mark them to die and reschedule them */ if (simix_global->process_list.size() == simix_global->daemons.size()) - for (const auto& dmon : simix_global->daemons) { + for (auto const& dmon : simix_global->daemons) { XBT_DEBUG("Kill %s", dmon->cname()); SIMIX_process_kill(dmon, simix_global->maestro_process); } diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 635f2b57b5..f8c5f8b9dc 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -411,10 +411,10 @@ int smpi_is_shared(void* ptr, std::vector> &private_bl std::vector> shift_and_frame_private_blocks(const std::vector> vec, size_t offset, size_t buff_size) { std::vector> result; for (auto const& block : vec) { - auto new_block = std::make_pair(std::min(std::max((size_t)0, block.first-offset), buff_size), - std::min(std::max((size_t)0, block.second-offset), buff_size)); - if(new_block.second > 0 && new_block.first < buff_size) - result.push_back(new_block); + auto new_block = std::make_pair(std::min(std::max((size_t)0, block.first - offset), buff_size), + std::min(std::max((size_t)0, block.second - offset), buff_size)); + if (new_block.second > 0 && new_block.first < buff_size) + result.push_back(new_block); } return result; } diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index 98300be3f3..e70e2052c5 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -222,7 +222,7 @@ MPI_Comm Comm::split(int color, int key) } MPI_Request* requests = xbt_new(MPI_Request, rankmap.size()); int reqs = 0; - for (const auto& rank : rankmap) { + for (auto const& rank : rankmap) { if (rank.second != 0) { group_snd[reqs]=new Group(group_out); requests[reqs] = Request::isend(&(group_snd[reqs]), 1, MPI_PTR, rank.second, system_tag, this); diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index b559d234c1..9c6f3890da 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -58,7 +58,7 @@ double NetworkSmpiModel::bandwidthFactor(double size) smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor")); double current = 1.0; - for (const auto& fact : smpi_bw_factor) { + for (auto const& fact : smpi_bw_factor) { if (size <= fact.factor) { XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current; @@ -76,7 +76,7 @@ double NetworkSmpiModel::latencyFactor(double size) smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor")); double current = 1.0; - for (const auto& fact : smpi_lat_factor) { + for (auto const& fact : smpi_lat_factor) { if (size <= fact.factor) { XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current; diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index fd51f15b57..61e00b91fd 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -35,7 +35,7 @@ void surf_presolve() XBT_DEBUG ("Set every models in the right state by updating them to 0."); for (auto const& model : *all_existing_models) - model->updateActionsState(NOW, 0.0); + model->updateActionsState(NOW, 0.0); } double surf_solve(double max_date) -- 2.20.1