Skip to content

Commit 3d2bfee

Browse files
committed
verification/dot2c: Remove superfluous enum assignment and add last comma
The header files generated by dot2c currently create enums for states and events assigning the first element to 0. This is superfluous as it happens automatically if no value is specified. Also it doesn't add a comma to the last enum elements, which slightly complicates the diff if states or events are added. Remove the assignment to 0 and add a comma to last elements, this simplifies the logic for the code generator. Reviewed-by: Nam Cao <namcao@linutronix.de> Link: https://lore.kernel.org/r/20251126104241.291258-8-gmonaco@redhat.com Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
1 parent 0d2405a commit 3d2bfee

11 files changed

Lines changed: 94 additions & 106 deletions

File tree

kernel/trace/rv/monitors/nrp/nrp.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
#define MONITOR_NAME nrp
99

1010
enum states_nrp {
11-
preempt_irq_nrp = 0,
11+
preempt_irq_nrp,
1212
any_thread_running_nrp,
1313
nested_preempt_nrp,
1414
rescheduling_nrp,
15-
state_max_nrp
15+
state_max_nrp,
1616
};
1717

1818
#define INVALID_STATE state_max_nrp
1919

2020
enum events_nrp {
21-
irq_entry_nrp = 0,
21+
irq_entry_nrp,
2222
sched_need_resched_nrp,
2323
schedule_entry_nrp,
2424
schedule_entry_preempt_nrp,
25-
event_max_nrp
25+
event_max_nrp,
2626
};
2727

2828
struct automaton_nrp {
@@ -38,38 +38,38 @@ static const struct automaton_nrp automaton_nrp = {
3838
"preempt_irq",
3939
"any_thread_running",
4040
"nested_preempt",
41-
"rescheduling"
41+
"rescheduling",
4242
},
4343
.event_names = {
4444
"irq_entry",
4545
"sched_need_resched",
4646
"schedule_entry",
47-
"schedule_entry_preempt"
47+
"schedule_entry_preempt",
4848
},
4949
.function = {
5050
{
5151
preempt_irq_nrp,
5252
preempt_irq_nrp,
5353
nested_preempt_nrp,
54-
nested_preempt_nrp
54+
nested_preempt_nrp,
5555
},
5656
{
5757
any_thread_running_nrp,
5858
rescheduling_nrp,
5959
any_thread_running_nrp,
60-
INVALID_STATE
60+
INVALID_STATE,
6161
},
6262
{
6363
nested_preempt_nrp,
6464
preempt_irq_nrp,
6565
any_thread_running_nrp,
66-
any_thread_running_nrp
66+
any_thread_running_nrp,
6767
},
6868
{
6969
preempt_irq_nrp,
7070
rescheduling_nrp,
7171
any_thread_running_nrp,
72-
any_thread_running_nrp
72+
any_thread_running_nrp,
7373
},
7474
},
7575
.initial_state = preempt_irq_nrp,

kernel/trace/rv/monitors/opid/opid.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
#define MONITOR_NAME opid
99

1010
enum states_opid {
11-
disabled_opid = 0,
11+
disabled_opid,
1212
enabled_opid,
1313
in_irq_opid,
1414
irq_disabled_opid,
1515
preempt_disabled_opid,
16-
state_max_opid
16+
state_max_opid,
1717
};
1818

1919
#define INVALID_STATE state_max_opid
2020

2121
enum events_opid {
22-
irq_disable_opid = 0,
22+
irq_disable_opid,
2323
irq_enable_opid,
2424
irq_entry_opid,
2525
preempt_disable_opid,
2626
preempt_enable_opid,
2727
sched_need_resched_opid,
2828
sched_waking_opid,
29-
event_max_opid
29+
event_max_opid,
3030
};
3131

3232
struct automaton_opid {
@@ -43,7 +43,7 @@ static const struct automaton_opid automaton_opid = {
4343
"enabled",
4444
"in_irq",
4545
"irq_disabled",
46-
"preempt_disabled"
46+
"preempt_disabled",
4747
},
4848
.event_names = {
4949
"irq_disable",
@@ -52,7 +52,7 @@ static const struct automaton_opid automaton_opid = {
5252
"preempt_disable",
5353
"preempt_enable",
5454
"sched_need_resched",
55-
"sched_waking"
55+
"sched_waking",
5656
},
5757
.function = {
5858
{
@@ -62,7 +62,7 @@ static const struct automaton_opid automaton_opid = {
6262
INVALID_STATE,
6363
irq_disabled_opid,
6464
disabled_opid,
65-
disabled_opid
65+
disabled_opid,
6666
},
6767
{
6868
irq_disabled_opid,
@@ -71,7 +71,7 @@ static const struct automaton_opid automaton_opid = {
7171
preempt_disabled_opid,
7272
enabled_opid,
7373
INVALID_STATE,
74-
INVALID_STATE
74+
INVALID_STATE,
7575
},
7676
{
7777
INVALID_STATE,
@@ -80,7 +80,7 @@ static const struct automaton_opid automaton_opid = {
8080
INVALID_STATE,
8181
INVALID_STATE,
8282
in_irq_opid,
83-
in_irq_opid
83+
in_irq_opid,
8484
},
8585
{
8686
INVALID_STATE,
@@ -89,7 +89,7 @@ static const struct automaton_opid automaton_opid = {
8989
disabled_opid,
9090
INVALID_STATE,
9191
irq_disabled_opid,
92-
INVALID_STATE
92+
INVALID_STATE,
9393
},
9494
{
9595
disabled_opid,
@@ -98,7 +98,7 @@ static const struct automaton_opid automaton_opid = {
9898
INVALID_STATE,
9999
enabled_opid,
100100
INVALID_STATE,
101-
INVALID_STATE
101+
INVALID_STATE,
102102
},
103103
},
104104
.initial_state = disabled_opid,

kernel/trace/rv/monitors/sco/sco.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
#define MONITOR_NAME sco
99

1010
enum states_sco {
11-
thread_context_sco = 0,
11+
thread_context_sco,
1212
scheduling_context_sco,
13-
state_max_sco
13+
state_max_sco,
1414
};
1515

1616
#define INVALID_STATE state_max_sco
1717

1818
enum events_sco {
19-
sched_set_state_sco = 0,
19+
sched_set_state_sco,
2020
schedule_entry_sco,
2121
schedule_exit_sco,
22-
event_max_sco
22+
event_max_sco,
2323
};
2424

2525
struct automaton_sco {
@@ -33,12 +33,12 @@ struct automaton_sco {
3333
static const struct automaton_sco automaton_sco = {
3434
.state_names = {
3535
"thread_context",
36-
"scheduling_context"
36+
"scheduling_context",
3737
},
3838
.event_names = {
3939
"sched_set_state",
4040
"schedule_entry",
41-
"schedule_exit"
41+
"schedule_exit",
4242
},
4343
.function = {
4444
{ thread_context_sco, scheduling_context_sco, INVALID_STATE },

kernel/trace/rv/monitors/scpd/scpd.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
#define MONITOR_NAME scpd
99

1010
enum states_scpd {
11-
cant_sched_scpd = 0,
11+
cant_sched_scpd,
1212
can_sched_scpd,
13-
state_max_scpd
13+
state_max_scpd,
1414
};
1515

1616
#define INVALID_STATE state_max_scpd
1717

1818
enum events_scpd {
19-
preempt_disable_scpd = 0,
19+
preempt_disable_scpd,
2020
preempt_enable_scpd,
2121
schedule_entry_scpd,
2222
schedule_exit_scpd,
23-
event_max_scpd
23+
event_max_scpd,
2424
};
2525

2626
struct automaton_scpd {
@@ -34,13 +34,13 @@ struct automaton_scpd {
3434
static const struct automaton_scpd automaton_scpd = {
3535
.state_names = {
3636
"cant_sched",
37-
"can_sched"
37+
"can_sched",
3838
},
3939
.event_names = {
4040
"preempt_disable",
4141
"preempt_enable",
4242
"schedule_entry",
43-
"schedule_exit"
43+
"schedule_exit",
4444
},
4545
.function = {
4646
{ can_sched_scpd, INVALID_STATE, INVALID_STATE, INVALID_STATE },

kernel/trace/rv/monitors/snep/snep.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
#define MONITOR_NAME snep
99

1010
enum states_snep {
11-
non_scheduling_context_snep = 0,
11+
non_scheduling_context_snep,
1212
scheduling_contex_snep,
13-
state_max_snep
13+
state_max_snep,
1414
};
1515

1616
#define INVALID_STATE state_max_snep
1717

1818
enum events_snep {
19-
preempt_disable_snep = 0,
19+
preempt_disable_snep,
2020
preempt_enable_snep,
2121
schedule_entry_snep,
2222
schedule_exit_snep,
23-
event_max_snep
23+
event_max_snep,
2424
};
2525

2626
struct automaton_snep {
@@ -34,26 +34,26 @@ struct automaton_snep {
3434
static const struct automaton_snep automaton_snep = {
3535
.state_names = {
3636
"non_scheduling_context",
37-
"scheduling_contex"
37+
"scheduling_contex",
3838
},
3939
.event_names = {
4040
"preempt_disable",
4141
"preempt_enable",
4242
"schedule_entry",
43-
"schedule_exit"
43+
"schedule_exit",
4444
},
4545
.function = {
4646
{
4747
non_scheduling_context_snep,
4848
non_scheduling_context_snep,
4949
scheduling_contex_snep,
50-
INVALID_STATE
50+
INVALID_STATE,
5151
},
5252
{
5353
INVALID_STATE,
5454
INVALID_STATE,
5555
INVALID_STATE,
56-
non_scheduling_context_snep
56+
non_scheduling_context_snep,
5757
},
5858
},
5959
.initial_state = non_scheduling_context_snep,

kernel/trace/rv/monitors/snroc/snroc.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
#define MONITOR_NAME snroc
99

1010
enum states_snroc {
11-
other_context_snroc = 0,
11+
other_context_snroc,
1212
own_context_snroc,
13-
state_max_snroc
13+
state_max_snroc,
1414
};
1515

1616
#define INVALID_STATE state_max_snroc
1717

1818
enum events_snroc {
19-
sched_set_state_snroc = 0,
19+
sched_set_state_snroc,
2020
sched_switch_in_snroc,
2121
sched_switch_out_snroc,
22-
event_max_snroc
22+
event_max_snroc,
2323
};
2424

2525
struct automaton_snroc {
@@ -33,12 +33,12 @@ struct automaton_snroc {
3333
static const struct automaton_snroc automaton_snroc = {
3434
.state_names = {
3535
"other_context",
36-
"own_context"
36+
"own_context",
3737
},
3838
.event_names = {
3939
"sched_set_state",
4040
"sched_switch_in",
41-
"sched_switch_out"
41+
"sched_switch_out",
4242
},
4343
.function = {
4444
{ INVALID_STATE, own_context_snroc, INVALID_STATE },

0 commit comments

Comments
 (0)