Skip to contentSkip to conversation

trace-cmd: Fix a warning about incompatible pointer type of load_plugin()

PATCH In review Taeung Song 2 participants 5 messages Apr 24, 2017 – Apr 26, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trace-cmd: Fix a warning about incompatible pointer type of load_plugin()

Currently the return type of load_plugin() in plugin_python.c is void type, but it is different from the argument type of trace_util_load_plugins(). So fix it for the below warning.

/home/taeung/git/opensource/trace-cmd/plugin_python.c: In function ‘pevent_plugin_loader’:
/home/taeung/git/opensource/trace-cmd/plugin_python.c:95:41: warning: passing argument 3 of ‘trace_util_load_plugins’ from incompatible pointer type [-Wincompatible-pointer-types]

    trace_util_load_plugins(pevent, ".py", load_plugin, globals);
                                         ^
  In file included from /home/taeung/git/opensource/trace-cmd/plugin_python.c:3:0:
  /home/taeung/git/opensource/trace-cmd/trace-cmd.h:300:5: note: expected ‘int (*)(struct pevent *, const char *, const char *, void *)’ but argument is of type ‘void (*)(struct pevent *,   const char *, const char *, void *)’
   int trace_util_load_plugins(struct pevent *pevent, const char *suffix,
     ^
---
 plugin_python.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
plugin_python.c +5 -3
index da07d27..d736f50 100644
@@ -20,7 +20,7 @@ static const char pyload[] =
 "finally:\n"
 "   file.close()\n";
 
-static void load_plugin(struct pevent *pevent, const char *path,
+static int load_plugin(struct pevent *pevent, const char *path,
 			const char *name, void *data)
 {
 	PyObject *globals = data;
@@ -32,7 +32,7 @@ static void load_plugin(struct pevent *pevent, const char *path,
 	PyObject *res;
 
 	if (!full || !n)
-		return;
+		return -ENOMEM;
 
 	strcpy(full, path);
 	strcat(full, "/");
@@ -43,16 +43,18 @@ static void load_plugin(struct pevent *pevent, const char *path,
 
 	asprintf(&load, pyload, full, n);
 	if (!load)
-		return;
+		return -1;
 
 	res = PyRun_String(load, Py_file_input, globals, globals);
 	if (!res) {
 		fprintf(stderr, "failed loading %s\n", full);
 		PyErr_Print();
+		return -1;
 	} else
 		Py_DECREF(res);
 
 	free(load);
+	return 0;
 }
 
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 lines · On Mon, 24 Apr 2017 22:43:31 +0900 Taeung Song <[email protected]> wrote:

Currently the return type of load_plugin() in plugin_python.c is void type, but it is different from the argument type of trace_util_load_plugins(). So fix it for the below warning.

Quoted 9 lines

/home/taeung/git/opensource/trace-cmd/plugin_python.c: In function ‘pevent_plugin_loader’:
/home/taeung/git/opensource/trace-cmd/plugin_python.c:95:41: warning: passing argument 3 of ‘trace_util_load_plugins’ from incompatible pointer type [-Wincompatible-pointer-types]

    trace_util_load_plugins(pevent, ".py", load_plugin, globals);
                                         ^
  In file included from /home/taeung/git/opensource/trace-cmd/plugin_python.c:3:0:
  /home/taeung/git/opensource/trace-cmd/trace-cmd.h:300:5: note: expected ‘int (*)(struct pevent *, const char *, const char *, void *)’ but argument is of type ‘void (*)(struct pevent *,   const char *, const char *, void *)’
   int trace_util_load_plugins(struct pevent *pevent, const char *suffix,
     ^

Thanks but Federico beat you to it.

http://lkml.kernel.org/r/[email protected]

I'll be updating and pushing out a new trace-cmd this week.

Quoted 29 lines
---
 plugin_python.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
plugin_python.c +2 -2
index da07d27..d736f50 100644
@@ -20,7 +20,7 @@ static const char pyload[] =
 "finally:\n"
 "   file.close()\n";
 
-static void load_plugin(struct pevent *pevent, const char *path,
+static int load_plugin(struct pevent *pevent, const char *path,
 			const char *name, void *data)
 {
 	PyObject *globals = data;
@@ -32,7 +32,7 @@ static void load_plugin(struct pevent *pevent, const char *path,
 	PyObject *res;
 
 	if (!full || !n)
-		return;
+		return -ENOMEM;
 
 	strcpy(full, path);
 	strcat(full, "/");
@@ -43,16 +43,18 @@ static void load_plugin(struct pevent *pevent, const char *path,
 

plugin_python.c static void load_plugin(struct pevent *pevent, const char *path, · line 52

Quoted 10 lines
plugin_python.c +2 -1
 	asprintf(&load, pyload, full, n);
 	if (!load)
-		return;
+		return -1;
 
 	res = PyRun_String(load, Py_file_input, globals, globals);
 	if (!res) {
 		fprintf(stderr, "failed loading %s\n", full);
 		PyErr_Print();
+		return -1;

Although, Federico's version didn't have this. I may add this under your patch. Although, it requires freeing load. The better way would be to set a "ret" variable and return that.

Want to send another patch on top of Federico's?

Thanks!

-- Steve

Quoted 8 lines
plugin_python.c +1 -0
 	} else
 		Py_DECREF(res);
 
 	free(load);
+	return 0;
 }
 
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
#2 lore raw

Hi Steven :)

Quoted 67 lines · Steven Rostedt
Quoted 4 lines · On Mon, 24 Apr 2017 22:43:31 +0900 Taeung Song <[email protected]> wrote:

Currently the return type of load_plugin() in plugin_python.c is void type, but it is different from the argument type of trace_util_load_plugins(). So fix it for the below warning.

Quoted 9 lines

/home/taeung/git/opensource/trace-cmd/plugin_python.c: In function ‘pevent_plugin_loader’:
/home/taeung/git/opensource/trace-cmd/plugin_python.c:95:41: warning: passing argument 3 of ‘trace_util_load_plugins’ from incompatible pointer type [-Wincompatible-pointer-types]

    trace_util_load_plugins(pevent, ".py", load_plugin, globals);
                                         ^
  In file included from /home/taeung/git/opensource/trace-cmd/plugin_python.c:3:0:
  /home/taeung/git/opensource/trace-cmd/trace-cmd.h:300:5: note: expected ‘int (*)(struct pevent *, const char *, const char *, void *)’ but argument is of type ‘void (*)(struct pevent *,   const char *, const char *, void *)’
   int trace_util_load_plugins(struct pevent *pevent, const char *suffix,
     ^

Thanks but Federico beat you to it.

http://lkml.kernel.org/r/[email protected]

I'll be updating and pushing out a new trace-cmd this week.

Quoted 29 lines
---
 plugin_python.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
plugin_python.c +2 -2
index da07d27..d736f50 100644
@@ -20,7 +20,7 @@ static const char pyload[] =
 "finally:\n"
 "   file.close()\n";
 
-static void load_plugin(struct pevent *pevent, const char *path,
+static int load_plugin(struct pevent *pevent, const char *path,
 			const char *name, void *data)
 {
 	PyObject *globals = data;
@@ -32,7 +32,7 @@ static void load_plugin(struct pevent *pevent, const char *path,
 	PyObject *res;
 
 	if (!full || !n)
-		return;
+		return -ENOMEM;
 
 	strcpy(full, path);
 	strcat(full, "/");
@@ -43,16 +43,18 @@ static void load_plugin(struct pevent *pevent, const char *path,
 

plugin_python.c static void load_plugin(struct pevent *pevent, const char *path, · line 52

Quoted 10 lines
plugin_python.c +2 -1
 	asprintf(&load, pyload, full, n);
 	if (!load)
-		return;
+		return -1;
 
 	res = PyRun_String(load, Py_file_input, globals, globals);
 	if (!res) {
 		fprintf(stderr, "failed loading %s\n", full);
 		PyErr_Print();
+		return -1;

Although, Federico's version didn't have this. I may add this under your patch. Although, it requires freeing load. The better way would be to set a "ret" variable and return that.

Quoted 2 lines

Want to send another patch on top of Federico's?

Yes! I want to do it.
After you update 'master' branch on your repo (git.kernel.org/.../trace-cmd.git), I'll send a patch as you said !

And would you mind if I ask you to check another patch I sent ?

"[PATCH] Fix pevent_filter_clear_trivial()"

But I'll renewedly send the patch after I a bit modified it. I'd appreciate it if you check the patch, too. :)

Thanks,
Taeung

#3 lore raw
Quoted 5 lines · On Wed, 26 Apr 2017 23:56:02 +0900 Taeung Song <[email protected]> wrote:
Quoted 2 lines

Want to send another patch on top of Federico's?

Yes! I want to do it.
After you update 'master' branch on your repo

I just updated my master branch.

Quoted 8 lines

(git.kernel.org/.../trace-cmd.git), I'll send a patch as you said !

And would you mind if I ask you to check another patch I sent ?

"[PATCH] Fix pevent_filter_clear_trivial()"

But I'll renewedly send the patch after I a bit modified it. I'd appreciate it if you check the patch, too. :)

I still have the original patch. You want me to apply the new one. It does have a better change log, but I'll probably update the log on it too.

-- Steve

#4 lore raw
Quoted 11 lines · Steven Rostedt
Quoted 5 lines · On Wed, 26 Apr 2017 23:56:02 +0900 Taeung Song <[email protected]> wrote:
Quoted 2 lines

Want to send another patch on top of Federico's?

Yes! I want to do it.
After you update 'master' branch on your repo

I just updated my master branch.

I got it !
I'll send the new patch you said. :)

Quoted 6 lines
Quoted 6 lines

(git.kernel.org/.../trace-cmd.git), I'll send a patch as you said !

And would you mind if I ask you to check another patch I sent ?

"[PATCH] Fix pevent_filter_clear_trivial()"

Quoted 9 lines
Quoted 2 lines

But I'll renewedly send the patch after I a bit modified it. I'd appreciate it if you check the patch, too. :)

I still have the original patch. You want me to apply the new one. It does have a better change log, but I'll probably update the log on it too.

-- Steve

Thank you !!

Taeung