X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tools%2Flttng-gen-tp;h=e49083ba4dae4b8f2a82455cd5f6df9b6f4776f0;hb=fa184a4dbf3ee0ac1cc1001566031abbc7866f87;hp=84f4297e7b37243d8f079642db5f8702ace67f51;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index 84f4297e..e49083ba 100755
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -19,13 +19,13 @@ class Usage(Exception):
 
 class HeaderFile:
     HEADER_TPL = """
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER {providerName}
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER {providerName}
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./{headerFilename}"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./{headerFilename}"
 
-#if !defined({includeGuard}) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined({includeGuard}) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define {includeGuard}
 
 #include <lttng/tracepoint.h>
@@ -57,11 +57,11 @@ class HeaderFile:
 
 class CFile:
     FILE_TPL = """
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
 /*
- * The header containing our TRACEPOINT_EVENTs.
+ * The header containing our LTTNG_UST_TRACEPOINT_EVENTs.
  */
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "{headerFilename}"
 """
 
@@ -138,12 +138,8 @@ class ObjFile:
             cflags = " " + os.environ['CFLAGS']
         else:
             cflags = ""
-        if 'LDFLAGS' in os.environ:
-            ldflags = " " + os.environ['LDFLAGS']
-        else:
-            ldflags = ""
 
-        command = cc + " -c" + cppflags + cflags + ldflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
+        command = cc + " -c" + cppflags + cflags + " -I. -o " + self.outputFilename + " " + cFilename
         if verbose:
             print("Compile command: " + command)
         subprocess.call(command.split())
@@ -174,7 +170,7 @@ class TemplateFile:
         cleantext = re.sub("\s*", "", nolinecomment)
         # Remove multine C style comments
         nocomment = re.sub("/\*.*?\*/", "", cleantext)
-        entries = re.split("TRACEPOINT_.*?", nocomment)
+        entries = re.split("^LTTNG_UST_TRACEPOINT_.*?", nocomment)
 
         for entry in entries:
             if entry != '':
@@ -204,7 +200,7 @@ usage = """
  When using the -o option, the OUTPUT_FILE must end with either .h, .c or .o
  The -o option can be repeated multiple times.
 
- The template file must contains TRACEPOINT_EVENT and TRACEPOINT_LOGLEVEL
+ The template file must contains LTTNG_UST_TRACEPOINT_EVENT and LTTNG_UST_TRACEPOINT_LOGLEVEL
  as per defined in the lttng/tracepoint.h file.
  See the lttng-ust(3) man page for more details on the format.
 """