Skip to contentSkip to conversation

tracing: Remove redundant variable ret

PATCH In review Hyeonggon Yoo 2 participants 6 messages May 27, 2021 – May 29, 2021 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracing: Remove redundant variable ret

This variable saves return value of event_hist_trigger_func, but it's never read. So it's redundant.

---
 kernel/trace/trace_events_hist.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace_events_hist.c +1 -2
index c1abd63f1d6c..414f2727d7a7 100644
@@ -5225,12 +5225,11 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
 	struct trace_event_file *file;
 	unsigned int i;
 	char *cmd;
-	int ret;
 
 	for (i = 0; i < hist_data->n_field_var_hists; i++) {
 		file = hist_data->field_var_hists[i]->hist_data->event_file;
 		cmd = hist_data->field_var_hists[i]->cmd;
-		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
+		event_hist_trigger_func(&trigger_hist_cmd, file,
 					      "!hist", "hist", cmd);
 	}
 }
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 14 lines · On Fri, 28 May 2021 02:14:49 +0900 Hyeonggon Yoo <[email protected]> wrote:

This variable saves return value of event_hist_trigger_func, but it's never read. So it's redundant.

---
 kernel/trace/trace_events_hist.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace_events_hist.c +0 -0
index c1abd63f1d6c..414f2727d7a7 100644
@@ -5225,12 +5225,11 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
 	struct trace_event_file *file;

kernel/trace/trace_events_hist.c static void unregister_field_var_hists(struct hist_trigger_data *hist_data) · line 5233

Quoted 10 lines
kernel/trace/trace_events_hist.c +1 -2
 	unsigned int i;
 	char *cmd;
-	int ret;
 
 	for (i = 0; i < hist_data->n_field_var_hists; i++) {
 		file = hist_data->field_var_hists[i]->hist_data->event_file;
 		cmd = hist_data->field_var_hists[i]->cmd;
-		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
+		event_hist_trigger_func(&trigger_hist_cmd, file,
 					      "!hist", "hist", cmd);

I wonder if instead we should add:

		WARN_ON_ONCE(ret < 0);

-- Steve

Quoted 2 lines
kernel/trace/trace_events_hist.c +0 -0
 	}
 }
#2 lore raw
Quoted 30 lines · Steven Rostedt
Quoted 14 lines · On Fri, 28 May 2021 02:14:49 +0900 Hyeonggon Yoo <[email protected]> wrote:

This variable saves return value of event_hist_trigger_func, but it's never read. So it's redundant.

---
 kernel/trace/trace_events_hist.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/trace_events_hist.c +0 -0
index c1abd63f1d6c..414f2727d7a7 100644
@@ -5225,12 +5225,11 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
 	struct trace_event_file *file;

kernel/trace/trace_events_hist.c static void unregister_field_var_hists(struct hist_trigger_data *hist_data) · line 5233

Quoted 10 lines
kernel/trace/trace_events_hist.c +1 -2
 	unsigned int i;
 	char *cmd;
-	int ret;
 
 	for (i = 0; i < hist_data->n_field_var_hists; i++) {
 		file = hist_data->field_var_hists[i]->hist_data->event_file;
 		cmd = hist_data->field_var_hists[i]->cmd;
-		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
+		event_hist_trigger_func(&trigger_hist_cmd, file,
 					      "!hist", "hist", cmd);

I wonder if instead we should add:

Quoted 2 lines
		WARN_ON_ONCE(ret < 0);

Oh, Seems better to warn, not ignoring.

#3 lore raw

PATCH v2 1/1 tracing: Add WARN_ON_ONCE when returned value is negative

In reply to Hyeonggon Yoo

From af7124e2bd00f739010eb283c9ab07e07da52224 Mon Sep 17 00:00:00 2001
From: Hyeonggon Yoo <[email protected]>
Date: Sat, 29 May 2021 14:51:05 +0900
Subject: [PATCH v2] tracing: Add WARN_ON_ONCE when returned value is negative

ret is assigned return value of event_hist_trigger_func, but the value is unused. It is better to warn when returned value is negative, rather than just ignoring it.

---
 kernel/trace/trace_events_hist.c | 1 +
 1 file changed, 1 insertion(+)
kernel/trace/trace_events_hist.c +1 -0
index c1abd63f1d6c..d169946ea4e9 100644
@@ -5232,6 +5232,7 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
 		cmd = hist_data->field_var_hists[i]->cmd;
 		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
 					      "!hist", "hist", cmd);
+		WARN_ON_ONCE(ret < 0);
 	}
 }
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH v2 1/1 tracing: Add WARN_ON_ONCE when returned value is negative

In reply to Hyeonggon Yoo

ret is assigned return value of event_hist_trigger_func, but the value is unused. It is better to warn when returned value is negative, rather than just ignoring it.

---
 kernel/trace/trace_events_hist.c | 1 +
 1 file changed, 1 insertion(+)
kernel/trace/trace_events_hist.c +1 -0
index c1abd63f1d6c..d169946ea4e9 100644
@@ -5232,6 +5232,7 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
 		cmd = hist_data->field_var_hists[i]->cmd;
 		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
 					      "!hist", "hist", cmd);
+		WARN_ON_ONCE(ret < 0);
 	}
 }
 
Signature · 1 line
2.25.1
#5 lore raw

Re: [PATCH v2] tracing: Add WARN_ON_ONCE when returned value is negative

Sorry, Sent it wrong format.
I think this is right format