From a521b79fb5f8fc07b3f9102cec6de074186fe5c1 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 12 Jun 2020 11:52:57 +0200 Subject: [PATCH] Fix most of spelling mistakes in src/ using codespell (https://github.com/codespell-project/codespell) exclude catch.hpp --- src/bindings/java/org/simgrid/NativeLib.java | 2 +- src/bindings/java/org/simgrid/msg/Task.java | 4 ++-- src/bindings/java/org/simgrid/msg/VM.java | 2 +- src/bindings/lua/simgrid_lua.hpp | 2 +- src/bindings/python/simgrid_python.cpp | 2 +- src/kernel/lmm/maxmin.hpp | 2 +- src/mc/AddressSpace.hpp | 2 +- src/mc/ModelChecker.cpp | 10 +++++----- src/mc/checker/LivenessChecker.cpp | 2 +- src/mc/compare.cpp | 4 ++-- src/mc/inspect/DwarfExpression.hpp | 2 +- src/mc/inspect/ObjectInformation.hpp | 4 ++-- src/mc/inspect/mc_dwarf.cpp | 12 ++++++------ src/mc/inspect/mc_unw.cpp | 2 +- src/mc/inspect/mc_unw.hpp | 2 +- src/mc/mc_record.hpp | 2 +- src/mc/remote/AppSide.cpp | 2 +- src/mc/sosp/PageStore.hpp | 2 +- src/smpi/bindings/smpi_pmpi_request.cpp | 2 +- src/smpi/colls/allgather/allgather-NTSLR-NB.cpp | 2 +- src/smpi/colls/allgather/allgather-NTSLR.cpp | 2 +- .../allgather/allgather-ompi-neighborexchange.cpp | 2 +- .../allgatherv/allgatherv-ompi-neighborexchange.cpp | 2 +- .../colls/allreduce/allreduce-mvapich-two-level.cpp | 2 +- .../allreduce/allreduce-ompi-ring-segmented.cpp | 8 ++++---- .../allreduce/allreduce-smp-binomial-pipeline.cpp | 2 +- src/smpi/colls/allreduce/allreduce-smp-binomial.cpp | 2 +- src/smpi/colls/allreduce/allreduce-smp-rdb.cpp | 2 +- src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp | 2 +- src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp | 2 +- src/smpi/colls/allreduce/allreduce-smp-rsag.cpp | 2 +- src/smpi/colls/barrier/barrier-ompi.cpp | 2 +- src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp | 4 ++-- src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp | 2 +- src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp | 2 +- src/smpi/colls/reduce/reduce-ompi.cpp | 2 +- src/smpi/colls/reduce/reduce-rab.cpp | 4 ++-- src/smpi/include/smpi_datatype.hpp | 2 +- src/smpi/include/smpi_f2c.hpp | 2 +- src/smpi/internals/smpi_replay.cpp | 2 +- src/smpi/plugins/load_balancer/LoadBalancer.cpp | 2 +- src/surf/network_cm02.cpp | 4 ++-- src/surf/network_wifi.cpp | 2 +- src/surf/network_wifi.hpp | 2 +- src/xbt/log.cpp | 2 +- src/xbt/mmalloc/mfree.c | 2 +- src/xbt/mmalloc/mrealloc.c | 2 +- src/xbt/xbt_str_test.cpp | 2 +- 48 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 846d304600..3e2322d47a 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; /** Helper class loading the native functions of SimGrid that we use for downcalls * - * Almost all org.simgrid.msg.* classes contain a static bloc (thus executed when the class is loaded) + * Almost all org.simgrid.msg.* classes contain a static block (thus executed when the class is loaded) * containing a call to this. */ public final class NativeLib { diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java index 5b1bf6685c..18e060b1e8 100644 --- a/src/bindings/java/org/simgrid/msg/Task.java +++ b/src/bindings/java/org/simgrid/msg/Task.java @@ -43,7 +43,7 @@ public class Task { * If 0, then it cannot be executed with the execute() method. * This value has to be ≥ 0. * - * @param bytesAmount A value of amount of data (in bytes) needed to transfert this task. + * @param bytesAmount A value of amount of data (in bytes) needed to transfer this task. * If 0, then it cannot be transferred with the get() and put() methods. * This value has to be ≥ 0. */ @@ -93,7 +93,7 @@ public class Task { * @param flopsAmount A value of the processing amount (in flop) needed * to process the task. If 0, then it cannot be executed * with the execute() method. This value has to be >= 0. - * @param bytesAmount A value of amount of data (in bytes) needed to transfert + * @param bytesAmount A value of amount of data (in bytes) needed to transfer * this task. If 0, then it cannot be transferred this task. * If 0, then it cannot be transferred with the get() and put() * methods. This value has to be >= 0. diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java index 1ca044548f..b1fbf650e9 100644 --- a/src/bindings/java/org/simgrid/msg/VM.java +++ b/src/bindings/java/org/simgrid/msg/VM.java @@ -131,7 +131,7 @@ public class VM extends Host { Msg.info("Migration of VM "+this.getName()+" to "+destination.getName()+" is impossible ("+e.getMessage()+")"); throw new HostFailureException(e.getMessage()); } - // If the migration correcly returned, then we should change the currentHost value. + // If the migration correctly returned, then we should change the currentHost value. this.currentHost = destination; } private native void nativeMigration(Host destination) throws MsgException; diff --git a/src/bindings/lua/simgrid_lua.hpp b/src/bindings/lua/simgrid_lua.hpp index 7ffcd4aee0..b6e7c2756f 100644 --- a/src/bindings/lua/simgrid_lua.hpp +++ b/src/bindings/lua/simgrid_lua.hpp @@ -9,7 +9,7 @@ #include /* ********************************************************************************* */ -/* Plaftorm functions */ +/* Platform functions */ /* ********************************************************************************* */ extern "C" { diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 66b1c1f88e..16729041a1 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -199,7 +199,7 @@ PYBIND11_MODULE(simgrid, m) /* Class Host */ py::class_>(m, "Host", "Simulated host") .def("by_name", &Host::by_name, "Retrieves a host from its name, or die") - .def("get_pstate_count", &Host::get_pstate_count, "Retrieve the cound of defined pstate levels") + .def("get_pstate_count", &Host::get_pstate_count, "Retrieve the count of defined pstate levels") .def("get_pstate_speed", &Host::get_pstate_speed, "Retrieve the maximal speed at the given pstate") .def_property( "pstate", &Host::get_pstate, diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp index d7de61e329..5aef06ad2b 100644 --- a/src/kernel/lmm/maxmin.hpp +++ b/src/kernel/lmm/maxmin.hpp @@ -313,7 +313,7 @@ public: Constraint* get_constraint(unsigned num) const { return num < cnsts_.size() ? cnsts_[num].constraint : nullptr; } /** - * @brief Get the weigth of the numth constraint associated to the variable + * @brief Get the weight of the numth constraint associated to the variable * @param num The rank of constraint we want to get * @return The numth constraint */ diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp index 34b47a219e..27d7496dd0 100644 --- a/src/mc/AddressSpace.hpp +++ b/src/mc/AddressSpace.hpp @@ -92,7 +92,7 @@ public: /** The process of this address space * - * This is where we can get debug informations, memory layout, etc. + * This is where we can get debug information, memory layout, etc. */ simgrid::mc::RemoteSimulation* get_remote_simulation() const { return remote_simulation_; } diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index f4de7fefea..894419cd40 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -105,7 +105,7 @@ void ModelChecker::setup_ignore() void ModelChecker::shutdown() { - XBT_DEBUG("Shuting down model-checker"); + XBT_DEBUG("Shutting down model-checker"); RemoteSimulation* process = &this->get_remote_simulation(); if (process->running()) { @@ -169,7 +169,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) case MC_MESSAGE_IGNORE_HEAP: { s_mc_message_ignore_heap_t message; - xbt_assert(size == sizeof(message), "Broken messsage"); + xbt_assert(size == sizeof(message), "Broken message"); memcpy(&message, buffer, sizeof(message)); IgnoredHeapRegion region; @@ -184,7 +184,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) case MC_MESSAGE_UNIGNORE_HEAP: { s_mc_message_ignore_memory_t message; - xbt_assert(size == sizeof(message), "Broken messsage"); + xbt_assert(size == sizeof(message), "Broken message"); memcpy(&message, buffer, sizeof(message)); get_remote_simulation().unignore_heap((void*)(std::uintptr_t)message.addr, message.size); break; @@ -193,7 +193,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) case MC_MESSAGE_IGNORE_MEMORY: { s_mc_message_ignore_memory_t message; - xbt_assert(size == sizeof(message), "Broken messsage"); + xbt_assert(size == sizeof(message), "Broken message"); memcpy(&message, buffer, sizeof(message)); this->get_remote_simulation().ignore_region(message.addr, message.size); break; @@ -202,7 +202,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) case MC_MESSAGE_STACK_REGION: { s_mc_message_stack_region_t message; - xbt_assert(size == sizeof(message), "Broken messsage"); + xbt_assert(size == sizeof(message), "Broken message"); memcpy(&message, buffer, sizeof(message)); this->get_remote_simulation().stack_areas().push_back(message.stack_region); } diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index b04c743a4b..2d62e2e5ac 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -63,7 +63,7 @@ static bool evaluate_label(const xbt_automaton_exp_label* l, std::vector co case xbt_automaton_exp_label::AUT_ONE: return true; default: - xbt_die("Unexpected vaue for automaton"); + xbt_die("Unexpected value for automaton"); } } diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index dd6b7b9527..98128c78ed 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -252,7 +252,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot continue; } - xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type); + xbt_assert(heapinfo1->type >= 0, "Unknown mmalloc block type: %d", heapinfo1->type); void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); @@ -359,7 +359,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot continue; } - xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type); + xbt_assert(heapinfo2b->type >= 0, "Unknown mmalloc block type: %d", heapinfo2b->type); for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) { if (i2 == i1 && j2 == j1) diff --git a/src/mc/inspect/DwarfExpression.hpp b/src/mc/inspect/DwarfExpression.hpp index c2058a988f..797f66143e 100644 --- a/src/mc/inspect/DwarfExpression.hpp +++ b/src/mc/inspect/DwarfExpression.hpp @@ -39,7 +39,7 @@ typedef std::vector DwarfExpression; /** Context of evaluation of a DWARF expression * * Some DWARF instructions need to read the CPU registers, - * the process memory, etc. All those informations are gathered in + * the process memory, etc. All those information are gathered in * the evaluation context. */ struct ExpressionContext { diff --git a/src/mc/inspect/ObjectInformation.hpp b/src/mc/inspect/ObjectInformation.hpp index 9903b530d8..92de05d3ef 100644 --- a/src/mc/inspect/ObjectInformation.hpp +++ b/src/mc/inspect/ObjectInformation.hpp @@ -51,7 +51,7 @@ class ObjectInformation { public: ObjectInformation() = default; - // Not copyable: + // Not copiable: ObjectInformation(ObjectInformation const&) = delete; ObjectInformation& operator=(ObjectInformation const&) = delete; @@ -156,7 +156,7 @@ public: XBT_PRIVATE std::shared_ptr createObjectInformation(std::vector const& maps, const char* name); -/** Augment the current module with informations about the other ones */ +/** Augment the current module with information about the other ones */ XBT_PRIVATE void postProcessObjectInformation(const simgrid::mc::RemoteSimulation* process, simgrid::mc::ObjectInformation* info); } // namespace mc diff --git a/src/mc/inspect/mc_dwarf.cpp b/src/mc/inspect/mc_dwarf.cpp index 22c8d6b1aa..ad2cd742d9 100644 --- a/src/mc/inspect/mc_dwarf.cpp +++ b/src/mc/inspect/mc_dwarf.cpp @@ -59,7 +59,7 @@ static uint64_t MC_dwarf_array_element_count(Dwarf_Die* die, Dwarf_Die* unit); /** @brief Process a DIE * - * @param info the resulting object fot the library/binary file (output) + * @param info the resulting object for the library/binary file (output) * @param die the current DIE * @param unit the DIE of the compile unit of the current DIE * @param frame containing frame if any @@ -74,7 +74,7 @@ static void MC_dwarf_handle_type_die(simgrid::mc::ObjectInformation* info, Dwarf /** @brief Calls MC_dwarf_handle_die on all children of the given die * - * @param info the resulting object fot the library/binary file (output) + * @param info the resulting object for the library/binary file (output) * @param die the current DIE * @param unit the DIE of the compile unit of the current DIE * @param frame containing frame if any @@ -84,7 +84,7 @@ static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf /** @brief Handle a variable (DW_TAG_variable or other) * - * @param info the resulting object fot the library/binary file (output) + * @param info the resulting object for the library/binary file (output) * @param die the current DIE * @param unit the DIE of the compile unit of the current DIE * @param frame containing frame if any @@ -1024,7 +1024,7 @@ static std::string find_by_build_id(std::vector id) return std::string(); } -/** @brief Populate the debugging informations of the given ELF object +/** @brief Populate the debugging information of the given ELF object * * Read the DWARf information of the EFFL object and populate the * lists of types, variables, functions. @@ -1058,7 +1058,7 @@ static void MC_load_dwarf(simgrid::mc::ObjectInformation* info) dwarf_end(dwarf); // If there was no DWARF in the file, try to find it in a separate file. - // Different methods might be used to store the DWARF informations: + // Different methods might be used to store the DWARF information: // * GNU NT_GNU_BUILD_ID // * .gnu_debuglink // See https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html @@ -1190,7 +1190,7 @@ static void MC_post_process_types(simgrid::mc::ObjectInformation* info) namespace simgrid { namespace mc { -/** @brief Finds informations about a given shared object/executable */ +/** @brief Finds information about a given shared object/executable */ std::shared_ptr createObjectInformation(std::vector const& maps, const char* name) { std::shared_ptr result = std::make_shared(); diff --git a/src/mc/inspect/mc_unw.cpp b/src/mc/inspect/mc_unw.cpp index f11170b54f..a9c273f1e7 100644 --- a/src/mc/inspect/mc_unw.cpp +++ b/src/mc/inspect/mc_unw.cpp @@ -183,7 +183,7 @@ int UnwindContext::access_reg(unw_addr_space_t /*as*/, unw_regnum_t regnum, unw_ return 0; } -/** Find informations about a function (libunwind method) +/** Find information about a function (libunwind method) */ int UnwindContext::get_proc_name(unw_addr_space_t /*as*/, unw_word_t addr, char* bufp, size_t buf_len, unw_word_t* offp, void* arg) noexcept diff --git a/src/mc/inspect/mc_unw.hpp b/src/mc/inspect/mc_unw.hpp index d94c171afc..f6c291c4ef 100644 --- a/src/mc/inspect/mc_unw.hpp +++ b/src/mc/inspect/mc_unw.hpp @@ -10,7 +10,7 @@ * Libunwind implementation for the model-checker * * Libunwind provides an pluggable stack unwinding API: the way the current - * registers and memory is accessed, the way unwinding informations is found + * registers and memory is accessed, the way unwinding information is found * is pluggable. * * This component implements the libunwind API for he model-checker: diff --git a/src/mc/mc_record.hpp b/src/mc/mc_record.hpp index 1cc96be99c..9bf1399606 100644 --- a/src/mc/mc_record.hpp +++ b/src/mc/mc_record.hpp @@ -5,7 +5,7 @@ /** \file mc_record.hpp * - * This file contains the MC replay/record functionnality. + * This file contains the MC replay/record functionality. * The recorded path is written in the log output and can be replayed with MC disabled * (even with an non-MC build) using `--cfg=model-check/replay:$replayPath`. * diff --git a/src/mc/remote/AppSide.cpp b/src/mc/remote/AppSide.cpp index f721a18d04..05019fb49d 100644 --- a/src/mc/remote/AppSide.cpp +++ b/src/mc/remote/AppSide.cpp @@ -168,7 +168,7 @@ void AppSide::ignore_memory(void* addr, std::size_t size) message.addr = (std::uintptr_t)addr; message.size = size; if (channel_.send(message)) - xbt_die("Could not send IGNORE_MEMORY mesage to model-checker"); + xbt_die("Could not send IGNORE_MEMORY message to model-checker"); } void AppSide::ignore_heap(void* address, std::size_t size) diff --git a/src/mc/sosp/PageStore.hpp b/src/mc/sosp/PageStore.hpp index f5511fe42d..934a32515e 100644 --- a/src/mc/sosp/PageStore.hpp +++ b/src/mc/sosp/PageStore.hpp @@ -23,7 +23,7 @@ namespace mc { /** @brief Storage for snapshot memory pages * * The first (lower) layer of the per-page snapshot mechanism is a page store: - * its responsibility is to store immutable sharable reference-counted memory + * its responsibility is to store immutable shareable reference-counted memory * pages independently of the snapshotting logic. Snapshot management and * representation is handled to an higher layer. READMORE * diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index a5c3141a47..34b7654bbf 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -620,7 +620,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) MPI_Request savedreq = *request; if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED) && not(savedreq->flags() & MPI_REQ_GENERALIZED)) - savedreq->ref();//don't erase te handle in Request::wait, we'll need it later + savedreq->ref();//don't erase the handle in Request::wait, we'll need it later else savedreq = MPI_REQUEST_NULL; diff --git a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp index 77b8723318..116e152d83 100644 --- a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp +++ b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp @@ -28,7 +28,7 @@ allgather__NTSLR_NB(const void *sbuf, int scount, MPI_Datatype stype, MPI_Request* rrequest_array = new MPI_Request[size]; MPI_Request* srequest_array = new MPI_Request[size]; - // irregular case use default MPI fucntions + // irregular case use default MPI functions if (scount * sextent != rcount * rextent) { XBT_WARN("MPI_allgather_NTSLR_NB use default MPI_allgather."); allgather__default(sbuf, scount, stype, rbuf, rcount, rtype, comm); diff --git a/src/smpi/colls/allgather/allgather-NTSLR.cpp b/src/smpi/colls/allgather/allgather-NTSLR.cpp index b2ded1c833..80428f0d91 100644 --- a/src/smpi/colls/allgather/allgather-NTSLR.cpp +++ b/src/smpi/colls/allgather/allgather-NTSLR.cpp @@ -26,7 +26,7 @@ allgather__NTSLR(const void *sbuf, int scount, MPI_Datatype stype, rextent = rtype->get_extent(); sextent = stype->get_extent(); - // irregular case use default MPI fucntions + // irregular case use default MPI functions if (scount * sextent != rcount * rextent) { XBT_WARN("MPI_allgather_NTSLR use default MPI_allgather."); allgather__default(sbuf, scount, stype, rbuf, rcount, rtype, comm); diff --git a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp index 75bb2f397b..8a0a2b7d1e 100644 --- a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp +++ b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp @@ -137,7 +137,7 @@ allgather__ompi_neighborexchange(const void *sbuf, int scount, - Rest of the steps: update recv_data_from according to offset, and exchange two blocks with appropriate neighbor. - the send location becomes previous receve location. + the send location becomes previous receive location. */ tmprecv = (char*)rbuf + neighbor[0] * rcount * rext; tmpsend = (char*)rbuf + rank * rcount * rext; diff --git a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp index 38c47dfb57..2d07775677 100644 --- a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp @@ -141,7 +141,7 @@ allgatherv__ompi_neighborexchange(const void *sbuf, int scount, - Rest of the steps: update recv_data_from according to offset, and exchange two blocks with appropriate neighbor. - the send location becomes previous receve location. + the send location becomes previous receive location. Note, we need to create indexed datatype to send and receive these blocks properly. */ diff --git a/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp index 1ab40644b9..23d02679b4 100644 --- a/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp +++ b/src/smpi/colls/allreduce/allreduce-mvapich-two-level.cpp @@ -164,7 +164,7 @@ int allreduce__mvapich2_two_level(const void *sendbuf, } } - /* Broadcasting the mesage from leader to the rest */ + /* Broadcasting the message from leader to the rest */ /* Note: shared memory broadcast could improve the performance */ mpi_errno = colls::bcast(recvbuf, count, datatype, 0, shmem_comm); diff --git a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp index c864a0785d..47d62c6755 100644 --- a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp +++ b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp @@ -88,7 +88,7 @@ * [02b] [12b] [22b] * * COMPUTATION PHASE 0 (a) - * Step 0: rank r sends block ra to rank (r+1) and receives bloc (r-1)a + * Step 0: rank r sends block ra to rank (r+1) and receives block (r-1)a * from rank (r-1) [with wraparound]. * # 0 1 2 * [00a] [00a+10a] [20a] @@ -98,7 +98,7 @@ * [22a+02a] [12a] [22a] * [02b] [12b] [22b] * - * Step 1: rank r sends block (r-1)a to rank (r+1) and receives bloc + * Step 1: rank r sends block (r-1)a to rank (r+1) and receives block * (r-2)a from rank (r-1) [with wraparound]. * # 0 1 2 * [00a] [00a+10a] [00a+10a+20a] @@ -109,7 +109,7 @@ * [02b] [12b] [22b] * * COMPUTATION PHASE 1 (b) - * Step 0: rank r sends block rb to rank (r+1) and receives bloc (r-1)b + * Step 0: rank r sends block rb to rank (r+1) and receives block (r-1)b * from rank (r-1) [with wraparound]. * # 0 1 2 * [00a] [00a+10a] [20a] @@ -119,7 +119,7 @@ * [22a+02a] [12a] [22a] * [22b+02b] [12b] [22b] * - * Step 1: rank r sends block (r-1)b to rank (r+1) and receives bloc + * Step 1: rank r sends block (r-1)b to rank (r+1) and receives block * (r-2)b from rank (r-1) [with wraparound]. * # 0 1 2 * [00a] [00a+10a] [00a+10a+20a] diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp index 15c1446f4c..d573d6a153 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp @@ -30,7 +30,7 @@ int allreduce_smp_binomial_pipeline_segment_size = 4096; */ /* -This fucntion performs all-reduce operation as follow. ** in a pipeline fashion ** +This function performs all-reduce operation as follow. ** in a pipeline fashion ** 1) binomial_tree reduce inside each SMP node 2) binomial_tree reduce intra-communication between root of each SMP node 3) binomial_tree bcast intra-communication between root of each SMP node diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp index 8c2c410716..de9695848e 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp @@ -20,7 +20,7 @@ //#include /* -This fucntion performs all-reduce operation as follow. +This function performs all-reduce operation as follow. 1) binomial_tree reduce inside each SMP node 2) binomial_tree reduce intra-communication between root of each SMP node 3) binomial_tree bcast intra-communication between root of each SMP node diff --git a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp index 489e719f80..a3a33cb280 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp @@ -20,7 +20,7 @@ //#include /* -This fucntion performs all-reduce operation as follow. +This function performs all-reduce operation as follow. 1) binomial_tree reduce inside each SMP node 2) Recursive doubling intra-communication between root of each SMP node 3) binomial_tree bcast inside each SMP node diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp index 1bf3f35c85..77ef310f1b 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-lr.cpp @@ -8,7 +8,7 @@ //#include /* -This fucntion performs all-reduce operation as follow. +This function performs all-reduce operation as follow. 1) binomial_tree reduce inside each SMP node 2) reduce-scatter -inter between root of each SMP node 3) allgather - inter between root of each SMP node diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp index 7e3c0c14d1..722b2efc17 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag-rab.cpp @@ -12,7 +12,7 @@ /* -This fucntion performs all-reduce operation as follow. +This function performs all-reduce operation as follow. 1) binomial_tree reduce inside each SMP node 2) reduce-scatter -inter between root of each SMP node 3) allgather - inter between root of each SMP node diff --git a/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp b/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp index 38f89eb25e..b6e50ce4d3 100644 --- a/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp +++ b/src/smpi/colls/allreduce/allreduce-smp-rsag.cpp @@ -7,7 +7,7 @@ #include "../colls_private.hpp" /* -This fucntion performs all-reduce operation as follow. +This function performs all-reduce operation as follow. 1) binomial_tree reduce inside each SMP node 2) reduce-scatter -inter between root of each SMP node 3) allgather - inter between root of each SMP node diff --git a/src/smpi/colls/barrier/barrier-ompi.cpp b/src/smpi/colls/barrier/barrier-ompi.cpp index f5ac1dc187..396b2747e2 100644 --- a/src/smpi/colls/barrier/barrier-ompi.cpp +++ b/src/smpi/colls/barrier/barrier-ompi.cpp @@ -24,7 +24,7 @@ #include "../colls_private.hpp" /* - * Barrier is ment to be a synchronous operation, as some BTLs can mark + * Barrier is meant to be a synchronous operation, as some BTLs can mark * a request done before its passed to the NIC and progress might not be made * elsewhere we cannot allow a process to exit the barrier until its last * [round of] sends are completed. diff --git a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp index 24736d4687..e91c7680cc 100644 --- a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp +++ b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp @@ -72,7 +72,7 @@ int bcast__ompi_split_bintree( void* buffer, int segindex, i, lr, pair; int segcount[2]; /* Number ompi_request_wait_allof elements sent with each segment */ uint32_t counts[2]; - int num_segments[2]; /* Number of segmenets */ + int num_segments[2]; /* Number of segments */ int sendcount[2]; /* the same like segcount, except for the last segment */ size_t realsegsize[2]; char *tmpbuf[2]; @@ -211,7 +211,7 @@ int bcast__ompi_split_bintree( void* buffer, Request::send(tmpbuf[lr], segcount[lr], datatype, tree->tree_next[i], COLL_TAG_BCAST, comm); } /* end of for each child */ - /* upate the base request */ + /* update the base request */ base_req = new_req; /* go to the next buffer (ie. the one corresponding to the next recv) */ tmpbuf[lr] += realsegsize[lr]; diff --git a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp index 7148af816d..646d3b17af 100644 --- a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp @@ -114,7 +114,7 @@ int bcast__scatter_LR_allgather(void *buff, int count, } // This process is responsible for all processes that have bits - // set from the LSB upto (but not including) mask. Because of + // set from the LSB up to (but not including) mask. Because of // the "not including", we start by shifting mask back down // one. diff --git a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp index 85cb9813d8..40cae7638d 100644 --- a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp @@ -72,7 +72,7 @@ static int scatter_for_bcast( } /* This process is responsible for all processes that have bits - set from the LSB upto (but not including) mask. Because of + set from the LSB up to (but not including) mask. Because of the "not including", we start by shifting mask back down one. */ diff --git a/src/smpi/colls/reduce/reduce-ompi.cpp b/src/smpi/colls/reduce/reduce-ompi.cpp index 0caa56c09f..ccdd68e07a 100644 --- a/src/smpi/colls/reduce/reduce-ompi.cpp +++ b/src/smpi/colls/reduce/reduce-ompi.cpp @@ -235,7 +235,7 @@ int smpi_coll_tuned_ompi_reduce_generic(const void* sendbuf, void* recvbuf, int */ else { - /* If the number of segments is less than a maximum number of oustanding + /* If the number of segments is less than a maximum number of outstanding requests or there is no limit on the maximum number of outstanding requests, we send data to the parent using blocking send */ if ((0 == max_outstanding_reqs) || diff --git a/src/smpi/colls/reduce/reduce-rab.cpp b/src/smpi/colls/reduce/reduce-rab.cpp index 06059579c0..c1e5cf7e02 100644 --- a/src/smpi/colls/reduce/reduce-rab.cpp +++ b/src/smpi/colls/reduce/reduce-rab.cpp @@ -378,8 +378,8 @@ Benchmark results on CRAY T3E otherwise the new protocol is used (see variable Ldb). 3) These lines show the bandwidth (= buffer length / execution time) for both protocols. - 4) This line shows that the limit is choosen well if the ratio is - between 0.95 (loosing 5% for buffer length near and >=limit) + 4) This line shows that the limit is chosen well if the ratio is + between 0.95 (losing 5% for buffer length near and >=limit) and 1.10 (not gaining 10% for buffer length near and latency_ > 0) { action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable)); if (is_update_lazy()) { - // add to the heap the event when the latency is payed + // add to the heap the event when the latency is paid double date = action->latency_ + action->get_last_update(); ActionHeap::Type type = route.empty() ? ActionHeap::Type::normal : ActionHeap::Type::latency; @@ -270,7 +270,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz // WIFI links are handled manually just above, so skip them now if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) { xbt_assert(link == src_wifi_link || link == dst_wifi_link, - "Wifi links can only occure at the beginning of the route (meaning that it's attached to the src) or " + "Wifi links can only occur at the beginning of the route (meaning that it's attached to the src) or " "at its end (meaning that it's attached to the dst"); } else { get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0); diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp index fb98ffa49d..2c062cd830 100644 --- a/src/surf/network_wifi.cpp +++ b/src/surf/network_wifi.cpp @@ -64,7 +64,7 @@ void NetworkWifiLink::refresh_decay_bandwidths(){ std::vector new_bandwidths; for (auto bandwidth : bandwidths_){ - // Instanciate decay model relatively to the actual bandwidth + // Instantiate decay model relatively to the actual bandwidth double max_bw=bandwidth.peak; double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_); double model_rate=bandwidth.peak-(wifi_max_rate_-model_rate_); diff --git a/src/surf/network_wifi.hpp b/src/surf/network_wifi.hpp index f0d2cce6c0..08699dcee2 100644 --- a/src/surf/network_wifi.hpp +++ b/src/surf/network_wifi.hpp @@ -25,7 +25,7 @@ class NetworkWifiLink : public LinkImpl { /** @brief Hold every rates association between host and links (host name, rates id) */ std::map host_rates_; - /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */ + /** @brief A link can have several bandwidths attached to it (mostly use by wifi model) */ std::vector bandwidths_; /** @brief Should we use the decay model ? */ diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp index ef3fd942cd..b536e7fe51 100644 --- a/src/xbt/log.cpp +++ b/src/xbt/log.cpp @@ -175,7 +175,7 @@ void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...) va_start(ev->ap, fmt); done = cat->layout->do_layout(cat->layout, ev, fmt); va_end(ev->ap); - ev->buffer = nullptr; // Calm down, static analyzers, this pointer to local array wont leak out of the scope. + ev->buffer = nullptr; // Calm down, static analyzers, this pointer to local array won't leak out of the scope. if (done) { appender->do_append(appender, buff); } else { diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c index 86dae306ed..0da4878d8e 100644 --- a/src/xbt/mmalloc/mfree.c +++ b/src/xbt/mmalloc/mfree.c @@ -149,7 +149,7 @@ void mfree(struct mdesc *mdp, void *ptr) default: if (type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); + fprintf(stderr, "Unknown mmalloc block type.\n"); abort(); } diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c index 7639ede797..186cc66ba0 100644 --- a/src/xbt/mmalloc/mrealloc.c +++ b/src/xbt/mmalloc/mrealloc.c @@ -126,7 +126,7 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) default: /* Fragment -> ??; type=logarithm to base two of the fragment size. */ if (type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); + fprintf(stderr, "Unknown mmalloc block type.\n"); abort(); } diff --git a/src/xbt/xbt_str_test.cpp b/src/xbt/xbt_str_test.cpp index 6a3bc606fd..d832dd2f57 100644 --- a/src/xbt/xbt_str_test.cpp +++ b/src/xbt/xbt_str_test.cpp @@ -51,7 +51,7 @@ TEST_CASE("xbt::str: String Handling", "xbt_str") test_split_quoted("Protected space", "toto\\ tutu", {"toto tutu"}); test_split_quoted("Several spaces", "toto tutu", {"toto", "tutu"}); test_split_quoted("LTriming", " toto tatu", {"toto", "tatu"}); - test_split_quoted("Triming", " toto tutu ", {"toto", "tutu"}); + test_split_quoted("Trimming", " toto tutu ", {"toto", "tutu"}); test_split_quoted("Single quotes", "'toto tutu' tata", {"toto tutu", "tata"}); test_split_quoted("Double quotes", "\"toto tutu\" tata", {"toto tutu", "tata"}); test_split_quoted("Mixed quotes", "\"toto' 'tutu\" tata", {"toto' 'tutu", "tata"}); -- 2.20.1