trace: [tracetool] Explicitly identify public backends

Public backends are those printed by "--list-backends" and thus considered valid
by the configure script.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index c003cf69eded3df2beadf7e9b44eb51627bee185..a79ec0f0962fc1e2e8bb89737bec556d69ab3cbb 100755 (executable)
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -90,8 +90,8 @@ def main(args):
             arg_format = arg
 
         elif opt == "--list-backends":
             arg_format = arg
 
         elif opt == "--list-backends":

-            backends = tracetool.backend.get_list()
-            out(", ".join([ b for b,_ in backends ]))
+            public_backends = tracetool.backend.get_list(only_public = True)
+            out(", ".join([ b for b,_ in public_backends ]))

             sys.exit(0)
         elif opt == "--check-backend":
             check_backend = True
             sys.exit(0)
         elif opt == "--check-backend":
             check_backend = True

diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/backend/__init__.py
index be43472f7bd9f6d2e115842a430aff19e6a73edb..f0314ee3763805aea218b8f5cfb88b9881a6dccf 100644 (file)
--- a/scripts/tracetool/backend/__init__.py
+++ b/scripts/tracetool/backend/__init__.py
@@ -17,6 +17,16 @@ considered its short description.
 All backends must generate their contents through the 'tracetool.out' routine.
 
 
 All backends must generate their contents through the 'tracetool.out' routine.
 
 

+Backend attributes
+------------------
+
+========= ====================================================================
+Attribute Description
+========= ====================================================================
+PUBLIC    If exists and is set to 'True', the backend is considered "public".
+========= ====================================================================
+
+

 Backend functions
 -----------------
 
 Backend functions
 -----------------
 


@@ -42,7 +52,7 @@ import os
 import tracetool
 
 
 import tracetool
 
 

-def get_list():
+def get_list(only_public = False):

     """Get a list of (name, description) pairs."""
     res = [("nop", "Tracing disabled.")]
     modnames = []
     """Get a list of (name, description) pairs."""
     res = [("nop", "Tracing disabled.")]
     modnames = []


@@ -57,6 +67,10 @@ def get_list():
             continue
         module = module[1]
 
             continue
         module = module[1]
 

+        public = getattr(module, "PUBLIC", False)
+        if only_public and not public:
+            continue
+

         doc = module.__doc__
         if doc is None:
             doc = ""
         doc = module.__doc__
         if doc is None:
             doc = ""

diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
index ad5eb3b0ab21706f9ac48d7c3b3fe71b609f7a59..e31bc799f81177cd25416dc2bc26a8e6edcc7b10 100644 (file)
--- a/scripts/tracetool/backend/dtrace.py
+++ b/scripts/tracetool/backend/dtrace.py
@@ -16,6 +16,9 @@ __email__      = "stefanha@linux.vnet.ibm.com"
 from tracetool import out
 
 
 from tracetool import out
 
 

+PUBLIC = True
+
+

 PROBEPREFIX = None
 
 def _probeprefix():
 PROBEPREFIX = None
 
 def _probeprefix():

diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
index e4b4a7f05d1835b1e5ff9a36aefd18bed58484fc..ac864f38ce2500ff4802c59bde8f409ca62578e2 100644 (file)
--- a/scripts/tracetool/backend/simple.py
+++ b/scripts/tracetool/backend/simple.py
@@ -15,6 +15,10 @@ __email__      = "stefanha@linux.vnet.ibm.com"
 
 from tracetool import out
 
 
 from tracetool import out
 

+
+PUBLIC = True
+
+

 def is_string(arg):
     strtype = ('const char*', 'char*', 'const char *', 'char *')
     if arg.lstrip().startswith(strtype):
 def is_string(arg):
     strtype = ('const char*', 'char*', 'const char *', 'char *')
     if arg.lstrip().startswith(strtype):

diff --git a/scripts/tracetool/backend/stderr.py b/scripts/tracetool/backend/stderr.py
index 917fde7c155fe4c56abf3dc228cc8a6ecbf02ca5..a10fbb83f497cfae437182fe0cacb3ba617bd597 100644 (file)
--- a/scripts/tracetool/backend/stderr.py
+++ b/scripts/tracetool/backend/stderr.py
@@ -16,6 +16,9 @@ __email__      = "stefanha@linux.vnet.ibm.com"
 from tracetool import out
 
 
 from tracetool import out
 
 

+PUBLIC = True
+
+

 def c(events):
     out('#include "trace.h"',
         '',
 def c(events):
     out('#include "trace.h"',
         '',

diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
index 31a2ff04047e16a25370e21ceb0e2b59154be69d..ea36995092225b0399c8d60dab3d65a6a0a6b5fb 100644 (file)
--- a/scripts/tracetool/backend/ust.py
+++ b/scripts/tracetool/backend/ust.py
@@ -16,6 +16,9 @@ __email__      = "stefanha@linux.vnet.ibm.com"
 from tracetool import out
 
 
 from tracetool import out
 
 

+PUBLIC = True
+
+

 def c(events):
     out('#include <ust/marker.h>',
         '#undef mutex_lock',
 def c(events):
     out('#include <ust/marker.h>',
         '#undef mutex_lock',