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

Report no_solution for all relevant nonces with repeats

Browse Source
This commit is contained in:
Ulf Wiger 2025-09-25 23:25:00 +02:00
parent 8cb2c76614
commit 2a33d06bd6
15 changed files with 69 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebin/gmhive_client.app
View File

@ -1,6 +1,6 @@
{application,gmhive_client,
[{description,"Gajumaru Hive Client"},
{vsn,"0.6.0"},
{vsn,"0.6.1"},
{registered,[]},
{applications,[kernel,stdlib,sasl,gproc,inets,ssl,enoise,
gmconfig,gmhive_protocol,gmhive_worker]},

2
src/gmhc_app.erl
View File

@ -1,6 +1,6 @@
%% -*- mode: erlang; erlang-indent-level: 4; indent-tabs-mode: nil -*-
-module(gmhc_app).
-vsn("0.6.0").
-vsn("0.6.1").
-behaviour(application).

2
src/gmhc_config.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_config).
-vsn("0.6.0").
-vsn("0.6.1").
-export([ load_config/0
, get_config/1

2
src/gmhc_config_schema.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_config_schema).
-vsn("0.6.0").
-vsn("0.6.1").
-export([ schema/0
, to_json/0 ]).

2
src/gmhc_connector.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_connector).
-vsn("0.6.0").
-vsn("0.6.1").
-behaviour(gen_server).

2
src/gmhc_connectors_sup.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_connectors_sup).
-vsn("0.6.0").
-vsn("0.6.1").
-behavior(supervisor).
-export([ start_link/0

2
src/gmhc_counters.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_counters).
-vsn("0.6.0").
-vsn("0.6.1").
-export([ initialize/0 ]).

2
src/gmhc_eureka.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_eureka).
-vsn("0.6.0").
-vsn("0.6.1").
-export([get_pool_address/0]).

2
src/gmhc_events.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_events).
-vsn("0.6.0").
-vsn("0.6.1").
-export([subscribe/1,
ensure_subscribed/1,

30
src/gmhc_handler.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_handler).
-vsn("0.6.0").
-vsn("0.6.1").
-behavior(gen_server).
-export([ start_link/0
@ -12,6 +12,7 @@
]).
-export([ call/1
, async_call/1
, notify/1
, pool_connected/2
, from_pool/1 ]).
@ -38,6 +39,13 @@ call(Req) ->
{error, Reason}
end.
async_call(Req) ->
try gen_server:call(?MODULE, {async_call, Req}, ?CALL_TIMEOUT)
catch
exit:Reason ->
{error, Reason}
end.
notify(Msg) ->
gen_server:cast(?MODULE, {notify, Msg}).
@ -56,6 +64,8 @@ init([]) ->
handle_call({call, Req}, _From, #st{} = S) ->
{reply, call_connector(Req), S};
handle_call({async_call, Req}, _From, #st{} = S) ->
{reply, call_connector(Req, false), S};
handle_call(_Req, _From, S) ->
{reply, {error, unknown_method}, S}.
@ -119,17 +129,26 @@ maybe_publish(_) ->
maybe_via(#{via := Via}, Info) ->
Info#{via => Via}.
call_connector(Req0) ->
call_connector(Req) ->
call_connector(Req, true).
call_connector(Req0, Wait) ->
{ViaId, Req} = maps:take(via, Req0),
case gmhc_connector:whereis_id(ViaId) of
undefined ->
{error, no_connection};
Pid when is_pid(Pid) ->
Id = erlang:unique_integer(),
MRef = erlang:monitor(process, Pid),
MRef = case Wait of
true -> erlang:monitor(process, Pid);
false -> none
end,
gmhc_connector:send(ViaId, #{call => Req#{ id => Id }}),
case Wait of
true ->
receive
{from_pool, #{reply := #{ id := Id, result := Result }}} ->
{from_pool, #{reply := #{ id := Id
, result := Result }}} ->
erlang:demonitor(MRef),
Result;
{from_pool, #{error := #{ id := Id } = Error}} ->
@ -140,6 +159,9 @@ call_connector(Req0) ->
after 5000 ->
erlang:demonitor(MRef),
{error, {timeout, process_info(self(), messages)}}
end;
false ->
ok
end
end.

26
src/gmhc_server.erl
View File

@ -1,5 +1,5 @@
-module(gmhc_server).
-vsn("0.6.0").
-vsn("0.6.1").
-behaviour(gen_server).
@ -184,6 +184,9 @@ code_change(_FromVsn, S, _Extra) ->
report_solutions(Solutions, W, #st{} = S) when ?CONNECTED(S) ->
#{via := Via, seq := Seq} = W#worker.cand,
Nonces = all_nonces(W),
[report_no_solution_(Via, Seq, N)
|| N <- Nonces, not lists:keymember(N, 1, Solutions)],
gmhc_handler:call(
#{via => Via,
solutions => #{ seq => Seq
@ -191,19 +194,24 @@ report_solutions(Solutions, W, #st{} = S) when ?CONNECTED(S) ->
, evidence => Evd }
|| {Nonce, Evd} <- Solutions] }}).
%% report_solution(Nonce, Solution, W, #st{connected = true}) ->
%% #{seq := Seq} = W#worker.cand,
%% gmhc_handler:call(#{solution => #{ seq => Seq
%% , nonce => Nonce
%% , evidence => Solution }}).
report_no_solution(Nonce, W, #st{} = S) when ?CONNECTED(S) ->
report_no_solution(_Nonce, W, #st{} = S) when ?CONNECTED(S) ->
#{via := Via, seq := Seq} = W#worker.cand,
Nonces = all_nonces(W),
%% ?LOG_DEBUG("report no_solution Seq = ~p, Nonce = ~p", [Seq, Nonce]),
gmhc_handler:call(#{via => Via,
[report_no_solution_(Via, Seq, Nonce1) || Nonce1 <- Nonces],
ok.
report_no_solution_(Via, Seq, Nonce) ->
gmhc_handler:async_call(#{via => Via,
no_solution => #{ seq => Seq
, nonce => Nonce}}).
all_nonces(#worker{nonce = Nonce, config = Config}) ->
case gmhw_pow_cuckoo:repeats(Config) of
1 -> [Nonce];
Rs -> lists:seq(Nonce, Nonce + Rs - 1)
end.
maybe_request_nonces(#st{ candidate = #{via := Via, seq := Seq, nonces := Nonces}
, nonces = N} = S) when ?CONNECTED(S) ->
case Nonces == [] of

2
src/gmhc_sup.erl
View File

@ -1,6 +1,6 @@
%% -*- mode: erlang; erlang-indent-level: 4; indent-tabs-mode: nil -*-
-module(gmhc_sup).
-vsn("0.6.0").
-vsn("0.6.1").
-behaviour(supervisor).

2
src/gmhc_workers.erl
View File

@ -8,7 +8,7 @@
%%%-------------------------------------------------------------------
-module(gmhc_workers).
-vsn("0.6.0").
-vsn("0.6.1").
-export([
get_worker_configs/0

2
src/gmhive_client.erl
View File

@ -1,5 +1,5 @@
-module(gmhive_client).
-vsn("0.6.0").
-vsn("0.6.1").
-export([ connect/1
, disconnect/1

2
zomp.meta
View File

@ -4,7 +4,7 @@
{prefix,"gmhc"}.
{author,"Ulf Wiger, QPQ AG"}.
{desc,"Gajumaru Hive Client"}.
{package_id,{"uwiger","gmhive_client",{0,6,0}}}.
{package_id,{"uwiger","gmhive_client",{0,6,1}}}.
{deps,[{"uwiger","gmhive_worker",{0,5,1}},
{"uwiger","gmcuckoo",{1,2,4}},
{"otpr","eblake2",{1,0,1}},