 13d4ff07e8
			
		
	
	
		13d4ff07e8
		
	
	
	
	
		
			
			docs/devel/tracing.txt explains "since many source files include trace.h, [the generated trace.h use] a minimum of types and other header files included to keep the namespace clean and compile times and dependencies down." Commit 4815185902 "trace: Add per-vCPU tracing states for events with the 'vcpu' property" made them all include qom/cpu.h via control-internal.h. qom/cpu.h in turn includes about thirty headers. Ouch. Per-vCPU tracing is currently not supported in sub-directories' trace-events. In other words, qom/cpu.h can only be used in trace-root.h, not in any trace.h. Split trace/control-vcpu.h off trace/control.h and trace/control-internal.h. Have the generated trace.h include trace/control.h (which no longer includes qom/cpu.h), and trace-root.h include trace/control-vcpu.h (which includes it). The resulting improvement is a bit disappointing: in my "build everything" tree, some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h) depend on a trace.h, and about 600 of them no longer depend on qom/cpu.h. But more than 1300 others depend on trace-root.h. More work is clearly needed. Left for another day. Cc: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190812052359.30071-8-armbru@redhat.com>
		
			
				
	
	
		
			62 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			62 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Interface for configuring and controlling the state of tracing events.
 | |
|  *
 | |
|  * Copyright (C) 2011-2016 Lluís Vilanova <vilanova@ac.upc.edu>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #ifndef TRACE__CONTROL_INTERNAL_H
 | |
| #define TRACE__CONTROL_INTERNAL_H
 | |
| 
 | |
| extern int trace_events_enabled_count;
 | |
| 
 | |
| 
 | |
| static inline bool trace_event_is_pattern(const char *str)
 | |
| {
 | |
|     assert(str != NULL);
 | |
|     return strchr(str, '*') != NULL;
 | |
| }
 | |
| 
 | |
| static inline uint32_t trace_event_get_id(TraceEvent *ev)
 | |
| {
 | |
|     assert(ev != NULL);
 | |
|     return ev->id;
 | |
| }
 | |
| 
 | |
| static inline uint32_t trace_event_get_vcpu_id(TraceEvent *ev)
 | |
| {
 | |
|     return ev->vcpu_id;
 | |
| }
 | |
| 
 | |
| static inline bool trace_event_is_vcpu(TraceEvent *ev)
 | |
| {
 | |
|     return ev->vcpu_id != TRACE_VCPU_EVENT_NONE;
 | |
| }
 | |
| 
 | |
| static inline const char * trace_event_get_name(TraceEvent *ev)
 | |
| {
 | |
|     assert(ev != NULL);
 | |
|     return ev->name;
 | |
| }
 | |
| 
 | |
| static inline bool trace_event_get_state_static(TraceEvent *ev)
 | |
| {
 | |
|     assert(ev != NULL);
 | |
|     return ev->sstate;
 | |
| }
 | |
| 
 | |
| /* it's on fast path, avoid consistency checks (asserts) */
 | |
| #define trace_event_get_state_dynamic_by_id(id) \
 | |
|     (unlikely(trace_events_enabled_count) && _ ## id ## _DSTATE)
 | |
| 
 | |
| static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
 | |
| {
 | |
|     return unlikely(trace_events_enabled_count) && *ev->dstate;
 | |
| }
 | |
| 
 | |
| void trace_event_register_group(TraceEvent **events);
 | |
| 
 | |
| #endif /* TRACE__CONTROL_INTERNAL_H */
 |