aboutsummaryrefslogtreecommitdiff
path: root/trace
diff options
context:
space:
mode:
authorLluís Vilanova <vilanova@ac.upc.edu>2016-08-23 10:58:58 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2016-09-05 13:47:02 -0400
commit8eb1b9db559e243043aaeac3a0aa97e1f4a403c4 (patch)
tree2c1c91cd7439424b54369082720ac4b54eb95723 /trace
parenta4d50b1d2a6c07a13fb8401a0c3b471f25b44b2a (diff)
downloadqemu-arm-8eb1b9db559e243043aaeac3a0aa97e1f4a403c4.tar.gz
trace: Avoid implicit bool->integer conversions
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>
Diffstat (limited to 'trace')
-rw-r--r--trace/control-target.c31
1 files changed, 26 insertions, 5 deletions
diff --git a/trace/control-target.c b/trace/control-target.c
index 4ee3733662..72081e2a34 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -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;
+ }
+ }
}
}