X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tools%2Flttng-gen-tp;h=c3ee7c5e13d84fbc0655fe136f2741aba8b231e3;hb=612e9ce4e5cc3a1292522a563789f6aab6c421b1;hp=a62107f7b2006fcd876901f85aed5df2d7d9cb8f;hpb=d619cda8578e0d27ce0de14b09c4dc8e8056d534;p=lttng-ust.git

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index a62107f7..c3ee7c5e 100755
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -59,9 +59,9 @@ class CFile:
     FILE_TPL = """
 #define 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}"
 """
 
@@ -170,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 != '':
@@ -200,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.
 """