Skip to contentSkip to conversation

v4l2-tracer: add tracing for frames/events

PATCH New Deborah Brouwer 1 participant 5 messages Jun 7, 2023 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

cover v4l2-tracer: add tracing for frames/events

Hi,
This series adds some tracing/retracing for events, enumerating framesizes and frameintervals, and stringifying selection target values.

Deborah Brouwer (4):
v4l2-tracer: add VIDIOC_ENUM_FRAMESIZES
v4l2-tracer: add VIDIOC_ENUM_FRAMEINTERVALS
v4l2-tracer: stringify target in v4l2_selection
v4l2-tracer: add event tracing/retracing

 utils/v4l2-tracer/libv4l2tracer.cpp  |   5 ++
 utils/v4l2-tracer/retrace.cpp        | 112 ++++++++++++++++++++++++++-
 utils/v4l2-tracer/trace.cpp          |  13 ++++
 utils/v4l2-tracer/v4l2-tracer-gen.pl |  74 ++++++++++++++++--
 4 files changed, 192 insertions(+), 12 deletions(-)
Signature · 1 line
2.40.1
#1 lore raw

PATCH 1/4 v4l2-tracer: add VIDIOC_ENUM_FRAMESIZES

Add tracing and retracing for VIDIOC_ENUM_FRAMESIZES ioctl.

---
 utils/v4l2-tracer/libv4l2tracer.cpp  |  1 +
 utils/v4l2-tracer/retrace.cpp        | 15 +++++++++++++++
 utils/v4l2-tracer/trace.cpp          |  3 +++
 utils/v4l2-tracer/v4l2-tracer-gen.pl | 11 ++++++++++-
 4 files changed, 29 insertions(+), 1 deletion(-)
utils/v4l2-tracer/libv4l2tracer.cpp +1 -0
index 63c1812e..6edec7f4 100644
@@ -40,6 +40,7 @@ const std::list<unsigned long> ioctls = {
 	VIDIOC_G_EXT_CTRLS,
 	VIDIOC_S_EXT_CTRLS,
 	VIDIOC_TRY_EXT_CTRLS,
+	VIDIOC_ENUM_FRAMESIZES,
 	VIDIOC_ENCODER_CMD,
 	VIDIOC_TRY_ENCODER_CMD,
 	VIDIOC_CREATE_BUFS,
utils/v4l2-tracer/retrace.cpp +15 -0
index 51c8ad37..7003ca70 100644
@@ -966,6 +966,18 @@ void retrace_vidioc_s_ext_ctrls(int fd_retrace, json_object *ioctl_args)
 	}
 }
 
+void retrace_vidioc_enum_framesizes(int fd_retrace, json_object *ioctl_args)
+{
+	struct v4l2_frmsizeenum *ptr = retrace_v4l2_frmsizeenum_gen(ioctl_args);
+
+	ioctl(fd_retrace, VIDIOC_ENUM_FRAMESIZES, ptr);
+
+	if (is_verbose() || (errno != 0))
+		perror("VIDIOC_ENUM_FRAMESIZES");
+
+	free(ptr);
+}
+
 void retrace_vidioc_try_encoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
 	struct v4l2_encoder_cmd *ptr = retrace_v4l2_encoder_cmd_gen(ioctl_args);
@@ -1272,6 +1284,9 @@ void retrace_ioctl(json_object *syscall_obj)
 	case VIDIOC_S_EXT_CTRLS:
 		retrace_vidioc_s_ext_ctrls(fd_retrace, ioctl_args_user);
 		break;
+	case VIDIOC_ENUM_FRAMESIZES:
+		retrace_vidioc_enum_framesizes(fd_retrace, ioctl_args_user);
+		break;
 	case VIDIOC_TRY_ENCODER_CMD:
 		retrace_vidioc_try_encoder_cmd(fd_retrace, ioctl_args_user);
 		break;
utils/v4l2-tracer/trace.cpp +3 -0
index acf4cc98..78db2554 100644
@@ -589,6 +589,9 @@ json_object *trace_ioctl_args(unsigned long cmd, void *arg)
 	case VIDIOC_S_EXT_CTRLS:
 		trace_v4l2_ext_controls(arg, ioctl_args);
 		break;
+	case VIDIOC_ENUM_FRAMESIZES:
+		trace_v4l2_frmsizeenum_gen(arg, ioctl_args);
+		break;
 	case VIDIOC_TRY_ENCODER_CMD:
 	case VIDIOC_ENCODER_CMD:
 		trace_v4l2_encoder_cmd_gen(arg, ioctl_args);
utils/v4l2-tracer/v4l2-tracer-gen.pl +10 -1
index 8c6f7cb5..aaa112c1 100755
@@ -193,7 +193,7 @@ sub get_val_def_name {
 		}
 		return "nullptr"; # will print as hex string
 	}
-	if ($member =~ /pixelformat/) {
+	if ($member eq "pixelformat" || $member eq "pixel_format") {
 		return "v4l2_pix_fmt_val_def";
 	}
 	if ($member =~ /cmd/) {
@@ -363,6 +363,15 @@ sub handle_union {
 		printf $fh_retrace_cpp "\tdefault:\n\t\tbreak;\n\t}\n";
 	}
 
+	if ($struct_name eq "v4l2_frmsizeenum") {
+		printf $fh_trace_cpp "\tswitch (p->type) {\n";
+		printf $fh_trace_cpp "\tcase V4L2_FRMSIZE_TYPE_DISCRETE:\n";
+		printf $fh_trace_cpp "\t\ttrace_v4l2_frmsize_discrete_gen(&p->discrete, %s_obj);\n\t\tbreak;\n", $struct_name;
+		printf $fh_trace_cpp "\tcase V4L2_FRMSIZE_TYPE_STEPWISE:\n\tcase V4L2_FRMSIZE_TYPE_CONTINUOUS:\n";
+		printf $fh_trace_cpp "\t\ttrace_v4l2_frmsize_stepwise_gen(&p->stepwise, %s_obj);\n\t\tbreak;\n", $struct_name;
+		printf $fh_trace_cpp "\tdefault:\n\t\tbreak;\n\t}\n";
+	}
+
 	return $suppress_union;
 }
 
Signature · 1 line
2.40.1
#2 lore raw

PATCH 2/4 v4l2-tracer: add VIDIOC_ENUM_FRAMEINTERVALS

In reply to Deborah Brouwer

Add tracing and retracing for VIDIOC_ENUM_FRAMEINTERVALS ioctl.

---
 utils/v4l2-tracer/libv4l2tracer.cpp  |  1 +
 utils/v4l2-tracer/retrace.cpp        | 16 ++++++++++++++++
 utils/v4l2-tracer/trace.cpp          |  3 +++
 utils/v4l2-tracer/v4l2-tracer-gen.pl |  9 +++++++++
 4 files changed, 29 insertions(+)
utils/v4l2-tracer/libv4l2tracer.cpp +1 -0
index 6edec7f4..58a02656 100644
@@ -41,6 +41,7 @@ const std::list<unsigned long> ioctls = {
 	VIDIOC_S_EXT_CTRLS,
 	VIDIOC_TRY_EXT_CTRLS,
 	VIDIOC_ENUM_FRAMESIZES,
+	VIDIOC_ENUM_FRAMEINTERVALS,
 	VIDIOC_ENCODER_CMD,
 	VIDIOC_TRY_ENCODER_CMD,
 	VIDIOC_CREATE_BUFS,
utils/v4l2-tracer/retrace.cpp +16 -0
index 7003ca70..28dc6afe 100644
@@ -978,6 +978,19 @@ void retrace_vidioc_enum_framesizes(int fd_retrace, json_object *ioctl_args)
 	free(ptr);
 }
 
+void retrace_vidioc_enum_frameintervals(int fd_retrace, json_object *ioctl_args)
+{
+	struct v4l2_frmivalenum *ptr = retrace_v4l2_frmivalenum_gen(ioctl_args);
+
+	ioctl(fd_retrace, VIDIOC_ENUM_FRAMEINTERVALS, ptr);
+
+	if (is_verbose() || (errno != 0))
+		perror("VIDIOC_ENUM_FRAMEINTERVALS");
+
+	free(ptr);
+}
+
+
 void retrace_vidioc_try_encoder_cmd(int fd_retrace, json_object *ioctl_args)
 {
 	struct v4l2_encoder_cmd *ptr = retrace_v4l2_encoder_cmd_gen(ioctl_args);
@@ -1287,6 +1300,9 @@ void retrace_ioctl(json_object *syscall_obj)
 	case VIDIOC_ENUM_FRAMESIZES:
 		retrace_vidioc_enum_framesizes(fd_retrace, ioctl_args_user);
 		break;
+	case VIDIOC_ENUM_FRAMEINTERVALS:
+		retrace_vidioc_enum_frameintervals(fd_retrace, ioctl_args_user);
+		break;
 	case VIDIOC_TRY_ENCODER_CMD:
 		retrace_vidioc_try_encoder_cmd(fd_retrace, ioctl_args_user);
 		break;
utils/v4l2-tracer/trace.cpp +3 -0
index 78db2554..5049a996 100644
@@ -592,6 +592,9 @@ json_object *trace_ioctl_args(unsigned long cmd, void *arg)
 	case VIDIOC_ENUM_FRAMESIZES:
 		trace_v4l2_frmsizeenum_gen(arg, ioctl_args);
 		break;
+	case VIDIOC_ENUM_FRAMEINTERVALS:
+		trace_v4l2_frmivalenum_gen(arg, ioctl_args);
+		break;
 	case VIDIOC_TRY_ENCODER_CMD:
 	case VIDIOC_ENCODER_CMD:
 		trace_v4l2_encoder_cmd_gen(arg, ioctl_args);
utils/v4l2-tracer/v4l2-tracer-gen.pl +9 -0
index aaa112c1..f3eb87bb 100755
@@ -372,6 +372,15 @@ sub handle_union {
 		printf $fh_trace_cpp "\tdefault:\n\t\tbreak;\n\t}\n";
 	}
 
+	if ($struct_name eq "v4l2_frmivalenum") {
+		printf $fh_trace_cpp "\tswitch (p->type) {\n";
+		printf $fh_trace_cpp "\tcase V4L2_FRMIVAL_TYPE_DISCRETE:\n";
+		printf $fh_trace_cpp "\t\ttrace_v4l2_fract_gen(&p->discrete, %s_obj);\n\t\tbreak;\n", $struct_name;
+		printf $fh_trace_cpp "\tcase V4L2_FRMIVAL_TYPE_STEPWISE:\n\tcase V4L2_FRMIVAL_TYPE_CONTINUOUS:\n";
+		printf $fh_trace_cpp "\t\ttrace_v4l2_frmival_stepwise_gen(&p->stepwise, %s_obj);\n\t\tbreak;\n", $struct_name;
+		printf $fh_trace_cpp "\tdefault:\n\t\tbreak;\n\t}\n";
+	}
+
 	return $suppress_union;
 }
 
Signature · 1 line
2.40.1
#3 lore raw

PATCH 3/4 v4l2-tracer: stringify target in v4l2_selection

In reply to Deborah Brouwer

The struct v4l2_selection has a member "target" that is currently being traced as an integer. Since the "target" values are defines, convert them to strings to make the trace easier to read.

---
 utils/v4l2-tracer/v4l2-tracer-gen.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
utils/v4l2-tracer/v4l2-tracer-gen.pl +8 -1
index f3eb87bb..4db204e3 100755
@@ -246,7 +246,9 @@ sub get_val_def_name {
 	if ($member eq "audmode") {
 		return "tuner_audmode_val_def";
 	}
-	return "";
+	if ($member eq "target" && $struct_name eq "v4l2_selection") {
+		return "selection_target_val_def";
+	}
 }
 
 sub get_flag_def_name {
@@ -974,6 +976,11 @@ while (<>) {
 	if (grep {/^#define\s+(MEDIA_REQUEST_IOC\w*)\s*.*/} $_) {
 		push (@ioctls, $_);
 	}
+	if (grep {/^#define V4L2_SEL_TGT_CROP\s+/} $_) {
+		printf $fh_common_info_h "constexpr val_def selection_target_val_def[] = {\n";
+		val_def_gen("V4L2_SEL_TGT_COMPOSE_PADDED");
+		next;
+	}
 }
 
 printf $fh_common_info_h "constexpr val_def control_val_def[] = {\n";
Signature · 1 line
2.40.1
#4 lore raw

PATCH 4/4 v4l2-tracer: add event tracing/retracing

In reply to Deborah Brouwer

Add tracing and retracing for VIDIOC_DQEVENT, VIDIOC_SUBSCRIBE_EVENT, and VIDIOC_UNSUBSCRIBE_EVENT ioctls.

---
 utils/v4l2-tracer/libv4l2tracer.cpp  |  3 ++
 utils/v4l2-tracer/retrace.cpp        | 81 ++++++++++++++++++++++++++--
 utils/v4l2-tracer/trace.cpp          |  7 +++
 utils/v4l2-tracer/v4l2-tracer-gen.pl | 45 +++++++++++++---
 4 files changed, 126 insertions(+), 10 deletions(-)
utils/v4l2-tracer/libv4l2tracer.cpp +3 -0
index 58a02656..7286f321 100644
@@ -44,6 +44,9 @@ const std::list<unsigned long> ioctls = {
 	VIDIOC_ENUM_FRAMEINTERVALS,
 	VIDIOC_ENCODER_CMD,
 	VIDIOC_TRY_ENCODER_CMD,
+	VIDIOC_DQEVENT,
+	VIDIOC_SUBSCRIBE_EVENT,
+	VIDIOC_UNSUBSCRIBE_EVENT,
 	VIDIOC_CREATE_BUFS,
 	VIDIOC_PREPARE_BUF,
 	VIDIOC_G_SELECTION,
utils/v4l2-tracer/retrace.cpp +77 -4

108 lines not on this page · raw message

utils/v4l2-tracer/trace.cpp +7 -0
index 5049a996..0e8531ff 100644
@@ -599,6 +599,13 @@ json_object *trace_ioctl_args(unsigned long cmd, void *arg)
 	case VIDIOC_ENCODER_CMD:
 		trace_v4l2_encoder_cmd_gen(arg, ioctl_args);
 		break;
+	case VIDIOC_DQEVENT:
+		trace_v4l2_event_gen(arg, ioctl_args);
+		break;
+	case VIDIOC_SUBSCRIBE_EVENT:
+	case VIDIOC_UNSUBSCRIBE_EVENT:
+		trace_v4l2_event_subscription_gen(arg, ioctl_args);
+		break;
 	case VIDIOC_CREATE_BUFS:
 		trace_v4l2_create_buffers_gen(arg, ioctl_args);
 		break;
utils/v4l2-tracer/v4l2-tracer-gen.pl +39 -6

95 lines not on this page · raw message

Signature · 1 line
2.40.1