Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  remove typo fixes to vendored code
  remove repeated words and small typos
  • Loading branch information
jhogberg committed Dec 11, 2023
2 parents 63c5f4b + 3b9ed94 commit 7b8570a
Show file tree
Hide file tree
Showing 42 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/sync-github-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CREATE_RELEASE=()
TAG_URL="${REPO}/tags?per_page=100"

## This function is used to loop over the pagianated results from github tags
## It sets TAGS to be the the json from the current page of tags
## It sets TAGS to be the json from the current page of tags
_next_page() {
TAGS=$(curl -s "${HDR[@]}" ${TAG_URL})
## In the "Link:" header from github we get the link for the next page.
Expand Down
2 changes: 1 addition & 1 deletion HOWTO/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ switches are:
* Set environment variable `VALGRIND_MISC_FLAGS` for any extra valgrind flags you want to pass.
* -asan
* Start [Clang Address Sanitizer](https://clang.llvm.org/docs/AddressSanitizer.html)
with the the correct settings and use the `asan` [type](types-and-flavors).
with the correct settings and use the `asan` [type](types-and-flavors).
* Set environment variable `ASAN_LOG_DIR` to where you want the logs.
* Set environment variable `ASAN_OPTIONS` for any extra asan options you want to pass.
* -gcov
Expand Down
2 changes: 1 addition & 1 deletion HOWTO/INSTALL-IOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In order to inform the build system that it should generate the static linkable

### Configure Erlang/OTP ###

To build without without OpenSSL support, run `configure` like this:
To build without OpenSSL support, run `configure` like this:

$ ./otp_build configure \
--xcomp-conf=./xcomp/erl-xcomp-arm64-ios.conf \
Expand Down
4 changes: 2 additions & 2 deletions HOWTO/MARKDOWN.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ places. Appropriate attributes to the `X` tag will also be generated.
contain information from a \%CopyrightBegin\%, \%CopyrightEnd\% block
if such exist (see below).

* A level `X` heading where `1 < X <= 6` will cause the the following
* A level `X` heading where `1 < X <= 6` will cause the following
to be generated:

<section>
Expand All @@ -209,7 +209,7 @@ places. Appropriate attributes to the `X` tag will also be generated.
other documents. That is, *be careful* when changing headings in an
existing document.

* A level `X` heading where `6 < X` will cause the the following
* A level `X` heading where `6 < X` will cause the following
to be generated:

<marker id="..."/>
Expand Down
2 changes: 1 addition & 1 deletion erts/doc/src/erl_dist_protocol.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@ DiB == gen_digest(ChA, ICA)?
<item><p>Process identifier of the group leader of the
newly created process.</p></item>
<tag><c>{Module :: atom(), Function :: atom(), Arity :: integer() >= 0}</c></tag>
<item><p>Entry point for the the new process.</p></item>
<item><p>Entry point for the new process.</p></item>
<tag><c>OptList :: [term()]</c></tag>
<item><p>A proper list of spawn options to use when spawning.</p></item>
<tag><c>ArgList :: [term()]</c></tag>
Expand Down
6 changes: 3 additions & 3 deletions erts/doc/src/erlang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8728,13 +8728,13 @@ true</pre>
corresponds to scheduler number 1 and so on. If support for
dirty schedulers exist, an element with the value for the
dirty CPU run queue and its associated dirty CPU schedulers
follow and then as last element the value for the the dirty
follow and then as last element the value for the dirty
IO run queue and its associated dirty IO schedulers follow.
The information is <em>not</em> gathered atomically. That is,
the result is not necessarily a consistent snapshot of the
state, but instead quite efficiently gathered.</p>
<note><p>Each normal scheduler has one run queue that it
manages. If dirty schedulers schedulers are supported, all
manages. If dirty schedulers are supported, all
dirty CPU schedulers share one run queue, and all dirty IO
schedulers share one run queue. That is, we have multiple
normal run queues, one dirty CPU run queue and one dirty
Expand Down Expand Up @@ -9013,7 +9013,7 @@ lists:map(
necessarily a consistent snapshot of the state, but
instead quite efficiently gathered.</p>
<note><p>Each normal scheduler has one run queue that it
manages. If dirty schedulers schedulers are supported, all
manages. If dirty schedulers are supported, all
dirty CPU schedulers share one run queue, and all dirty IO
schedulers share one run queue. That is, we have multiple
normal run queues, one dirty CPU run queue and one dirty
Expand Down
16 changes: 8 additions & 8 deletions erts/doc/src/notes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4587,7 +4587,7 @@
map in a single pass.</p>
<p>
<c>maps:from_keys/2</c> constructs a map from a list of
keys and a single value and can be used to to optimize
keys and a single value and can be used to optimize
sets operations such as from_list/1, filter/2,
intersection/2, and subtract/2.</p>
<p>
Expand Down Expand Up @@ -8336,7 +8336,7 @@
<item>
<p>
The Kernel application's User's Guide now contain a
Logger Cookbook with with common usage patterns.</p>
Logger Cookbook with common usage patterns.</p>
<p>
Own Id: OTP-16208</p>
</item>
Expand Down Expand Up @@ -12135,7 +12135,7 @@
been called, all exceptions will now contain the entry
for <em>one</em> function (despite the zero). It used to
be that a hand-made stack backtrace passed to
<c>erlang:raise/3</c> would be be truncated to an empty
<c>erlang:raise/3</c> would be truncated to an empty
list.</p>
<p>
Own Id: OTP-15026</p>
Expand Down Expand Up @@ -20798,7 +20798,7 @@
<p>
The previous default of a maximum of 32768 simultaneous
processes has been raised to 262144. This value can be
changed using the the <seecom
changed using the <seecom
marker="erl#+P">+P</seecom> command line flag of
<seecom marker="erl">erl(1)</seecom>. Note that the
value passed now is considered as a hint, and that actual
Expand Down Expand Up @@ -21602,7 +21602,7 @@
</item>
<item>
<p>Calling trace_info/2 asking for information about a
function that had native could could crash the run-time
function that had native could crash the run-time
system.</p>
<p>
Own Id: OTP-9886</p>
Expand Down Expand Up @@ -25413,7 +25413,7 @@
<item>
<p>
Emulator flags in an escript were earlier inherited to
emulators started from from the emulator running the
emulators started from the emulator running the
escript. For example when an escript invoked
<c>os:cmd("erl")</c>, the new emulator were given
erroneous emulator flags. This bug has now been fixed</p>
Expand Down Expand Up @@ -26873,7 +26873,7 @@
In the section about binary construction, the reference
manual now mentions what happens when an integer value
does not fit into an integer segment of size N (namely,
that the N least significant bits will be put into into
that the N least significant bits will be put into
the binary and that the most significant bits will be
silently discarded). (Thanks to Edwin Fine.)</p>
<p>
Expand Down Expand Up @@ -29653,7 +29653,7 @@
</item>
<item>
<p>The undocumented <c><![CDATA[{packet,http}]]></c> option (for the
<c><![CDATA[gen_tcp]]></c> module) did not not work correctly when
<c><![CDATA[gen_tcp]]></c> module) did not work correctly when
there were multiple continuation lines. (Thanks to Per
Hedeland.)</p>
<p>Own Id: OTP-5945</p>
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/emu/instrs.tab
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ put_tuple2(Dst, Arity) {

/*
* If operands are not packed (in the 32-bit VM),
* is is not safe to use $Dst directly after I
* it is not safe to use $Dst directly after I
* has been updated.
*/
Eterm* dst_ptr = &($Dst);
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/erl_flxctr.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ int erts_flxctr_suspend_until_thr_prg_if_snapshot_ongoing(ErtsFlxCtr* c, Process

/**
* @brief This function returns the number of bytes that are allocated
* for for the given FlxCtr.
* for the given FlxCtr.
*
* @return nr of bytes allocated for the FlxCtr
*/
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/erl_msacc.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ struct erl_msacc_t_ {
Eterm id;
char *type;

/* the the values below are protected by mtx iff unmanaged = 1 */
/* the values below are protected by mtx iff unmanaged = 1 */
ErtsSysPerfCounter perf_counter;
Uint state;
ErtsMsAccPerfCntr counters[];
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/erl_node_tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Vs = [begin [Val, _, _, _, What] = All = string:lexemes(Ln, " "),{Val,What,All}
Accs = lists:foldl(fun({V,<<"ERL_NODE_INC">>,_},M) -> Val = maps:get(V,M,0), M#{ V => Val + 1 }; ({V,<<"ERL_NODE_DEC">>,_},M) -> Val = maps:get(V,M,0), M#{ V => Val - 1 } end, #{}, Vs).
lists:usort(lists:filter(fun({V,N}) -> N /= 0 end, maps:to_list(Accs))).
* There are bound to be bugs in the the instrumentation code, but
* There are bound to be bugs in the instrumentation code, but
* at least this is a place to start when hunting refc bugs.
*
*/
Expand Down
4 changes: 2 additions & 2 deletions erts/emulator/beam/erl_proc_sig_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ erts_proc_sig_send_sync_suspend(Process *c_p, Eterm to,
* term returned by 'func'. If the return value of
* 'func' is not an immediate term, 'func' has to
* allocate a heap fragment where the result is stored
* and update the the heap fragment pointer pointer
* and update the heap fragment pointer pointer
* passed as third argument to point to it.
*
* If this function returns a reference, 'func' will
Expand Down Expand Up @@ -1070,7 +1070,7 @@ erts_proc_sig_send_rpc_request(Process *c_p,
* term returned by 'func'. If the return value of
* 'func' is not an immediate term, 'func' has to
* allocate a heap fragment where the result is stored
* and update the the heap fragment pointer pointer
* and update the heap fragment pointer pointer
* passed as third argument to point to it.
*
* If this function returns a reference, 'func' will
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/erl_process.h
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,7 @@ extern int erts_system_profile_ts_type;
# define F_INITIAL_TRACE_FLAGS 0
#endif

/* F_TIMESTAMP_MASK is a bit-field of all all timestamp types */
/* F_TIMESTAMP_MASK is a bit-field of all timestamp types */
#define F_TIMESTAMP_MASK \
(ERTS_TRACE_TS_TYPE_MASK << ERTS_TRACE_FLAGS_TS_TYPE_SHIFT)

Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/erl_term.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ struct erl_node_; /* Declared in erl_node_tables.h */
*
* - The tag is zero for arityval and non-zero for thing headers.
* - A single bit differentiates between positive and negative bignums.
* - If more tags are needed, the REF and and EXTERNAL_REF tags could probably
* - If more tags are needed, the REF and EXTERNAL_REF tags could probably
* be combined to one tag.
*
* XXX: globally replace XXX_SUBTAG with TAG_HEADER_XXX
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/jit/arm/ops.tab
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ i_get_tuple_element Tuple Pos Tuple2 | current_tuple Tuple3 |
equal(Tuple, Tuple2) | equal(Tuple, Tuple3) =>
i_get_tuple_element Tuple Pos Tuple

# This is a current_tuple instruction instruction not followed by
# This is a current_tuple instruction not followed by
# get_tuple_element. Invalidate the current tuple pointer.

current_tuple Tuple => _
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/beam/jit/x86/ops.tab
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ i_get_tuple_element Tuple Pos Tuple2 | current_tuple Tuple3 |
equal(Tuple, Tuple2) | equal(Tuple, Tuple3) =>
i_get_tuple_element Tuple Pos Tuple

# This is a current_tuple instruction instruction not followed by
# This is a current_tuple instruction not followed by
# get_tuple_element. Invalidate the current tuple pointer.

current_tuple Tuple => _
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/internal_doc/AutomaticYieldingOfCCode.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ belong. For example, the functions for the map BIFs are placed in
`erl_map.c` together with the other map-related functions. When
building, YCF is invoked to generate the transformed versions of the
functions into a header file that is included in the source file that
contains the the non-transformed version of the function (search for
contains the non-transformed version of the function (search for
YCF in `$ERL_TOP/erts/emulator/Makefile.in` to see examples of how YCF
can be invoked).

Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/internal_doc/PTables.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ When we insert a new element in the table we do the following:
be done before we publish the structure in the table. This, for
example, includes storing the identifier in the process structure.

6. Now we can publish the structure in the table by writing the the
6. Now we can publish the structure in the table by writing the
pointer to the process structure in the slot previously reserved
in 3.

Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/internal_doc/Tracing.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ through when adding a new breakpoint.
9. Wait for thread progress.

10. Prepare for next call to `trace_pattern` by updating the new staging part
(the old active) of the breakpoint to be identic to the the new active part.
(the old active) of the breakpoint to be identic to the new active part.

11. Release code modification permission and return from `trace_pattern`.

Expand Down
6 changes: 3 additions & 3 deletions erts/emulator/internal_doc/beam_makeops.md
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,8 @@ Here is first an example how it is used:
is_map Fail Lit=q | literal_is_map(Lit) => _

If the `Lit` operand is a literal, then the `literal_is_map()`
predicate is called to determine wheter is is a map literal.
It it is, the instruction is not needed and can be removed.
predicate is called to determine whether it is a map literal.
If it is, the instruction is not needed and can be removed.

`literal_is_map()` is implemented like this (in `emu/predicates.tab`):

Expand Down Expand Up @@ -1682,7 +1682,7 @@ similar to this:

#### Variable number of operands ####

Here follows an example of how to to handle an instruction with a variable number
Here follows an example of how to handle an instruction with a variable number
of operands for the interpreter. Here is the instruction definition in `emu/ops.tab`:

put_tuple2 xy I *
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/nifs/common/prim_net_nif.c
Original file line number Diff line number Diff line change
Expand Up @@ -3648,7 +3648,7 @@ void encode_adapter_index_map(ErlNifEnv* env,
* nif_get_ip_address_table
*
* Description:
* Get ip address table table.
* Get ip address table.
* This is a windows only function!
*
* Active Interfaces?
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/sys/common/erl_osenv.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int erts_osenv_unset_term(erts_osenv_t *env, Eterm key);
* @param value [in,out] The buffer to copy the value into, may be NULL if you
* only wish to query presence.
*
* @return 1 on success, 0 if the key couldn't be found, and -1 if if the value
* @return 1 on success, 0 if the key couldn't be found, and -1 if the value
* didn't fit into the buffer. */
int erts_osenv_get_native(const erts_osenv_t *env, const erts_osenv_data_t *key,
erts_osenv_data_t *value);
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/big_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ test_squaring(I) ->
Sqr = I * I,

%% This expression will be multiplied in the usual way, because
%% the the two operands for '*' are stored at different addresses.
%% the two operands for '*' are stored at different addresses.
Sqr = I * ((I + id(1)) - id(1)),

ok.
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/bs_match_int_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ get_int(Bin0) ->
%% Note that it has become impossible to create a byte-sized sub
%% binary (see erts_build_sub_bitstring() in erl_bits.c) of size 64
%% or less. Therefore, to be able to create an unaligned binary,
%% we'll need to base it on on a binary with more than 64 bytes.
%% we'll need to base it on a binary with more than 64 bytes.
Size = bit_size(Bin0),
Filler = rand:bytes(65),
UnsignedBigBin = id(<<Filler/binary,Bin0/bits>>),
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/bs_utf_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ do_utf8_roundtrip(First, Last) when First =< Last ->

%% Here a heap binary and a sub binary will be allocated. If the
%% write in the utf8 segment extends beyond the end of heap binary,
%% it will will overwrite the header for the sub binary.
%% it will overwrite the header for the sub binary.
<<-1:(64-9)/signed,Bin/binary>> = id(<<-1:(64-9),First/utf8>>),
<<-1:63/signed,Bin/binary>> = id(<<-1:63,First/utf8>>),

Expand Down
4 changes: 2 additions & 2 deletions erts/emulator/test/code_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ constant_refc_binaries_test(Config) when is_list(Config) ->
Bef = memory_binary(),
io:format("Binary data (bytes) before test: ~p\n", [Bef]),

%% Compile the the literals module.
%% Compile the literals module.
Data = proplists:get_value(data_dir, Config),
File = filename:join(Data, "literals"),
{ok,literals,Code} = compile:file(File, [report,binary]),
Expand Down Expand Up @@ -858,7 +858,7 @@ t_copy_literals(Config) when is_list(Config) ->
run_sys_proc_test(fun t_copy_literals_test/1, Config).

t_copy_literals_test(Config) when is_list(Config) ->
%% Compile the the literals module.
%% Compile the literals module.
Data = proplists:get_value(data_dir, Config),
File = filename:join(Data, "literals"),
{ok,literals,Code} = compile:file(File, [report,binary]),
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/dirty_nif_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ dirty_nif_send_traced(Config) when is_list(Config) ->
true = Time2 >= 1900,

%% Make sure that the send trace is
%% in between an in and and out trace
%% in between an in and an out trace
(fun F() ->
%% We got an in trace, look for out or send
{trace,Sndr,in,_} = recv_trace_from(Sndr),
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/distribution_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ roundtrip(Term) ->
exit(Term).

%% Test that the smallest external term [] aka NIL can be sent to
%% another node node and back again.
%% another node and back again.
nil_roundtrip(Config) when is_list(Config) ->
process_flag(trap_exit, true),
{ok, Peer, Node} = ?CT_PEER(),
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/test/map_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -2994,7 +2994,7 @@ t_maps_without(_Config) ->

%% MISC

%% Verify that the the number of nodes in hashmaps
%% Verify that the number of nodes in hashmaps
%% of different types and sizes does not deviate too
%% much from the theoretical model.
%% For debug with DBG_HASHMAP_COLLISION_BONANZA the test will expect
Expand Down
2 changes: 1 addition & 1 deletion erts/etc/unix/RELNOTES
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ the 4.2 system, but there is a number of incompatibilities.

-- eprof, is a (tty-based) tool for real-time profiling, see eprof(3).

-- dbg, is a (tty-based) interface to the the trace/3 BIF, see dbg(3).
-- dbg, is a (tty-based) interface to the trace/3 BIF, see dbg(3).

-- pman, is a (pxw-based) interface to the trace/3 BIF.

Expand Down
2 changes: 1 addition & 1 deletion erts/etc/unix/etp-commands.in
Original file line number Diff line number Diff line change
Expand Up @@ -4394,7 +4394,7 @@ document etp-search-alloc
%---------------------------------------------------------------------------
% etp-search-heaps Eterm
%
% Search all internal allocator memory blocks for for the specified Eterm.
% Search all internal allocator memory blocks for the specified Eterm.
%---------------------------------------------------------------------------
end

Expand Down
Loading

0 comments on commit 7b8570a

Please sign in to comment.