* [PATCH 0/2] [RFC] several build fixes @ 2019-08-06 5:59 Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 1/2] parse-event: rename filter_arg_boolean arg Sergey Senozhatsky ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Sergey Senozhatsky @ 2019-08-06 5:59 UTC (permalink / raw) To: Steven Rostedt; +Cc: linux-trace-devel, Sergey Senozhatsky Hi, RFC These patches fix v1.1.1 build on my system. Sergey Senozhatsky (2): parse-event: rename filter_arg_boolean arg makefile: fix python SyntaxError Makefile | 2 +- parse-events.h | 2 +- parse-filter.c | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) -- 2.22.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] parse-event: rename filter_arg_boolean arg 2019-08-06 5:59 [PATCH 0/2] [RFC] several build fixes Sergey Senozhatsky @ 2019-08-06 5:59 ` Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 2/2] makefile: fix python SyntaxError Sergey Senozhatsky 2019-08-06 13:27 ` [PATCH 0/2] [RFC] several build fixes Steven Rostedt 2 siblings, 0 replies; 5+ messages in thread From: Sergey Senozhatsky @ 2019-08-06 5:59 UTC (permalink / raw) To: Steven Rostedt; +Cc: linux-trace-devel, Sergey Senozhatsky Rename 'bool' filter_arg_boolean arg to boolean swig -Wall -python -noproxy ctracecmd.i parse-events.h:676: Error: Syntax error in input(3). Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> --- parse-events.h | 2 +- parse-filter.c | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/parse-events.h b/parse-events.h index 3a4ef08..01be4f0 100644 --- a/parse-events.h +++ b/parse-events.h @@ -673,7 +673,7 @@ struct filter_arg_str { struct filter_arg { enum filter_arg_type type; union { - struct filter_arg_boolean bool; + struct filter_arg_boolean boolean; struct filter_arg_field field; struct filter_arg_value value; struct filter_arg_op op; diff --git a/parse-filter.c b/parse-filter.c index 0d448cb..13f3422 100644 --- a/parse-filter.c +++ b/parse-filter.c @@ -359,7 +359,7 @@ create_arg_item(struct event_format *event, if (strcmp(token, COMM) != 0) { /* not a field, Make it false */ arg->type = FILTER_ARG_BOOLEAN; - arg->bool.value = FILTER_FALSE; + arg->boolean.value = FILTER_FALSE; break; } /* If token is 'COMM' then it is special */ @@ -487,7 +487,7 @@ static int add_right(struct filter_arg *op, struct filter_arg *arg, free_arg(left); free_arg(arg); op->type = FILTER_ARG_BOOLEAN; - op->bool.value = FILTER_FALSE; + op->boolean.value = FILTER_FALSE; break; } @@ -772,7 +772,7 @@ enum filter_vals test_arg(struct filter_arg *parent, struct filter_arg *arg) /* bad case */ case FILTER_ARG_BOOLEAN: - return FILTER_VAL_FALSE + arg->bool.value; + return FILTER_VAL_FALSE + arg->boolean.value; /* good cases: */ case FILTER_ARG_STR: @@ -871,7 +871,7 @@ static struct filter_arg *collapse_tree(struct filter_arg *arg) free_arg(arg); arg = allocate_arg(); arg->type = FILTER_ARG_BOOLEAN; - arg->bool.value = ret == FILTER_VAL_TRUE; + arg->boolean.value = ret == FILTER_VAL_TRUE; } return arg; @@ -1116,7 +1116,7 @@ process_event(struct event_format *event, const char *filter_str, if (!*parg) { *parg = allocate_arg(); (*parg)->type = FILTER_ARG_BOOLEAN; - (*parg)->bool.value = FILTER_FALSE; + (*parg)->boolean.value = FILTER_FALSE; } return 0; @@ -1139,7 +1139,7 @@ static int filter_event(struct event_filter *filter, /* just add a TRUE arg */ arg = allocate_arg(); arg->type = FILTER_ARG_BOOLEAN; - arg->bool.value = FILTER_TRUE; + arg->boolean.value = FILTER_TRUE; } filter_type = add_filter_type(filter, event->id); @@ -1369,9 +1369,9 @@ static int copy_filter_type(struct event_filter *filter, arg = allocate_arg(); arg->type = FILTER_ARG_BOOLEAN; if (strcmp(str, "TRUE") == 0) - arg->bool.value = 1; + arg->boolean.value = 1; else - arg->bool.value = 0; + arg->boolean.value = 0; filter_type = add_filter_type(filter, event->id); filter_type->filter = arg; @@ -1442,8 +1442,8 @@ int pevent_update_trivial(struct event_filter *dest, struct event_filter *source arg = filter_type->filter; if (arg->type != FILTER_ARG_BOOLEAN) continue; - if ((arg->bool.value && type == FILTER_TRIVIAL_FALSE) || - (!arg->bool.value && type == FILTER_TRIVIAL_TRUE)) + if ((arg->boolean.value && type == FILTER_TRIVIAL_FALSE) || + (!arg->boolean.value && type == FILTER_TRIVIAL_TRUE)) continue; event = filter_type->event; @@ -1497,10 +1497,10 @@ void pevent_filter_clear_trivial(struct event_filter *filter, continue; switch (type) { case FILTER_TRIVIAL_FALSE: - if (filter_type->filter->bool.value) + if (filter_type->filter->boolean.value) continue; case FILTER_TRIVIAL_TRUE: - if (!filter_type->filter->bool.value) + if (!filter_type->filter->boolean.value) continue; default: break; @@ -1551,10 +1551,10 @@ int pevent_filter_event_has_trivial(struct event_filter *filter, switch (type) { case FILTER_TRIVIAL_FALSE: - return !filter_type->filter->bool.value; + return !filter_type->filter->boolean.value; case FILTER_TRIVIAL_TRUE: - return filter_type->filter->bool.value; + return filter_type->filter->boolean.value; default: return 1; } @@ -1783,7 +1783,7 @@ static int test_filter(struct event_format *event, switch (arg->type) { case FILTER_ARG_BOOLEAN: /* easy case */ - return arg->bool.value; + return arg->boolean.value; case FILTER_ARG_OP: return test_op(event, arg, record); @@ -2147,7 +2147,7 @@ static char *arg_to_str(struct event_filter *filter, struct filter_arg *arg) switch (arg->type) { case FILTER_ARG_BOOLEAN: str = malloc_or_die(6); - if (arg->bool.value) + if (arg->boolean.value) strcpy(str, "TRUE"); else strcpy(str, "FALSE"); -- 2.22.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] makefile: fix python SyntaxError 2019-08-06 5:59 [PATCH 0/2] [RFC] several build fixes Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 1/2] parse-event: rename filter_arg_boolean arg Sergey Senozhatsky @ 2019-08-06 5:59 ` Sergey Senozhatsky 2019-08-06 13:27 ` [PATCH 0/2] [RFC] several build fixes Steven Rostedt 2 siblings, 0 replies; 5+ messages in thread From: Sergey Senozhatsky @ 2019-08-06 5:59 UTC (permalink / raw) To: Steven Rostedt; +Cc: linux-trace-devel, Sergey Senozhatsky File "<string>", line 1 import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED') ^ SyntaxError: invalid syntax Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index acf99b8..b1264d1 100644 --- a/Makefile +++ b/Makefile @@ -499,7 +499,7 @@ clean: PYTHON_INCLUDES = `python-config --includes` PYTHON_LDFLAGS = `python-config --ldflags` \ - $(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LINKFORSHARED')") + $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LINKFORSHARED'))") PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` ctracecmd.so: $(TCMD_LIB_OBJS) ctracecmd.i -- 2.22.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] [RFC] several build fixes 2019-08-06 5:59 [PATCH 0/2] [RFC] several build fixes Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 1/2] parse-event: rename filter_arg_boolean arg Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 2/2] makefile: fix python SyntaxError Sergey Senozhatsky @ 2019-08-06 13:27 ` Steven Rostedt 2019-08-06 13:35 ` Sergey Senozhatsky 2 siblings, 1 reply; 5+ messages in thread From: Steven Rostedt @ 2019-08-06 13:27 UTC (permalink / raw) To: Sergey Senozhatsky; +Cc: linux-trace-devel, Sergey Senozhatsky On Tue, 6 Aug 2019 14:59:48 +0900 Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> wrote: > Hi, > > RFC > > These patches fix v1.1.1 build on my system. > Hi Sergey, v1.1.1 is 8 years old and no longer supported. Care to use the latest code? Otherwise, you'll need to simply maintain these changes locally. Thanks! -- Steve > Sergey Senozhatsky (2): > parse-event: rename filter_arg_boolean arg > makefile: fix python SyntaxError > > Makefile | 2 +- > parse-events.h | 2 +- > parse-filter.c | 32 ++++++++++++++++---------------- > 3 files changed, 18 insertions(+), 18 deletions(-) > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] [RFC] several build fixes 2019-08-06 13:27 ` [PATCH 0/2] [RFC] several build fixes Steven Rostedt @ 2019-08-06 13:35 ` Sergey Senozhatsky 0 siblings, 0 replies; 5+ messages in thread From: Sergey Senozhatsky @ 2019-08-06 13:35 UTC (permalink / raw) To: Steven Rostedt; +Cc: Sergey Senozhatsky, linux-trace-devel, Sergey Senozhatsky On (08/06/19 09:27), Steven Rostedt wrote: > > Hi, > > > > RFC > > > > These patches fix v1.1.1 build on my system. > > > > Hi Sergey, > > v1.1.1 is 8 years old and no longer supported. > > Care to use the latest code? Otherwise, you'll need to simply maintain > these changes locally. Hi Steven, Nah, was just some weird fault on my side. A very weird one. Never mind those patches; I did git pull but it took 24h to realize that git pull didn't work out and I was still looking at commits from 2011. I was like "hold on a second, no way Steven would ever let this happen" and then I checked the repository state... Which I cloned in 2011, yes. My apologies! -ss ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-06 13:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-06 5:59 [PATCH 0/2] [RFC] several build fixes Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 1/2] parse-event: rename filter_arg_boolean arg Sergey Senozhatsky 2019-08-06 5:59 ` [PATCH 2/2] makefile: fix python SyntaxError Sergey Senozhatsky 2019-08-06 13:27 ` [PATCH 0/2] [RFC] several build fixes Steven Rostedt 2019-08-06 13:35 ` Sergey Senozhatsky
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).