The TraceEventID and TraceEventVCPUID enums constants are no longer actually used for anything critical. The TRACE_EVENT_COUNT limit is used to determine the size of the TraceEvents array, and can be removed if we just NULL terminate the array instead. The TRACE_VCPU_EVENT_COUNT limit is used as a magic value for marking non-vCPU events, and also for declaring the size of the trace dstate mask in the CPUState struct. The former usage can be replaced by a dedicated constant TRACE_EVENT_VCPU_NONE, defined as (uint32_t)-1. For the latter usage, we can simply define a constant for the number of VCPUs, avoiding the need for the full enum. The only other usages of the enum values can be replaced by accesing the id/vcpu_id fields via the named TraceEvent structs. Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 1475588159-30598-11-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
			
				
	
	
		
			119 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			119 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Interface for configuring and controlling the state of tracing events.
 | 
						|
 *
 | 
						|
 * Copyright (C) 2014-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.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "cpu.h"
 | 
						|
#include "trace.h"
 | 
						|
#include "trace/control.h"
 | 
						|
#include "translate-all.h"
 | 
						|
 | 
						|
 | 
						|
void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
 | 
						|
{
 | 
						|
    bool state_pre;
 | 
						|
    assert(trace_event_get_state_static(ev));
 | 
						|
    /*
 | 
						|
     * We ignore the "vcpu" property here, since no vCPUs have been created
 | 
						|
     * yet. Then dstate can only be 1 or 0.
 | 
						|
     */
 | 
						|
    state_pre = *ev->dstate;
 | 
						|
    if (state_pre != state) {
 | 
						|
        if (state) {
 | 
						|
            trace_events_enabled_count++;
 | 
						|
            *ev->dstate = 1;
 | 
						|
        } else {
 | 
						|
            trace_events_enabled_count--;
 | 
						|
            *ev->dstate = 0;
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
 | 
						|
{
 | 
						|
    CPUState *vcpu;
 | 
						|
    assert(trace_event_get_state_static(ev));
 | 
						|
    if (trace_event_is_vcpu(ev)) {
 | 
						|
        CPU_FOREACH(vcpu) {
 | 
						|
            trace_event_set_vcpu_state_dynamic(vcpu, ev, state);
 | 
						|
        }
 | 
						|
    } else {
 | 
						|
        /* Without the "vcpu" property, dstate can only be 1 or 0 */
 | 
						|
        bool state_pre = *ev->dstate;
 | 
						|
        if (state_pre != state) {
 | 
						|
            if (state) {
 | 
						|
                trace_events_enabled_count++;
 | 
						|
                *ev->dstate = 1;
 | 
						|
            } else {
 | 
						|
                trace_events_enabled_count--;
 | 
						|
                *ev->dstate = 0;
 | 
						|
            }
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
 | 
						|
                                        TraceEvent *ev, bool state)
 | 
						|
{
 | 
						|
    uint32_t vcpu_id;
 | 
						|
    bool state_pre;
 | 
						|
    assert(trace_event_get_state_static(ev));
 | 
						|
    assert(trace_event_is_vcpu(ev));
 | 
						|
    vcpu_id = trace_event_get_vcpu_id(ev);
 | 
						|
    state_pre = test_bit(vcpu_id, vcpu->trace_dstate);
 | 
						|
    if (state_pre != state) {
 | 
						|
        if (state) {
 | 
						|
            trace_events_enabled_count++;
 | 
						|
            set_bit(vcpu_id, vcpu->trace_dstate);
 | 
						|
            (*ev->dstate)++;
 | 
						|
        } else {
 | 
						|
            trace_events_enabled_count--;
 | 
						|
            clear_bit(vcpu_id, vcpu->trace_dstate);
 | 
						|
            (*ev->dstate)--;
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static bool adding_first_cpu(void)
 | 
						|
{
 | 
						|
    CPUState *cpu;
 | 
						|
    size_t count = 0;
 | 
						|
    CPU_FOREACH(cpu) {
 | 
						|
        count++;
 | 
						|
        if (count > 1) {
 | 
						|
            return false;
 | 
						|
        }
 | 
						|
    }
 | 
						|
    return true;
 | 
						|
}
 | 
						|
 | 
						|
void trace_init_vcpu(CPUState *vcpu)
 | 
						|
{
 | 
						|
    TraceEventIter iter;
 | 
						|
    TraceEvent *ev;
 | 
						|
    trace_event_iter_init(&iter, NULL);
 | 
						|
    while ((ev = trace_event_iter_next(&iter)) != NULL) {
 | 
						|
        if (trace_event_is_vcpu(ev) &&
 | 
						|
            trace_event_get_state_static(ev) &&
 | 
						|
            trace_event_get_state_dynamic(ev)) {
 | 
						|
            if (adding_first_cpu()) {
 | 
						|
                /* check preconditions */
 | 
						|
                assert(*ev->dstate == 1);
 | 
						|
                /* disable early-init state ... */
 | 
						|
                *ev->dstate = 0;
 | 
						|
                trace_events_enabled_count--;
 | 
						|
                /* ... and properly re-enable */
 | 
						|
                trace_event_set_vcpu_state_dynamic(vcpu, ev, true);
 | 
						|
            } else {
 | 
						|
                trace_event_set_vcpu_state_dynamic(vcpu, ev, true);
 | 
						|
            }
 | 
						|
        }
 | 
						|
    }
 | 
						|
    trace_guest_cpu_enter(vcpu);
 | 
						|
}
 |