Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spelling: "hopeful" #9474

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+39 −39
Open

spelling: "hopeful" #9474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
021efbb
spelling: rewrite safe usages to "hopeful"
adamwight Feb 23, 2025
23b3eae
spelling: rewrite possible unsafe usages to "hopeful"
adamwight Feb 23, 2025
06c252e
spelling: rewrite mysterious BIF usage to "hopeful"
adamwight Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions erts/emulator/beam/dist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static char *erts_dop_to_string(enum dop dop) {
int erts_is_alive; /* System must be blocked on change */
int erts_dist_buf_busy_limit;

Uint64 erts_dflags_test_remove_hopefull_flags;
Uint64 erts_dflags_test_remove_hopeful_flags;

Export spawn_request_yield_export;

Expand Down Expand Up @@ -5421,9 +5421,9 @@ setup_connection_distctrl(Process *c_p, void *arg, int *redsp, ErlHeapFragment *

BIF_RETTYPE erts_internal_get_dflags_0(BIF_ALIST_0)
{
if (erts_dflags_test_remove_hopefull_flags) {
if (erts_dflags_test_remove_hopeful_flags) {
/* For internal emulator tests only! */
const Uint64 mask = ~erts_dflags_test_remove_hopefull_flags;
const Uint64 mask = ~erts_dflags_test_remove_hopeful_flags;
Eterm *hp, **hpp = NULL;
Uint sz = 0, *szp = &sz;
Eterm res;
Expand Down
14 changes: 7 additions & 7 deletions erts/emulator/beam/dist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ extern int erts_is_alive;
#define ERTS_DIST_CTRL_OPT_GET_SIZE ((Uint32) (1 << 0))

/* for emulator internal testing... */
extern Uint64 erts_dflags_test_remove_hopefull_flags;
extern Uint64 erts_dflags_test_remove_hopeful_flags;

#ifdef DEBUG
#define ERTS_DBG_CHK_NO_DIST_LNK(D, R, L) \
Expand Down Expand Up @@ -265,8 +265,8 @@ typedef struct TTBSizeContext_ {

typedef struct TTBEncodeContext_ {
Uint64 dflags;
Uint64 hopefull_flags;
byte *hopefull_flagsp;
Uint64 hopeful_flags;
byte *hopeful_flagsp;
int level;
byte* ep;
Eterm obj;
Expand All @@ -279,7 +279,7 @@ typedef struct TTBEncodeContext_ {
Sint vlen;
Uint size;
byte *payload_ixp;
byte *hopefull_ixp;
byte *hopeful_ixp;
SysIOVec* iov;
ErlDrvBinary** binv;
Eterm *termv;
Expand Down Expand Up @@ -316,9 +316,9 @@ typedef struct TTBEncodeContext_ {
(Ctx)->continue_make_lext_hash = 0; \
(Ctx)->lext_vlen = -1; \
if ((Flags) & DFLAG_PENDING_CONNECT) { \
(Ctx)->hopefull_flags = 0; \
(Ctx)->hopefull_flagsp = NULL; \
(Ctx)->hopefull_ixp = NULL; \
(Ctx)->hopeful_flags = 0; \
(Ctx)->hopeful_flagsp = NULL; \
(Ctx)->hopeful_ixp = NULL; \
(Ctx)->payload_ixp = NULL; \
} \
} while (0)
Expand Down
4 changes: 2 additions & 2 deletions erts/emulator/beam/erl_bif_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5231,7 +5231,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
BIF_P->mbuf_sz += sz;
BIF_RET(copy);
}
else if (ERTS_IS_ATOM_STR("remove_hopefull_dflags", BIF_ARG_1)) {
else if (ERTS_IS_ATOM_STR("remove_hopeful_dflags", BIF_ARG_1)) {
Uint64 new_val;

if (!term_to_Uint64(BIF_ARG_2, &new_val)
Expand All @@ -5241,7 +5241,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
erts_thr_progress_block();

erts_dflags_test_remove_hopefull_flags = new_val;
erts_dflags_test_remove_hopeful_flags = new_val;

erts_thr_progress_unblock();
erts_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
Expand Down
26 changes: 13 additions & 13 deletions erts/emulator/beam/external.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ erts_encode_ext_dist_header_size(TTBEncodeContext *ctx,
Uint fragments)
{
if (ctx->dflags & DFLAG_PENDING_CONNECT) {
/* HOPEFUL_DATA + hopefull flags + hopefull ix + payload ix */
/* HOPEFUL_DATA + hopeful flags + hopeful ix + payload ix */
return 1 + 8 + 4 + 4;
}
else if (!acmp && !(ctx->dflags & DFLAG_FRAGMENTS))
Expand Down Expand Up @@ -396,10 +396,10 @@ byte *erts_encode_ext_dist_header_setup(TTBEncodeContext *ctx,
ctx->payload_ixp = ep;
put_int32(0, ep);
ep -= 4;
ctx->hopefull_ixp = ep;
ctx->hopeful_ixp = ep;
put_int32(ERTS_NO_HIX, ep);
ep -= 8;
ctx->hopefull_flagsp = ep;
ctx->hopeful_flagsp = ep;
put_int64(0, ep);
*--ep = HOPEFUL_DATA;
return ep;
Expand Down Expand Up @@ -787,8 +787,8 @@ int erts_encode_dist_ext(Eterm term, byte **ext, Uint64 flags, ErtsAtomCacheMap
if (fragmentsp)
*fragmentsp = res == 0 ? ctx->frag_ix + 1 : ctx->frag_ix;
if (flags & DFLAG_PENDING_CONNECT) {
ASSERT(ctx->hopefull_flagsp);
put_int64(ctx->hopefull_flags, ctx->hopefull_flagsp);
ASSERT(ctx->hopeful_flagsp);
put_int64(ctx->hopeful_flags, ctx->hopeful_flagsp);
}
return res;
}
Expand Down Expand Up @@ -6381,17 +6381,17 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
* element 1:
*
* +---+--------------+-----------+----------+
* |'H'|Hopefull Flags|Hopefull IX|Payload IX|
* |'H'|Hopeful Flags|Hopeful IX|Payload IX|
* +---+--------------+-----------+----------+
* 1 8 4 4
*
* Hopefull flags: Flags corresponding to actual
* hopefull encodings in this
* Hopeful flags: Flags corresponding to actual
* hopeful encodings in this
* buffer.
* Hopefull IX: Vector index of first hopefull
* encoding. Each hopefull encoding
* Hopeful IX: Vector index of first hopeful
* encoding. Each hopeful encoding
* is preceeded by 4 bytes containing
* next vector index of hopefull
* next vector index of hopeful
* encoding. ERTS_NO_HIX marks the
* end.
* Payload IX: Vector index of the beginning
Expand Down Expand Up @@ -6436,7 +6436,7 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
return reds;
}

/* Currently, the hopefull flags and IX are not used. */
/* Currently, the hopeful flags and IX are not used. */
hdr++;
hdr += 8;

Expand Down Expand Up @@ -6504,7 +6504,7 @@ Sint transcode_dist_obuf(ErtsDistOutputBuf* ob,
start_r = r = reds*ERTS_TRANSCODE_REDS_FACT;

/*
* Replace hopefull data header with actual header...
* Replace hopeful data header with actual header...
*/
ep = (byte *) iov[1].iov_base;
eiov->size -= iov[1].iov_len;
Expand Down
28 changes: 14 additions & 14 deletions erts/emulator/test/distribution_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
message_latency_large_exit2/0,
dist_entry_refc_race/1,
system_limit/1,
hopefull_data_encoding/1,
hopefull_export_fun_bug/1,
hopeful_data_encoding/1,
hopeful_export_fun_bug/1,
huge_iovec/1,
is_alive/1,
dyn_node_name_monitor_node/1,
Expand Down Expand Up @@ -119,7 +119,7 @@ all() ->
{group, bad_dist}, {group, bad_dist_ext},
dist_entry_refc_race,
start_epmd_false, no_epmd, epmd_module, system_limit,
hopefull_data_encoding, hopefull_export_fun_bug,
hopeful_data_encoding, hopeful_export_fun_bug,
huge_iovec, is_alive, dyn_node_name_monitor_node, dyn_node_name_monitor,
{group, async_dist}, creation_selection].

Expand Down Expand Up @@ -3094,21 +3094,21 @@ address_please(_Name, "dummy", inet) ->
address_please(_Name, "dummy", inet6) ->
{ok, {0,0,0,0,0,0,0,1}}.

hopefull_data_encoding(Config) when is_list(Config) ->
MkHopefullData = fun(Ref,Pid) -> mk_hopefull_data(Ref,Pid) end,
test_hopefull_data_encoding(MkHopefullData),
hopeful_data_encoding(Config) when is_list(Config) ->
MkHopefulData = fun(Ref,Pid) -> mk_hopeful_data(Ref,Pid) end,
test_hopeful_data_encoding(MkHopefulData),

%% Test funs with hopefully encoded term in environment
MkBitstringInFunEnv = fun(_,_) -> [mk_fun_with_env(<<5:7>>)] end,
test_hopefull_data_encoding(MkBitstringInFunEnv),
test_hopeful_data_encoding(MkBitstringInFunEnv),
MkExpFunInFunEnv = fun(_,_) -> [mk_fun_with_env(fun a:a/0)] end,
test_hopefull_data_encoding(MkExpFunInFunEnv),
test_hopeful_data_encoding(MkExpFunInFunEnv),
ok.

mk_fun_with_env(Term) ->
fun() -> Term end.

test_hopefull_data_encoding(MkDataFun) ->
test_hopeful_data_encoding(MkDataFun) ->
{ok, PeerProxy, ProxyNode} = ?CT_PEER(),
{ok, PeerBouncer, BouncerNode} = ?CT_PEER(["-hidden"]),
Tester = self(),
Expand Down Expand Up @@ -3161,18 +3161,18 @@ bounce_loop() ->
end,
bounce_loop().

mk_hopefull_data(RemoteRef, RemotePid) ->
mk_hopeful_data(RemoteRef, RemotePid) ->
HugeBs = list_to_bitstring([lists:duplicate(12*1024*1024, 85), <<6:6>>]),
<<_:1/bitstring,HugeBs2/bitstring>> = HugeBs,
mk_hopefull_data(list_to_binary(lists:seq(1,255))) ++
mk_hopeful_data(list_to_binary(lists:seq(1,255))) ++
[1234567890, HugeBs, fun gurka:banan/3, fun erlang:node/1,
RemotePid, self(), fun erlang:self/0] ++
mk_hopefull_data(list_to_binary(lists:seq(1,32))) ++
mk_hopeful_data(list_to_binary(lists:seq(1,32))) ++
[an_atom,
fun lists:reverse/1, RemoteRef, make_ref(), HugeBs2,
fun blipp:blapp/7].

mk_hopefull_data(BS) ->
mk_hopeful_data(BS) ->
BSsz = bit_size(BS),
lists:concat(
[lists:map(fun (Offset) ->
Expand Down Expand Up @@ -3211,7 +3211,7 @@ mk_hopefull_data(BS) ->
end, lists:seq(BSsz-32, BSsz-17))]).

%% ERL-1254
hopefull_export_fun_bug(Config) when is_list(Config) ->
hopeful_export_fun_bug(Config) when is_list(Config) ->
Msg = [1, fun blipp:blapp/7,
2, fun blipp:blapp/7],
{dummy, dummy@dummy} ! Msg. % Would crash on debug VM
Expand Down
Loading