The declarations in the generated-tracers.h file are assuming there's only ever going to be one instance of this header, as they are not namespaced. When we have one header per event group, if a single source file needs to include multiple sets of trace events, the symbols will all clash. This change thus introduces a '--group NAME' arg to the 'tracetool' program. This will cause all the symbols in the generated header files to be given a unique namespace. If no group is given, the group name 'common' is used, which is suitable for the current usage where there is only one global trace-events file used for code generation. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu> Message-id: 1475588159-30598-21-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
			
				
	
	
		
			47 lines
		
	
	
		
			957 B
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			957 B
		
	
	
	
		
			Python
		
	
	
	
	
	
#!/usr/bin/env python
 | 
						|
# -*- coding: utf-8 -*-
 | 
						|
 | 
						|
"""
 | 
						|
DTrace/SystemTAP backend.
 | 
						|
"""
 | 
						|
 | 
						|
__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"
 | 
						|
__copyright__  = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"
 | 
						|
__license__    = "GPL version 2 or (at your option) any later version"
 | 
						|
 | 
						|
__maintainer__ = "Stefan Hajnoczi"
 | 
						|
__email__      = "stefanha@linux.vnet.ibm.com"
 | 
						|
 | 
						|
 | 
						|
from tracetool import out
 | 
						|
 | 
						|
 | 
						|
PUBLIC = True
 | 
						|
 | 
						|
 | 
						|
PROBEPREFIX = None
 | 
						|
 | 
						|
def probeprefix():
 | 
						|
    if PROBEPREFIX is None:
 | 
						|
        raise ValueError("you must set PROBEPREFIX")
 | 
						|
    return PROBEPREFIX
 | 
						|
 | 
						|
 | 
						|
BINARY = None
 | 
						|
 | 
						|
def binary():
 | 
						|
    if BINARY is None:
 | 
						|
        raise ValueError("you must set BINARY")
 | 
						|
    return BINARY
 | 
						|
 | 
						|
 | 
						|
def generate_h_begin(events, group):
 | 
						|
    out('#include "trace/generated-tracers-dtrace.h"',
 | 
						|
        '')
 | 
						|
 | 
						|
 | 
						|
def generate_h(event, group):
 | 
						|
    out('        QEMU_%(uppername)s(%(argnames)s);',
 | 
						|
        uppername=event.name.upper(),
 | 
						|
        argnames=", ".join(event.args.names()))
 |