Allow #include in template (.tp) file

[lttng-ust.git] / tools / lttng-gen-tp

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index 828bee6e77e72780dddbc25a5689812127353b35..1ff91464acc0a4441efa9a4a1a8a0ff6c5b7b8e3 100755 (executable)
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -31,12 +31,12 @@ class HeaderFile:
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER {providerName}
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./{headerFilename}
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./{headerFilename}"
 
 #ifdef __cplusplus
-#extern "C"{{
-#endif /*__cplusplus */
+extern "C"{{
+#endif /* __cplusplus */
 
 
 #if !defined({includeGuard}) || defined(TRACEPOINT_HEADER_MULTI_READ)
@@ -52,7 +52,7 @@ class HeaderFile:
 
 #ifdef __cplusplus
 }}
-#endif /*__cplusplus */
+#endif /* __cplusplus */
 
 """
     def __init__(self, filename, template):
@@ -61,7 +61,9 @@ class HeaderFile:
 
     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,
@@ -143,6 +145,8 @@ class ObjFile:
             cflags = ""
 
         command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
+        if verbose:
+            print("Compile command: " + command)
         subprocess.call(command.split())
 
 class TemplateFile:
@@ -157,12 +161,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
@@ -182,6 +190,8 @@ class TemplateFile:
                     if 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,7 +214,7 @@ def main(argv=None):
 
     try:
         try:
-            opts, args = getopt.gnu_getopt(argv[1:], "ho:a", ["help"])
+            opts, args = getopt.gnu_getopt(argv[1:], "ho:av", ["help","verbose"])
         except getopt.error, msg:
              raise Usage(msg)
 
@@ -222,6 +232,17 @@ def main(argv=None):
             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"
+        return 2
 
     doCFile = None
     doHeader = None
@@ -255,29 +276,41 @@ def main(argv=None):
 
     # process arguments
     for arg in args:
+        if arg[-3:] != ".tp":
+                print arg + " does not end in .tp. Skipping."
+                continue
 
-        tpl = TemplateFile(arg)
-        if doHeader:
-            if headerFilename:
-                curFilename = headerFilename
-            else:
-                curFilename = re.sub("\.tp$",".h",arg)
-            doth = HeaderFile(curFilename, tpl)
-            doth.write()
-        if doCFile:
-            if cFilename:
-                curFilename = cFilename
-            else:
-                curFilename = re.sub("\.tp$",".c",arg)
-            dotc = CFile(curFilename, tpl)
-            dotc.write()
-        if doObj:
-            if objFilename:
-                curFilename = objFilename
-            else:
-                curFilename = re.sub("\.tp$",".o",arg)
-            dotobj = ObjFile(curFilename, tpl)
-            dotobj.write()
-
+        tpl = None
+        try:
+            tpl = TemplateFile(arg)
+        except IOError as args:
+            print "Cannot read input file " + args.filename + " " + args.strerror
+            return -1
+        try:
+            if doHeader:
+                if headerFilename:
+                    curFilename = headerFilename
+                else:
+                    curFilename = re.sub("\.tp$",".h",arg)
+                doth = HeaderFile(curFilename, tpl)
+                doth.write()
+            if doCFile:
+                if cFilename:
+                    curFilename = cFilename
+                else:
+                    curFilename = re.sub("\.tp$",".c",arg)
+                dotc = CFile(curFilename, tpl)
+                dotc.write()
+            if doObj:
+                if objFilename:
+                    curFilename = objFilename
+                else:
+                    curFilename = re.sub("\.tp$",".o",arg)
+                dotobj = ObjFile(curFilename, tpl)
+                dotobj.write()
+        except IOError as args:
+            print "Cannot write output file " + args.filename + " " + args.strerror 
+            return -1
+        
 if __name__ == "__main__":
     sys.exit(main())