Skip to content

Commit f420481

Browse files
committed
Add additional SW internal trace logging
1 parent 2c70f34 commit f420481

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

src/lib/work_selector/intf.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ module type Lib_intf = sig
117117

118118
(** [mark_scheduled t work] Mark [work] as scheduled in [t] *)
119119
val mark_scheduled :
120-
t
120+
logger:Logger.t
121+
-> t
121122
-> ( Transaction_witness.t
122123
, Ledger_proof.Cached.t )
123124
Snark_work_lib.Work.Single.Spec.t

src/lib/work_selector/random.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
open Core_kernel
22

33
module Make (Lib : Intf.Lib_intf) = struct
4-
let work ~snark_pool ~fee ~logger:_ (state : Lib.State.t) =
4+
let work ~snark_pool ~fee ~logger (state : Lib.State.t) =
55
match Lib.State.all_unscheduled_expensive_works ~snark_pool ~fee state with
66
| [] ->
77
None
88
| expensive_work ->
99
let i = Random.int (List.length expensive_work) in
1010
let x = List.nth_exn expensive_work i in
11-
Lib.State.mark_scheduled state x ;
11+
Lib.State.mark_scheduled ~logger state x ;
1212
Some x
1313
end
1414

src/lib/work_selector/random_offset.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ module Make (Lib : Intf.Lib_intf) = struct
4242
List.nth_exn expensive_work !offset
4343
end
4444

45-
let work ~snark_pool ~fee ~logger:_ (state : Lib.State.t) =
45+
let work ~snark_pool ~fee ~logger (state : Lib.State.t) =
4646
match Lib.State.all_unscheduled_expensive_works ~snark_pool ~fee state with
4747
| [] ->
4848
None
4949
| expensive_work ->
5050
Offset.update ~new_length:(List.length expensive_work) ;
5151
let x = Offset.get_nth expensive_work in
52-
Lib.State.mark_scheduled state x ;
52+
Lib.State.mark_scheduled ~logger state x ;
5353
Some x
5454
end
5555

src/lib/work_selector/sequence.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module Make (Lib : Intf.Lib_intf) = struct
2-
let work ~snark_pool ~fee ~logger:_ (state : Lib.State.t) =
2+
let work ~snark_pool ~fee ~logger (state : Lib.State.t) =
33
match Lib.State.all_unscheduled_expensive_works ~snark_pool ~fee state with
44
| [] ->
55
None
66
| x :: _ ->
7-
Lib.State.mark_scheduled state x ;
7+
Lib.State.mark_scheduled ~logger state x ;
88
Some x
99
end
1010

src/lib/work_selector/work_lib.ml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ module Make (Inputs : Intf.Inputs_intf) = struct
7676
List.map ~f:Job_key.of_job t.available_jobs
7777
|> Job_key.Set.of_list
7878
in
79+
(* Log to internal trace all of the newly available jobs. *)
80+
Job_key.Set.iter new_job_keys ~f:(fun job_key ->
81+
[%log internal] "Snark_work_requested"
82+
~metadata:
83+
[ ( "work_ids"
84+
, Transaction_snark_work.Statement.compact_json
85+
job_key )
86+
] ) ;
7987
t.jobs_scheduled <-
8088
Job_key.Set.inter t.jobs_scheduled new_job_keys ) ;
8189
Deferred.unit )
@@ -84,10 +92,14 @@ module Make (Inputs : Intf.Inputs_intf) = struct
8492
|> Deferred.don't_wait_for ;
8593
t
8694

87-
let mark_scheduled t x =
88-
t.jobs_scheduled <-
89-
Job_key.Set.add t.jobs_scheduled
90-
(One_or_two.map ~f:Work_spec.statement x)
95+
let mark_scheduled ~logger t job =
96+
let statement = One_or_two.map ~f:Work_spec.statement job in
97+
(* Log to internal trace all of the newly available jobs. *)
98+
[%log internal] "Snark_work_scheduled"
99+
~metadata:
100+
[ ("work_ids", Transaction_snark_work.Statement.compact_json statement)
101+
] ;
102+
t.jobs_scheduled <- Job_key.Set.add t.jobs_scheduled statement
91103

92104
let does_not_have_better_fee ~snark_pool ~fee
93105
(statements : Inputs.Transaction_snark_work.Statement.t) : bool =

0 commit comments

Comments
 (0)