Skip to content

Commit 069ccde

Browse files
author
Lars Asplund
committed
Added support for logger in phase locking mechanism.
1 parent 305bff6 commit 069ccde

3 files changed

Lines changed: 87 additions & 80 deletions

File tree

vunit/vhdl/run/src/run.vhd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -359,62 +359,62 @@ package body run_pkg is
359359
procedure lock_entry (
360360
signal runner : inout runner_sync_t;
361361
constant phase : in runner_legal_phase_t;
362-
constant me : in string := "";
362+
constant logger : in logger_t := runner_trace_logger;
363363
constant line_num : in natural := 0;
364364
constant file_name : in string := "") is
365365
begin
366366
lock_entry(runner_state, phase);
367-
log(runner_trace_logger, "Locked " & replace(runner_phase_t'image(phase), "_", " ") & " phase entry gate.", trace, line_num, file_name);
367+
log(logger, "Locked " & replace(runner_phase_t'image(phase), "_", " ") & " phase entry gate.", trace, line_num, file_name);
368368
notify(runner);
369369
end;
370370

371371
procedure unlock_entry (
372372
signal runner : inout runner_sync_t;
373373
constant phase : in runner_legal_phase_t;
374-
constant me : in string := "";
374+
constant logger : in logger_t := runner_trace_logger;
375375
constant line_num : in natural := 0;
376376
constant file_name : in string := "") is
377377
begin
378378
unlock_entry(runner_state, phase);
379-
log(runner_trace_logger, "Unlocked " & replace(runner_phase_t'image(phase), "_", " ") & " phase entry gate.", trace, line_num, file_name);
379+
log(logger, "Unlocked " & replace(runner_phase_t'image(phase), "_", " ") & " phase entry gate.", trace, line_num, file_name);
380380
notify(runner);
381381
end;
382382

383383
procedure lock_exit (
384384
signal runner : inout runner_sync_t;
385385
constant phase : in runner_legal_phase_t;
386-
constant me : in string := "";
386+
constant logger : in logger_t := runner_trace_logger;
387387
constant line_num : in natural := 0;
388388
constant file_name : in string := "") is
389389
begin
390390
lock_exit(runner_state, phase);
391-
log(runner_trace_logger, "Locked " & replace(runner_phase_t'image(phase), "_", " ") & " phase exit gate.", trace, line_num, file_name);
391+
log(logger, "Locked " & replace(runner_phase_t'image(phase), "_", " ") & " phase exit gate.", trace, line_num, file_name);
392392
notify(runner);
393393
end;
394394

395395
procedure unlock_exit (
396396
signal runner : inout runner_sync_t;
397397
constant phase : in runner_legal_phase_t;
398-
constant me : in string := "";
398+
constant logger : in logger_t := runner_trace_logger;
399399
constant line_num : in natural := 0;
400400
constant file_name : in string := "") is
401401
begin
402402
unlock_exit(runner_state, phase);
403-
log(runner_trace_logger, "Unlocked " & replace(runner_phase_t'image(phase), "_", " ") & " phase exit gate.", trace, line_num, file_name);
403+
log(logger, "Unlocked " & replace(runner_phase_t'image(phase), "_", " ") & " phase exit gate.", trace, line_num, file_name);
404404
notify(runner);
405405
end;
406406

407407
procedure wait_until (
408408
signal runner : in runner_sync_t;
409409
constant phase : in runner_legal_phase_t;
410-
constant me : in string := "";
410+
constant logger : in logger_t := runner_trace_logger;
411411
constant line_num : in natural := 0;
412412
constant file_name : in string := "") is
413413
begin
414414
if get_phase(runner_state) /= phase then
415-
log(runner_trace_logger, "Waiting for phase = " & replace(runner_phase_t'image(phase), "_", " ") & ".", trace, line_num, file_name);
415+
log(logger, "Waiting for phase = " & replace(runner_phase_t'image(phase), "_", " ") & ".", trace, line_num, file_name);
416416
wait on runner until get_phase(runner_state) = phase;
417-
log(runner_trace_logger, "Waking up. Phase is " & replace(runner_phase_t'image(phase), "_", " ") & ".", trace, line_num, file_name);
417+
log(logger, "Waking up. Phase is " & replace(runner_phase_t'image(phase), "_", " ") & ".", trace, line_num, file_name);
418418
end if;
419419
end;
420420

vunit/vhdl/run/src/run_api.vhd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,35 +87,35 @@ package run_pkg is
8787
procedure lock_entry (
8888
signal runner : inout runner_sync_t;
8989
constant phase : in runner_legal_phase_t;
90-
constant me : in string := "";
90+
constant logger : in logger_t := runner_trace_logger;
9191
constant line_num : in natural := 0;
9292
constant file_name : in string := "");
9393

9494
procedure unlock_entry (
9595
signal runner : inout runner_sync_t;
9696
constant phase : in runner_legal_phase_t;
97-
constant me : in string := "";
97+
constant logger : in logger_t := runner_trace_logger;
9898
constant line_num : in natural := 0;
9999
constant file_name : in string := "");
100100

101101
procedure lock_exit (
102102
signal runner : inout runner_sync_t;
103103
constant phase : in runner_legal_phase_t;
104-
constant me : in string := "";
104+
constant logger : in logger_t := runner_trace_logger;
105105
constant line_num : in natural := 0;
106106
constant file_name : in string := "");
107107

108108
procedure unlock_exit (
109109
signal runner : inout runner_sync_t;
110110
constant phase : in runner_legal_phase_t;
111-
constant me : in string := "";
111+
constant logger : in logger_t := runner_trace_logger;
112112
constant line_num : in natural := 0;
113113
constant file_name : in string := "");
114114

115115
procedure wait_until (
116116
signal runner : in runner_sync_t;
117117
constant phase : in runner_legal_phase_t;
118-
constant me : in string := "";
118+
constant logger : in logger_t := runner_trace_logger;
119119
constant line_num : in natural := 0;
120120
constant file_name : in string := "");
121121

0 commit comments

Comments
 (0)