Hi Yannick, Your change does the job, thanks!
However, the regular expression "#[^include].*$" is incorrect, as [] matches a set of characters. For instance, '#not an include' is not removed as you intended, as '#' is followed by 'n'. I'd suggest using this regular expression instead: '#(?!include).*$' Thanks, -- Romain Lenglet On Jun 22, 2013, at 10:52 AM, Yannick Brosseau <[email protected]> wrote: > Hi, > > I hope the latest commit on lttng-gen-tp which allows to add #include to > the .tp will be an appropriate fix for your needs > > On 2013-06-18 17:22, Romain Lenglet wrote: >> I need to use non-trivial types in TP_ARGS, e.g. uint64_t, or custom C++ >> classes. >> In the latter case, the motivation is to call accessors on C++ objects only >> when actually tracing, in TP_FIELDS. >> This absolutely requires including standard header files such as stdint.h, >> or header files defining C++ classes. >> >> What other solutions would you suggest to cleanly enable users to include >> header files from .tp files? >> >> Regards, >> -- >> Romain Lenglet >> >> On Jun 18, 2013, at 12:38 PM, Yannick Brosseau <[email protected]> >> wrote: >> >>> On 2013-06-18 13:49, Romain Lenglet wrote: >>>> Support #define, #include, etc. in tracepoint files. >>> Do you have a specific use case that demonstrate the need for that? >>> >>> The design goal of lttng-gen-tp included generating tracepoints for >>> other language than C, so we wanted a format more agnostics hence the >>> support for # comments >>> >>>> Signed-off-by: Romain Lenglet <[email protected]> >>>> --- >>>> doc/man/lttng-gen-tp.1 | 2 +- >>>> tools/lttng-gen-tp | 3 --- >>>> 2 files changed, 1 insertion(+), 4 deletions(-) >>>> >>>> diff --git a/doc/man/lttng-gen-tp.1 b/doc/man/lttng-gen-tp.1 >>>> index 84c05c9..96f02c4 100644 >>>> --- a/doc/man/lttng-gen-tp.1 >>>> +++ b/doc/man/lttng-gen-tp.1 >>>> @@ -64,7 +64,7 @@ TRACEPOINT_LOGLEVEL. >>>> (See lttng-ust(3) for the complete list of available definition.) >>>> >>>> You write them as you would write them in a C header file. You can add >>>> -comments with \fB/* */\fP, \fB//\fP and \fB#\fP. >>>> +comments with \fB/* */\fP and \fB//\fP. >>>> >>>> The provider name (the first field of TRACEPOINT_EVENT) must be >>>> the same for the whole file. >>>> diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp >>>> index 5937dfd..5ea221b 100755 >>>> --- a/tools/lttng-gen-tp >>>> +++ b/tools/lttng-gen-tp >>>> @@ -159,9 +159,6 @@ class TemplateFile: >>>> >>>> self.text = f.read() >>>> >>>> - #Remove # comments (from input and output file >>>> - removeComments = re.compile("#.*$",flags=re.MULTILINE) >>>> - self.text = removeComments.sub("",self.text) >>>> #Remove // comments >>>> removeLineComment = re.compile("\/\/.*$",flags=re.MULTILINE) >>>> nolinecomment = removeLineComment.sub("",self.text) >>> > > _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
