Commit 3d2bfeee authored by Gabriele Monaco's avatar Gabriele Monaco
Browse files

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: default avatarNam Cao <namcao@linutronix.de>
Link: https://lore.kernel.org/r/20251126104241.291258-8-gmonaco@redhat.com


Signed-off-by: default avatarGabriele Monaco <gmonaco@redhat.com>
parent 0d2405a0

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

+10 −10
Original line number Diff line number Diff line
@@ -8,21 +8,21 @@ 
#define MONITOR_NAME nrp



enum states_nrp {

	preempt_irq_nrp = 0,

	preempt_irq_nrp,

	any_thread_running_nrp,

	nested_preempt_nrp,

	rescheduling_nrp,

	state_max_nrp

	state_max_nrp,

};



#define INVALID_STATE state_max_nrp



enum events_nrp {

	irq_entry_nrp = 0,

	irq_entry_nrp,

	sched_need_resched_nrp,

	schedule_entry_nrp,

	schedule_entry_preempt_nrp,

	event_max_nrp

	event_max_nrp,

};



struct automaton_nrp {
@@ -38,38 +38,38 @@ static const struct automaton_nrp automaton_nrp = { 
		"preempt_irq",

		"any_thread_running",

		"nested_preempt",

		"rescheduling"

		"rescheduling",

	},

	.event_names = {

		"irq_entry",

		"sched_need_resched",

		"schedule_entry",

		"schedule_entry_preempt"

		"schedule_entry_preempt",

	},

	.function = {

		{

			preempt_irq_nrp,

			preempt_irq_nrp,

			nested_preempt_nrp,

			nested_preempt_nrp

			nested_preempt_nrp,

		},

		{

			any_thread_running_nrp,

			rescheduling_nrp,

			any_thread_running_nrp,

			INVALID_STATE

			INVALID_STATE,

		},

		{

			nested_preempt_nrp,

			preempt_irq_nrp,

			any_thread_running_nrp,

			any_thread_running_nrp

			any_thread_running_nrp,

		},

		{

			preempt_irq_nrp,

			rescheduling_nrp,

			any_thread_running_nrp,

			any_thread_running_nrp

			any_thread_running_nrp,

		},

	},

	.initial_state = preempt_irq_nrp,

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

+11 −11
Original line number Diff line number Diff line
@@ -8,25 +8,25 @@ 
#define MONITOR_NAME opid



enum states_opid {

	disabled_opid = 0,

	disabled_opid,

	enabled_opid,

	in_irq_opid,

	irq_disabled_opid,

	preempt_disabled_opid,

	state_max_opid

	state_max_opid,

};



#define INVALID_STATE state_max_opid



enum events_opid {

	irq_disable_opid = 0,

	irq_disable_opid,

	irq_enable_opid,

	irq_entry_opid,

	preempt_disable_opid,

	preempt_enable_opid,

	sched_need_resched_opid,

	sched_waking_opid,

	event_max_opid

	event_max_opid,

};



struct automaton_opid {
@@ -43,7 +43,7 @@ static const struct automaton_opid automaton_opid = { 
		"enabled",

		"in_irq",

		"irq_disabled",

		"preempt_disabled"

		"preempt_disabled",

	},

	.event_names = {

		"irq_disable",
@@ -52,7 +52,7 @@ static const struct automaton_opid automaton_opid = { 
		"preempt_disable",

		"preempt_enable",

		"sched_need_resched",

		"sched_waking"

		"sched_waking",

	},

	.function = {

		{
@@ -62,7 +62,7 @@ static const struct automaton_opid automaton_opid = { 
			INVALID_STATE,

			irq_disabled_opid,

			disabled_opid,

			disabled_opid

			disabled_opid,

		},

		{

			irq_disabled_opid,
@@ -71,7 +71,7 @@ static const struct automaton_opid automaton_opid = { 
			preempt_disabled_opid,

			enabled_opid,

			INVALID_STATE,

			INVALID_STATE

			INVALID_STATE,

		},

		{

			INVALID_STATE,
@@ -80,7 +80,7 @@ static const struct automaton_opid automaton_opid = { 
			INVALID_STATE,

			INVALID_STATE,

			in_irq_opid,

			in_irq_opid

			in_irq_opid,

		},

		{

			INVALID_STATE,
@@ -89,7 +89,7 @@ static const struct automaton_opid automaton_opid = { 
			disabled_opid,

			INVALID_STATE,

			irq_disabled_opid,

			INVALID_STATE

			INVALID_STATE,

		},

		{

			disabled_opid,
@@ -98,7 +98,7 @@ static const struct automaton_opid automaton_opid = { 
			INVALID_STATE,

			enabled_opid,

			INVALID_STATE,

			INVALID_STATE

			INVALID_STATE,

		},

	},

	.initial_state = disabled_opid,

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

+6 −6
Original line number Diff line number Diff line
@@ -8,18 +8,18 @@ 
#define MONITOR_NAME sco



enum states_sco {

	thread_context_sco = 0,

	thread_context_sco,

	scheduling_context_sco,

	state_max_sco

	state_max_sco,

};



#define INVALID_STATE state_max_sco



enum events_sco {

	sched_set_state_sco = 0,

	sched_set_state_sco,

	schedule_entry_sco,

	schedule_exit_sco,

	event_max_sco

	event_max_sco,

};



struct automaton_sco {
@@ -33,12 +33,12 @@ struct automaton_sco { 
static const struct automaton_sco automaton_sco = {

	.state_names = {

		"thread_context",

		"scheduling_context"

		"scheduling_context",

	},

	.event_names = {

		"sched_set_state",

		"schedule_entry",

		"schedule_exit"

		"schedule_exit",

	},

	.function = {

		{     thread_context_sco, scheduling_context_sco,          INVALID_STATE },

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

+6 −6
Original line number Diff line number Diff line
@@ -8,19 +8,19 @@ 
#define MONITOR_NAME scpd



enum states_scpd {

	cant_sched_scpd = 0,

	cant_sched_scpd,

	can_sched_scpd,

	state_max_scpd

	state_max_scpd,

};



#define INVALID_STATE state_max_scpd



enum events_scpd {

	preempt_disable_scpd = 0,

	preempt_disable_scpd,

	preempt_enable_scpd,

	schedule_entry_scpd,

	schedule_exit_scpd,

	event_max_scpd

	event_max_scpd,

};



struct automaton_scpd {
@@ -34,13 +34,13 @@ struct automaton_scpd { 
static const struct automaton_scpd automaton_scpd = {

	.state_names = {

		"cant_sched",

		"can_sched"

		"can_sched",

	},

	.event_names = {

		"preempt_disable",

		"preempt_enable",

		"schedule_entry",

		"schedule_exit"

		"schedule_exit",

	},

	.function = {

		{     can_sched_scpd,     INVALID_STATE,     INVALID_STATE,     INVALID_STATE },

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

+8 −8
Original line number Diff line number Diff line
@@ -8,19 +8,19 @@ 
#define MONITOR_NAME snep



enum states_snep {

	non_scheduling_context_snep = 0,

	non_scheduling_context_snep,

	scheduling_contex_snep,

	state_max_snep

	state_max_snep,

};



#define INVALID_STATE state_max_snep



enum events_snep {

	preempt_disable_snep = 0,

	preempt_disable_snep,

	preempt_enable_snep,

	schedule_entry_snep,

	schedule_exit_snep,

	event_max_snep

	event_max_snep,

};



struct automaton_snep {
@@ -34,26 +34,26 @@ struct automaton_snep { 
static const struct automaton_snep automaton_snep = {

	.state_names = {

		"non_scheduling_context",

		"scheduling_contex"

		"scheduling_contex",

	},

	.event_names = {

		"preempt_disable",

		"preempt_enable",

		"schedule_entry",

		"schedule_exit"

		"schedule_exit",

	},

	.function = {

		{

			non_scheduling_context_snep,

			non_scheduling_context_snep,

			scheduling_contex_snep,

			INVALID_STATE

			INVALID_STATE,

		},

		{

			INVALID_STATE,

			INVALID_STATE,

			INVALID_STATE,

			non_scheduling_context_snep

			non_scheduling_context_snep,

		},

	},

	.initial_state = non_scheduling_context_snep,