trace: use glib atomic int types

Juan reported that RHEL 6.4 hosts give compiler warnings because we use
unsigned int while glib prototypes use volatile gint in trace/simple.c.

  trace/simple.c:223: error: pointer targets in passing argument 1 of 'g_atomic_int_compare_and_exchange' differ in signedness

These variables are only accessed with glib atomic int functions so
let's play it by the book and use volatile gint.

Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1360676045-9204-2-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/trace/simple.c b/trace/simple.c
index 74701e3272eca6972ae695d1d7dea038a253c689..1d5d8e466722476b60043393e4b6317c558adc7f 100644 (file)
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -51,9 +51,9 @@ enum {
 };
 
 uint8_t trace_buf[TRACE_BUF_LEN];
 };
 
 uint8_t trace_buf[TRACE_BUF_LEN];

-static unsigned int trace_idx;
+static volatile gint trace_idx;

 static unsigned int writeout_idx;
 static unsigned int writeout_idx;

-static int dropped_events;
+static volatile gint dropped_events;

 static FILE *trace_fp;
 static char *trace_file_name;
 
 static FILE *trace_fp;
 static char *trace_file_name;
 


@@ -267,7 +267,7 @@ void trace_record_finish(TraceBufferRecord *rec)
     record.event |= TRACE_RECORD_VALID;
     write_to_buffer(rec->tbuf_idx, &record, sizeof(TraceRecord));
 
     record.event |= TRACE_RECORD_VALID;
     write_to_buffer(rec->tbuf_idx, &record, sizeof(TraceRecord));
 

-    if ((g_atomic_int_get(&trace_idx) - writeout_idx)
+    if (((unsigned int)g_atomic_int_get(&trace_idx) - writeout_idx)

         > TRACE_BUF_FLUSH_THRESHOLD) {
         flush_trace_file(false);
     }
         > TRACE_BUF_FLUSH_THRESHOLD) {
         flush_trace_file(false);
     }