OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trace: Avoid implicit bool->integer conversions

Browse Source 
An explicit if/else is clearer than arithmetic assuming #true is 1,
while the compiler should be able to generate just as optimal code.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Message-id: 147194273830.26836.5875729707953474838.stgit@fimbulvetr.bsc.es
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Lluís Vilanova 2016-08-23 10:58:58 +02:00 committed by Stefan Hajnoczi
parent a4d50b1d2a
commit 8eb1b9db55
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stubs/trace-control.c
View File

@ -19,10 +19,23 @@ void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
{
TraceEventID id;
bool state_pre;
assert(trace_event_get_state_static(ev));
id = trace_event_get_id(ev);
trace_events_enabled_count += state - trace_events_dstate[id];
trace_events_dstate[id] = state;
/*
* We ignore the "vcpu" property here, since there's no target code. Then
* dstate can only be 1 or 0.
*/
state_pre = trace_events_dstate[id];
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
trace_events_dstate[id] = 1;
} else {
trace_events_enabled_count--;
trace_events_dstate[id] = 0;
}
}
}
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,

31
trace/control-target.c
View File

@ -16,10 +16,22 @@
void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
{
TraceEventID id = trace_event_get_id(ev);
bool state_pre;
assert(trace_event_get_state_static(ev));
/* Ignore "vcpu" property, since no vCPUs have been created yet */
trace_events_enabled_count += state - trace_events_dstate[id];
trace_events_dstate[id] = state;
/*
* We ignore the "vcpu" property here, since no vCPUs have been created
* yet. Then dstate can only be 1 or 0.
*/
state_pre = trace_events_dstate[id];
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
trace_events_dstate[id] = 1;
} else {
trace_events_enabled_count--;
trace_events_dstate[id] = 0;
}
}
}
void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
@ -31,9 +43,18 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
trace_event_set_vcpu_state_dynamic(vcpu, ev, state);
}
} else {
/* Without the "vcpu" property, dstate can only be 1 or 0 */
TraceEventID id = trace_event_get_id(ev);
trace_events_enabled_count += state - trace_events_dstate[id];
trace_events_dstate[id] = state;
bool state_pre = trace_events_dstate[id];
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
trace_events_dstate[id] = 1;
} else {
trace_events_enabled_count--;
trace_events_dstate[id] = 0;
}
}
}
}