X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tools%2Flttng-gen-tp;h=b62cd9907618207de72604e947a3b0ab11df9558;hb=refs%2Fheads%2Fstable-2.5;hp=79da6b74bbe0b5c123150a04759d56f3164f3bbb;hpb=7cd5a8404671276379bdc6a2331ac0da96f9b72b;p=lttng-ust.git diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp index 79da6b74..b62cd990 100755 --- a/tools/lttng-gen-tp +++ b/tools/lttng-gen-tp @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2012 Yannick Brosseau # @@ -16,6 +16,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +from __future__ import print_function import sys import getopt import re @@ -31,13 +32,8 @@ class HeaderFile: #undef TRACEPOINT_PROVIDER #define TRACEPOINT_PROVIDER {providerName} -#undef TRACEPOINT_INCLUDE_FILE -#define TRACEPOINT_INCLUDE_FILE ./{headerFilename} - -#ifdef __cplusplus -extern "C"{{ -#endif /* __cplusplus */ - +#undef TRACEPOINT_INCLUDE +#define TRACEPOINT_INCLUDE "./{headerFilename}" #if !defined({includeGuard}) || defined(TRACEPOINT_HEADER_MULTI_READ) #define {includeGuard} @@ -49,11 +45,6 @@ extern "C"{{ #endif /* {includeGuard} */ #include - -#ifdef __cplusplus -}} -#endif /* __cplusplus */ - """ def __init__(self, filename, template): self.outputFilename = filename @@ -61,7 +52,9 @@ extern "C"{{ def write(self): outputFile = open(self.outputFilename,"w") - includeGuard = self.outputFilename.upper().replace(".","_") + # Include guard macro will be created by uppercasing the filename and + # replacing all non alphanumeric characters with '_' + includeGuard = re.sub('[^0-9a-zA-Z]', '_', self.outputFilename.upper()) outputFile.write(HeaderFile.HEADER_TPL.format(providerName=self.template.domain, includeGuard = includeGuard, @@ -98,14 +91,14 @@ class ObjFile: self.template = template def _detectCC(self): cc = "" - if os.environ.has_key('CC'): + if 'CC' in os.environ: cc = os.environ['CC'] try: - subprocess.call(cc, + subprocess.call(cc.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - except OSError, msg: - print "Invalid CC environment variable" + except OSError as msg: + print("Invalid CC environment variable") cc = "" else: @@ -115,7 +108,7 @@ class ObjFile: subprocess.call("cc", stdout=subprocess.PIPE, stderr=subprocess.PIPE) - except OSError, msg: + except OSError as msg: useCC = False if useCC: cc = "cc" @@ -126,7 +119,7 @@ class ObjFile: subprocess.call("gcc", stdout=subprocess.PIPE, stderr=subprocess.PIPE) - except OSError, msg: + except OSError as msg: useGCC = False if useGCC: cc = "gcc" @@ -137,12 +130,22 @@ class ObjFile: cc = self._detectCC() if cc == "": raise RuntimeError("No C Compiler detected") - if os.environ.has_key('CFLAGS'): - cflags = os.environ['CFLAGS'] + if 'CPPFLAGS' in os.environ: + cppflags = " " + os.environ['CPPFLAGS'] + else: + cppflags = "" + if 'CFLAGS' in os.environ: + cflags = " " + os.environ['CFLAGS'] else: cflags = "" + if 'LDFLAGS' in os.environ: + ldflags = " " + os.environ['LDFLAGS'] + else: + ldflags = "" - command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename + command = cc + " -c" + cppflags + cflags + ldflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename + if verbose: + print("Compile command: " + command) subprocess.call(command.split()) class TemplateFile: @@ -157,12 +160,16 @@ class TemplateFile: self.text = f.read() - #Remove # comments (from input and output file - removeComments = re.compile("#.*$",flags=re.MULTILINE) + #Remove # comments (from input and output file) but keep + # #include in the output file + removeComments = re.compile("#[^include].*$",flags=re.MULTILINE) self.text = removeComments.sub("",self.text) + # Remove #include directive from the parsed text + removePreprocess = re.compile("#.*$",flags=re.MULTILINE) + noPreprocess = removePreprocess.sub("", self.text) #Remove // comments removeLineComment = re.compile("\/\/.*$",flags=re.MULTILINE) - nolinecomment = removeLineComment.sub("",self.text) + nolinecomment = removeLineComment.sub("", noPreprocess) #Remove all spaces and lines cleantext = re.sub("\s*","",nolinecomment) #Remove multine C style comments @@ -180,7 +187,9 @@ class TemplateFile: self.domain = domain else: if self.domain != domain: - print "Warning: different domain provided (%s,%s)" % (self.domain, domain) + print("Warning: different domain provided (%s,%s)" % (self.domain, domain)) + +verbose=False usage=""" lttng-gen-tp - Generate the LTTng-UST header and source based on a simple template @@ -204,31 +213,34 @@ def main(argv=None): try: try: - opts, args = getopt.gnu_getopt(argv[1:], "ho:a", ["help"]) - except getopt.error, msg: + opts, args = getopt.gnu_getopt(argv[1:], "ho:av", ["help","verbose"]) + except getopt.error as msg: raise Usage(msg) - except Usage, err: - print >>sys.stderr, err.msg - print >>sys.stderr, "for help use --help" + except Usage as err: + print(err.msg, file=sys.stderr) + print("for help use --help", file=sys.stderr) return 2 outputNames = [] for o, a in opts: if o in ("-h", "--help"): - print usage + print(usage) return(0) if o in ("-o",""): outputNames.append(a) if o in ("-a",""): all = True + if o in ("-v", "--verbose"): + global verbose + verbose = True try: if len(args) == 0: raise Usage("No template file given") - except Usage, err: - print >>sys.stderr, err.msg - print >>sys.stderr, "for help use --help" + except Usage as err: + print(err.msg, file=sys.stderr) + print("for help use --help", file=sys.stderr) return 2 doCFile = None @@ -240,7 +252,7 @@ def main(argv=None): if len(outputNames) > 0: if len(args) > 1: - print "Cannot process more than one input if you specify an output" + print("Cannot process more than one input if you specify an output") return(3) for outputName in outputNames: @@ -254,7 +266,7 @@ def main(argv=None): doObj = True objFilename = outputName else: - print "output file type unsupported" + print("output file type unsupported") return(4) else: doHeader = True @@ -264,14 +276,14 @@ def main(argv=None): # process arguments for arg in args: if arg[-3:] != ".tp": - print arg + " does not end in .tp. Skipping." + print(arg + " does not end in .tp. Skipping.") continue tpl = None try: tpl = TemplateFile(arg) except IOError as args: - print "Cannot read input file " + args.filename + " " + args.strerror + print("Cannot read input file " + args.filename + " " + args.strerror) return -1 try: if doHeader: @@ -296,8 +308,8 @@ def main(argv=None): dotobj = ObjFile(curFilename, tpl) dotobj.write() except IOError as args: - print "Cannot write output file " + args.filename + " " + args.strerror + print("Cannot write output file " + args.filename + " " + args.strerror) return -1 - + if __name__ == "__main__": sys.exit(main())