QPQ-AG/GajuMine
10
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

make init more robust

Browse Source
This commit is contained in:
Craig Everett 2025-08-11 14:34:51 +09:00
parent 35842b8ac7
commit 7feea1421b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gmc_con.erl
View File

@ -101,16 +101,28 @@ start_link() ->
init(none) -> init(none) ->
ok = log(info, "Starting"), ok = log(info, "Starting"),
{AProcs, AMem} = proc_mem(),
TwoMaps = default_spec(mem) * 2,
RProcs =
case AProcs >= 2 of
true -> 2;
false -> 1
end,
RMem =
case AMem >= TwoMaps of
true -> TwoMaps;
false -> default_spec(mem)
end,
{Acc, Keys, Network, MaxCores, MaxMem} = {Acc, Keys, Network, MaxCores, MaxMem} =
case read_conf() of case read_conf() of
{ok, C} -> {ok, C} ->
{maps:get(account, C, none), {maps:get(account, C, none),
maps:get(keys, C, []), maps:get(keys, C, []),
maps:get(network, C, <<"mainnet">>), maps:get(network, C, <<"mainnet">>),
maps:get(max_cores, C, 2), maps:get(max_cores, C, RProcs),
maps:get(max_mem, C, 3550722201)}; maps:get(max_mem, C, RMem)};
none -> none ->
{none, [], <<"mainnet">>, 2, 3550722201} {none, [], <<"mainnet">>, RProcs, RMem}
end, end,
State = #s{network = Network, acc = Acc, keys = Keys, max_cores = MaxCores, max_mem = MaxMem}, State = #s{network = Network, acc = Acc, keys = Keys, max_cores = MaxCores, max_mem = MaxMem},
{ok, start_gui(State)}. {ok, start_gui(State)}.
@ -252,7 +264,7 @@ optimize_count(MaxC, MaxM) ->
MaxMem = max(MapSize, MaxM), MaxMem = max(MapSize, MaxM),
{Procs, Memory} = proc_mem(), {Procs, Memory} = proc_mem(),
MeanMaps = min(MaxMem, Memory) div MapSize, MeanMaps = min(MaxMem, Memory) div MapSize,
Recommended = min(MaxCores, max(min(Procs, MeanMaps) - 1, 1)), Recommended = min(MaxCores, min(Procs, MeanMaps)),
Notice = fun(F, A) -> gmc_gui:message({notice, io_lib:format(F, A)}) end, Notice = fun(F, A) -> gmc_gui:message({notice, io_lib:format(F, A)}) end,
ok = Notice("Physical Processors: ~p", [Procs]), ok = Notice("Physical Processors: ~p", [Procs]),
ok = Notice("Physical Memory: ~p", [Memory]), ok = Notice("Physical Memory: ~p", [Memory]),

2
src/gmc_gui.erl
View File

@ -277,7 +277,7 @@ do_message({pool_notification, #{info := #{msg := MSG}}}, State = #s{height = He
ok = wxStaticText:setLabel(CandT, Candidate), ok = wxStaticText:setLabel(CandT, Candidate),
State; State;
#{solution_accepted := #{seq := Seq}} -> #{solution_accepted := #{seq := Seq}} ->
Entry = io_lib:format("~nSolution Accepted! You solved one! Sequence: ~w", [Seq]), Entry = io_lib:format("~nThe hive has produced a solution! Sequence: ~w", [Seq]),
do_message2(Entry, State); do_message2(Entry, State);
Other -> Other ->
Entry = io_lib:format("~nUnexpected 'pool_notification': ~tp", [Other]), Entry = io_lib:format("~nUnexpected 'pool_notification': ~tp", [Other]),