Skip to contentSkip to conversation

perf script: Remove duplicated code and needless a script_spec__findnew()

PATCH Applied Taeung Song 4 participants 6 messages Feb 25, 2016 – Feb 27, 2016 perf events

v1 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 perf script: Remove duplicated code and needless a script_spec__findnew()

script_spec_register() called two functions
script_spec__find() and script_spec__findnew().
But script_spec__find() was called two times.

So remove script_spec__findnew() and make script_spec_register() only call once script_spec__find().

---
 tools/perf/builtin-script.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
tools/perf/builtin-script.c +3 -18
index ec4fbd4..57f9a7e 100644
@@ -1212,23 +1212,6 @@ static struct script_spec *script_spec__find(const char *spec)
 	return NULL;
 }
 
-static struct script_spec *script_spec__findnew(const char *spec,
-						struct scripting_ops *ops)
-{
-	struct script_spec *s = script_spec__find(spec);
-
-	if (s)
-		return s;
-
-	s = script_spec__new(spec, ops);
-	if (!s)
-		return NULL;
-
-	script_spec__add(s);
-
-	return s;
-}
-
 int script_spec_register(const char *spec, struct scripting_ops *ops)
 {
 	struct script_spec *s;
@@ -1237,9 +1220,11 @@ int script_spec_register(const char *spec, struct scripting_ops *ops)
 	if (s)
 		return -1;
 
-	s = script_spec__findnew(spec, ops);
+	s = script_spec__new(spec, ops);
 	if (!s)
 		return -1;
+	else
+		script_spec__add(s);
 
 	return 0;
 }
Signature · 1 line
2.5.0
#2 lore raw

Hi, Jiri

Quoted 5 lines · Jiri Olsa
Quoted 4 lines · Taeung Song

script_spec_register() called two functions
script_spec__find() and script_spec__findnew().
But script_spec__find() was called two times.

Quoted 8 lines
Quoted 5 lines

So remove script_spec__findnew() and make script_spec_register() only call once script_spec__find().

Thank you!!

- Taeung

#3 lore raw
In reply to Jiri Olsa

Em Thu, Feb 25, 2016 at 08:02:22PM +0100, Jiri Olsa escreveu:

Quoted 5 lines · Taeung Song
Quoted 4 lines

script_spec_register() called two functions
script_spec__find() and script_spec__findnew().
But script_spec__find() was called two times.

Quoted 7 lines
Quoted 5 lines

So remove script_spec__findnew() and make script_spec_register() only call once script_spec__find().

Looks good, applied.

Thanks,

- Arnaldo

#4 lore raw
Quoted 12 lines · Arnaldo Carvalho de Melo

Em Thu, Feb 25, 2016 at 08:02:22PM +0100, Jiri Olsa escreveu:

Quoted 11 lines · Taeung Song
Quoted 9 lines

script_spec_register() called two functions
script_spec__find() and script_spec__findnew().
But script_spec__find() was called two times.

So remove script_spec__findnew() and make script_spec_register() only call once script_spec__find().

Quoted 7 lines
Quoted 1 line

Looks good, applied.

Thanks,

- Arnaldo

Thank you!!

Taeung

#5 lore raw

[tip:perf/core] perf script: Remove duplicated code and needless script_spec__findnew()

In reply to Taeung Song
perf script: Remove duplicated code and needless script_spec__findnew()
Commit-ID:  8560bae02a948876b26d1d86423cf5e0bb04a815
Gitweb:     http://git.kernel.org/tip/8560bae02a948876b26d1d86423cf5e0bb04a815
Author:     Taeung Song <[email protected]>
AuthorDate: Fri, 26 Feb 2016 00:13:10 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 25 Feb 2016 16:14:33 -0300

perf script: Remove duplicated code and needless script_spec__findnew()

script_spec_register() called two functions: script_spec__find() and script_spec__findnew(). But this way script_spec__find() gets called two times, directly and via script_spec__findnew().

So remove script_spec__findnew() and make script_spec_register() only call once script_spec__find().

---
 tools/perf/builtin-script.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
tools/perf/builtin-script.c +3 -18
index ec4fbd4..57f9a7e 100644
@@ -1212,23 +1212,6 @@ static struct script_spec *script_spec__find(const char *spec)
 	return NULL;
 }
 
-static struct script_spec *script_spec__findnew(const char *spec,
-						struct scripting_ops *ops)
-{
-	struct script_spec *s = script_spec__find(spec);
-
-	if (s)
-		return s;
-
-	s = script_spec__new(spec, ops);
-	if (!s)
-		return NULL;
-
-	script_spec__add(s);
-
-	return s;
-}
-
 int script_spec_register(const char *spec, struct scripting_ops *ops)
 {
 	struct script_spec *s;
@@ -1237,9 +1220,11 @@ int script_spec_register(const char *spec, struct scripting_ops *ops)
 	if (s)
 		return -1;
 
-	s = script_spec__findnew(spec, ops);
+	s = script_spec__new(spec, ops);
 	if (!s)
 		return -1;
+	else
+		script_spec__add(s);
 
 	return 0;
 }