* [Qemu-devel] [Tracing] Compilation failure
@ 2010-08-09 8:56 Prerna Saxena
2010-08-09 9:35 ` [Qemu-devel] " Stefan Hajnoczi
2010-08-09 13:35 ` [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit Stefan Hajnoczi
0 siblings, 2 replies; 6+ messages in thread
From: Prerna Saxena @ 2010-08-09 8:56 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
Hi Stefan,
I think this needs to be resolved.
CC trace.o
CC simpletrace.o
cc1: warnings being treated as errors
/home/prerna/qemu-testing/git/qemu/simpletrace.c: In function
‘write_header’:
/home/prerna/qemu-testing/git/qemu/simpletrace.c:46: error: integer
constant is too large for ‘long’ type
/home/prerna/qemu-testing/git/qemu/simpletrace.c:46: error: large
integer implicitly truncated to unsigned type
make: *** [simpletrace.o] Error 1
The error arises due to :
TraceRecord header = {
.event = -1UL, /* max avoids conflicting with TraceEventIDs */
.timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */
^^^^^^^^ error.
Also, it would be better to #define the magic number to some macro, and
use that instead of using the constant directly.
Regards,
--
Prerna Saxena
Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India
^ permalink raw reply [flat|nested] 6+ messages in thread* [Qemu-devel] Re: [Tracing] Compilation failure 2010-08-09 8:56 [Qemu-devel] [Tracing] Compilation failure Prerna Saxena @ 2010-08-09 9:35 ` Stefan Hajnoczi 2010-08-09 13:35 ` [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit Stefan Hajnoczi 1 sibling, 0 replies; 6+ messages in thread From: Stefan Hajnoczi @ 2010-08-09 9:35 UTC (permalink / raw) To: Prerna Saxena; +Cc: qemu-devel On Mon, Aug 09, 2010 at 02:26:05PM +0530, Prerna Saxena wrote: > Hi Stefan, > I think this needs to be resolved. > > CC trace.o > CC simpletrace.o > cc1: warnings being treated as errors > /home/prerna/qemu-testing/git/qemu/simpletrace.c: In function > ‘write_header’: > /home/prerna/qemu-testing/git/qemu/simpletrace.c:46: error: integer > constant is too large for ‘long’ type > /home/prerna/qemu-testing/git/qemu/simpletrace.c:46: error: large > integer implicitly truncated to unsigned type > make: *** [simpletrace.o] Error 1 > > The error arises due to : > TraceRecord header = { > .event = -1UL, /* max avoids conflicting with TraceEventIDs */ > .timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */ > ^^^^^^^^ error. > > Also, it would be better to #define the magic number to some macro, > and use that instead of using the constant directly. Thanks for pointing this out. The trace file format does not use portable field sizes. The unsigned long field size changes depending on the host architecture (32-bit or 64-bit). I think 64-bit fields is reasonable. 32-bit hosts will not make use of the high 32-bits but that seems okay. Stefan ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit 2010-08-09 8:56 [Qemu-devel] [Tracing] Compilation failure Prerna Saxena 2010-08-09 9:35 ` [Qemu-devel] " Stefan Hajnoczi @ 2010-08-09 13:35 ` Stefan Hajnoczi 2010-08-11 6:03 ` Prerna Saxena 1 sibling, 1 reply; 6+ messages in thread From: Stefan Hajnoczi @ 2010-08-09 13:35 UTC (permalink / raw) To: qemu-devel; +Cc: Stefan Hajnoczi, Prerna Saxena Explicitly use 64-bit fields in trace records so that timestamps and magic numbers work for 32-bit host builds. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> --- simpletrace.c | 31 +++++++++++++++++++++---------- simpletrace.h | 11 ++++++----- simpletrace.py | 2 +- tracetool | 6 +++--- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/simpletrace.c b/simpletrace.c index 954cc4e..01acfc5 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -9,18 +9,29 @@ */ #include <stdlib.h> +#include <stdint.h> #include <stdio.h> #include <time.h> #include "trace.h" +/** Trace file header event ID */ +#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */ + +/** Trace file magic number */ +#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL + +/** Trace file version number, bump if format changes */ +#define HEADER_VERSION 0 + +/** Trace buffer entry */ typedef struct { - unsigned long event; - unsigned long timestamp_ns; - unsigned long x1; - unsigned long x2; - unsigned long x3; - unsigned long x4; - unsigned long x5; + uint64_t event; + uint64_t timestamp_ns; + uint64_t x1; + uint64_t x2; + uint64_t x3; + uint64_t x4; + uint64_t x5; } TraceRecord; enum { @@ -42,9 +53,9 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, static bool write_header(FILE *fp) { TraceRecord header = { - .event = -1UL, /* max avoids conflicting with TraceEventIDs */ - .timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */ - .x1 = 0, /* bump this version number if file format changes */ + .event = HEADER_EVENT_ID, + .timestamp_ns = HEADER_MAGIC, + .x1 = HEADER_VERSION, }; return fwrite(&header, sizeof header, 1, fp) == 1; diff --git a/simpletrace.h b/simpletrace.h index 6a2b8d9..f81aa8e 100644 --- a/simpletrace.h +++ b/simpletrace.h @@ -10,6 +10,7 @@ #define SIMPLETRACE_H #include <stdbool.h> +#include <stdint.h> #include <stdio.h> typedef unsigned int TraceEventID; @@ -20,11 +21,11 @@ typedef struct { } TraceEvent; void trace0(TraceEventID event); -void trace1(TraceEventID event, unsigned long x1); -void trace2(TraceEventID event, unsigned long x1, unsigned long x2); -void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); -void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4); -void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5); +void trace1(TraceEventID event, uint64_t x1); +void trace2(TraceEventID event, uint64_t x1, uint64_t x2); +void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3); +void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4); +void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5); void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_change_trace_event_state(const char *tname, bool tstate); diff --git a/simpletrace.py b/simpletrace.py index 979d911..fdf0eb5 100755 --- a/simpletrace.py +++ b/simpletrace.py @@ -17,7 +17,7 @@ header_event_id = 0xffffffffffffffff header_magic = 0xf2b177cb0aa429b4 header_version = 0 -trace_fmt = 'LLLLLLL' +trace_fmt = '=QQQQQQQ' trace_len = struct.calcsize(trace_fmt) event_re = re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\)\s+"([^"]*)"') diff --git a/tracetool b/tracetool index c5a5bdc..b78cd97 100755 --- a/tracetool +++ b/tracetool @@ -151,11 +151,11 @@ EOF simple_event_num=0 } -cast_args_to_ulong() +cast_args_to_uint64_t() { local arg for arg in $(get_argnames "$1"); do - echo -n "(unsigned long)$arg" + echo -n "(uint64_t)$arg" done } @@ -173,7 +173,7 @@ linetoh_simple() trace_args="$simple_event_num" if [ "$argc" -gt 0 ] then - trace_args="$trace_args, $(cast_args_to_ulong "$1")" + trace_args="$trace_args, $(cast_args_to_uint64_t "$1")" fi cat <<EOF -- 1.7.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit 2010-08-09 13:35 ` [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit Stefan Hajnoczi @ 2010-08-11 6:03 ` Prerna Saxena 2010-08-11 9:37 ` malc 2010-08-11 11:13 ` [Qemu-devel] [PATCH v2] " Prerna Saxena 0 siblings, 2 replies; 6+ messages in thread From: Prerna Saxena @ 2010-08-11 6:03 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: Mahesh Jagannath Salgaonkar, Ananth, qemu-devel On 08/09/2010 07:05 PM, Stefan Hajnoczi wrote: > Explicitly use 64-bit fields in trace records so that timestamps and > magic numbers work for 32-bit host builds. > > Signed-off-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com> > --- > simpletrace.c | 31 +++++++++++++++++++++---------- > simpletrace.h | 11 ++++++----- > simpletrace.py | 2 +- > tracetool | 6 +++--- > 4 files changed, 31 insertions(+), 19 deletions(-) > > diff --git a/simpletrace.c b/simpletrace.c > index 954cc4e..01acfc5 100644 > --- a/simpletrace.c > +++ b/simpletrace.c > @@ -9,18 +9,29 @@ > */ > > #include<stdlib.h> > +#include<stdint.h> > #include<stdio.h> > #include<time.h> > #include "trace.h" > > +/** Trace file header event ID */ > +#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */ > + > +/** Trace file magic number */ > +#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL > + > +/** Trace file version number, bump if format changes */ > +#define HEADER_VERSION 0 > + > +/** Trace buffer entry */ > typedef struct { > - unsigned long event; > - unsigned long timestamp_ns; > - unsigned long x1; > - unsigned long x2; > - unsigned long x3; > - unsigned long x4; > - unsigned long x5; > + uint64_t event; > + uint64_t timestamp_ns; > + uint64_t x1; > + uint64_t x2; > + uint64_t x3; > + uint64_t x4; > + uint64_t x5; > } TraceRecord; > > enum { > @@ -42,9 +53,9 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, > static bool write_header(FILE *fp) > { > TraceRecord header = { > - .event = -1UL, /* max avoids conflicting with TraceEventIDs */ > - .timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */ > - .x1 = 0, /* bump this version number if file format changes */ > + .event = HEADER_EVENT_ID, > + .timestamp_ns = HEADER_MAGIC, > + .x1 = HEADER_VERSION, > }; > > return fwrite(&header, sizeof header, 1, fp) == 1; > diff --git a/simpletrace.h b/simpletrace.h > index 6a2b8d9..f81aa8e 100644 > --- a/simpletrace.h > +++ b/simpletrace.h > @@ -10,6 +10,7 @@ > #define SIMPLETRACE_H > > #include<stdbool.h> > +#include<stdint.h> > #include<stdio.h> > > typedef unsigned int TraceEventID; It would be useful to have : typedef uint64_t TraceEventID; This ensures that the maximum number of trace events available on both 32 and 64 bit builds is same. > @@ -20,11 +21,11 @@ typedef struct { > } TraceEvent; > > void trace0(TraceEventID event); > -void trace1(TraceEventID event, unsigned long x1); > -void trace2(TraceEventID event, unsigned long x1, unsigned long x2); > -void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); > -void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4); > -void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5); > +void trace1(TraceEventID event, uint64_t x1); > +void trace2(TraceEventID event, uint64_t x1, uint64_t x2); > +void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3); > +void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4); > +void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5); > void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); > void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); > void st_change_trace_event_state(const char *tname, bool tstate); > diff --git a/simpletrace.py b/simpletrace.py > index 979d911..fdf0eb5 100755 > --- a/simpletrace.py > +++ b/simpletrace.py > @@ -17,7 +17,7 @@ header_event_id = 0xffffffffffffffff > header_magic = 0xf2b177cb0aa429b4 > header_version = 0 > > -trace_fmt = 'LLLLLLL' > +trace_fmt = '=QQQQQQQ' > trace_len = struct.calcsize(trace_fmt) > event_re = re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\)\s+"([^"]*)"') > > diff --git a/tracetool b/tracetool > index c5a5bdc..b78cd97 100755 > --- a/tracetool > +++ b/tracetool > @@ -151,11 +151,11 @@ EOF > simple_event_num=0 > } > > -cast_args_to_ulong() > +cast_args_to_uint64_t() > { > local arg > for arg in $(get_argnames "$1"); do > - echo -n "(unsigned long)$arg" > + echo -n "(uint64_t)$arg" Tested this on a 32 bit host. It throws up some warnings, and we need : echo -n "(uint64_t)(uintptr_t)$arg" > done > } > > @@ -173,7 +173,7 @@ linetoh_simple() > trace_args="$simple_event_num" > if [ "$argc" -gt 0 ] > then > - trace_args="$trace_args, $(cast_args_to_ulong "$1")" > + trace_args="$trace_args, $(cast_args_to_uint64_t "$1")" > fi > > cat<<EOF -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit 2010-08-11 6:03 ` Prerna Saxena @ 2010-08-11 9:37 ` malc 2010-08-11 11:13 ` [Qemu-devel] [PATCH v2] " Prerna Saxena 1 sibling, 0 replies; 6+ messages in thread From: malc @ 2010-08-11 9:37 UTC (permalink / raw) To: Prerna Saxena Cc: Mahesh Jagannath Salgaonkar, Ananth, Stefan Hajnoczi, qemu-devel On Wed, 11 Aug 2010, Prerna Saxena wrote: > On 08/09/2010 07:05 PM, Stefan Hajnoczi wrote: > > Explicitly use 64-bit fields in trace records so that timestamps and > > magic numbers work for 32-bit host builds. > > > > Signed-off-by: Stefan Hajnoczi<stefanha@linux.vnet.ibm.com> > > --- > > simpletrace.c | 31 +++++++++++++++++++++---------- > > simpletrace.h | 11 ++++++----- > > simpletrace.py | 2 +- > > tracetool | 6 +++--- > > 4 files changed, 31 insertions(+), 19 deletions(-) > > > > diff --git a/simpletrace.c b/simpletrace.c > > index 954cc4e..01acfc5 100644 > > --- a/simpletrace.c > > +++ b/simpletrace.c > > @@ -9,18 +9,29 @@ > > */ > > > > #include<stdlib.h> > > +#include<stdint.h> > > #include<stdio.h> > > #include<time.h> > > #include "trace.h" > > > > +/** Trace file header event ID */ > > +#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with > > TraceEventIDs */ > > + > > +/** Trace file magic number */ > > +#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL > > + > > +/** Trace file version number, bump if format changes */ > > +#define HEADER_VERSION 0 > > + > > +/** Trace buffer entry */ > > typedef struct { > > - unsigned long event; > > - unsigned long timestamp_ns; > > - unsigned long x1; > > - unsigned long x2; > > - unsigned long x3; > > - unsigned long x4; > > - unsigned long x5; > > + uint64_t event; > > + uint64_t timestamp_ns; > > + uint64_t x1; > > + uint64_t x2; > > + uint64_t x3; > > + uint64_t x4; > > + uint64_t x5; > > } TraceRecord; > > > > enum { > > @@ -42,9 +53,9 @@ void st_print_trace_file_status(FILE *stream, int > > (*stream_printf)(FILE *stream, > > static bool write_header(FILE *fp) > > { > > TraceRecord header = { > > - .event = -1UL, /* max avoids conflicting with TraceEventIDs */ > > - .timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */ > > - .x1 = 0, /* bump this version number if file format changes */ > > + .event = HEADER_EVENT_ID, > > + .timestamp_ns = HEADER_MAGIC, > > + .x1 = HEADER_VERSION, > > }; > > > > return fwrite(&header, sizeof header, 1, fp) == 1; > > diff --git a/simpletrace.h b/simpletrace.h > > index 6a2b8d9..f81aa8e 100644 > > --- a/simpletrace.h > > +++ b/simpletrace.h > > @@ -10,6 +10,7 @@ > > #define SIMPLETRACE_H > > > > #include<stdbool.h> > > +#include<stdint.h> > > #include<stdio.h> > > > > typedef unsigned int TraceEventID; > > It would be useful to have : > > typedef uint64_t TraceEventID; > > This ensures that the maximum number of trace events available on both 32 and > 64 bit builds is same. > > > @@ -20,11 +21,11 @@ typedef struct { > > } TraceEvent; > > > > void trace0(TraceEventID event); > > -void trace1(TraceEventID event, unsigned long x1); > > -void trace2(TraceEventID event, unsigned long x1, unsigned long x2); > > -void trace3(TraceEventID event, unsigned long x1, unsigned long x2, > > unsigned long x3); > > -void trace4(TraceEventID event, unsigned long x1, unsigned long x2, > > unsigned long x3, unsigned long x4); > > -void trace5(TraceEventID event, unsigned long x1, unsigned long x2, > > unsigned long x3, unsigned long x4, unsigned long x5); > > +void trace1(TraceEventID event, uint64_t x1); > > +void trace2(TraceEventID event, uint64_t x1, uint64_t x2); > > +void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3); > > +void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, > > uint64_t x4); > > +void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, > > uint64_t x4, uint64_t x5); > > void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const > > char *fmt, ...)); > > void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE > > *stream, const char *fmt, ...)); > > void st_change_trace_event_state(const char *tname, bool tstate); > > diff --git a/simpletrace.py b/simpletrace.py > > index 979d911..fdf0eb5 100755 > > --- a/simpletrace.py > > +++ b/simpletrace.py > > @@ -17,7 +17,7 @@ header_event_id = 0xffffffffffffffff > > header_magic = 0xf2b177cb0aa429b4 > > header_version = 0 > > > > -trace_fmt = 'LLLLLLL' > > +trace_fmt = '=QQQQQQQ' > > trace_len = struct.calcsize(trace_fmt) > > event_re = > > re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\)\s+"([^"]*)"') > > > > diff --git a/tracetool b/tracetool > > index c5a5bdc..b78cd97 100755 > > --- a/tracetool > > +++ b/tracetool > > @@ -151,11 +151,11 @@ EOF > > simple_event_num=0 > > } > > > > -cast_args_to_ulong() > > +cast_args_to_uint64_t() > > { > > local arg > > for arg in $(get_argnames "$1"); do > > - echo -n "(unsigned long)$arg" > > + echo -n "(uint64_t)$arg" > > Tested this on a 32 bit host. It throws up some warnings, and we need : > echo -n "(uint64_t)(uintptr_t)$arg" Generic echo doesn't have any command line options, please use printf instead. > > > done > > } > > > > @@ -173,7 +173,7 @@ linetoh_simple() > > trace_args="$simple_event_num" > > if [ "$argc" -gt 0 ] > > then > > - trace_args="$trace_args, $(cast_args_to_ulong "$1")" > > + trace_args="$trace_args, $(cast_args_to_uint64_t "$1")" > > fi > > > > cat<<EOF > > > -- mailto:av1474@comtv.ru ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2] trace: Make trace record fields 64-bit 2010-08-11 6:03 ` Prerna Saxena 2010-08-11 9:37 ` malc @ 2010-08-11 11:13 ` Prerna Saxena 1 sibling, 0 replies; 6+ messages in thread From: Prerna Saxena @ 2010-08-11 11:13 UTC (permalink / raw) To: qemu-devel; +Cc: Mahesh, Salgaonkar, Ananth, Stefan Hajnoczi Explicitly use 64-bit fields in trace records so that timestamps and magic numbers work for 32-bit host builds. Changelog (from initial patch posted by Stefan): 1) TraceEventID is now uint64_t to take care of same number of tracepoints on both 32 and 64 bit builds. 2) Cast arguments to uintptr_t, and then to uint64_t to bypass warnings. Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com> --- simpletrace.c | 41 ++++++++++++++++++++++++++--------------- simpletrace.h | 13 +++++++------ simpletrace.py | 2 +- tracetool | 6 +++--- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/simpletrace.c b/simpletrace.c index 954cc4e..27b0cab 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -9,18 +9,29 @@ */ #include <stdlib.h> +#include <stdint.h> #include <stdio.h> #include <time.h> #include "trace.h" +/** Trace file header event ID */ +#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */ + +/** Trace file magic number */ +#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL + +/** Trace file version number, bump if format changes */ +#define HEADER_VERSION 0 + +/** Trace buffer entry */ typedef struct { - unsigned long event; - unsigned long timestamp_ns; - unsigned long x1; - unsigned long x2; - unsigned long x3; - unsigned long x4; - unsigned long x5; + uint64_t event; + uint64_t timestamp_ns; + uint64_t x1; + uint64_t x2; + uint64_t x3; + uint64_t x4; + uint64_t x5; } TraceRecord; enum { @@ -42,9 +53,9 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, static bool write_header(FILE *fp) { TraceRecord header = { - .event = -1UL, /* max avoids conflicting with TraceEventIDs */ - .timestamp_ns = 0xf2b177cb0aa429b4, /* magic number */ - .x1 = 0, /* bump this version number if file format changes */ + .event = HEADER_EVENT_ID, + .timestamp_ns = HEADER_MAGIC, + .x1 = HEADER_VERSION, }; return fwrite(&header, sizeof header, 1, fp) == 1; @@ -160,27 +171,27 @@ void trace0(TraceEventID event) trace(event, 0, 0, 0, 0, 0); } -void trace1(TraceEventID event, unsigned long x1) +void trace1(TraceEventID event, uint64_t x1) { trace(event, x1, 0, 0, 0, 0); } -void trace2(TraceEventID event, unsigned long x1, unsigned long x2) +void trace2(TraceEventID event, uint64_t x1, uint64_t x2) { trace(event, x1, x2, 0, 0, 0); } -void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3) +void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3) { trace(event, x1, x2, x3, 0, 0); } -void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4) +void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4) { trace(event, x1, x2, x3, x4, 0); } -void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5) +void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5) { trace(event, x1, x2, x3, x4, x5); } diff --git a/simpletrace.h b/simpletrace.h index 6a2b8d9..00ca439 100644 --- a/simpletrace.h +++ b/simpletrace.h @@ -10,9 +10,10 @@ #define SIMPLETRACE_H #include <stdbool.h> +#include <stdint.h> #include <stdio.h> -typedef unsigned int TraceEventID; +typedef uint64_t TraceEventID; typedef struct { const char *tp_name; @@ -20,11 +21,11 @@ typedef struct { } TraceEvent; void trace0(TraceEventID event); -void trace1(TraceEventID event, unsigned long x1); -void trace2(TraceEventID event, unsigned long x1, unsigned long x2); -void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); -void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4); -void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5); +void trace1(TraceEventID event, uint64_t x1); +void trace2(TraceEventID event, uint64_t x1, uint64_t x2); +void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3); +void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4); +void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5); void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_change_trace_event_state(const char *tname, bool tstate); diff --git a/simpletrace.py b/simpletrace.py index 979d911..fdf0eb5 100755 --- a/simpletrace.py +++ b/simpletrace.py @@ -17,7 +17,7 @@ header_event_id = 0xffffffffffffffff header_magic = 0xf2b177cb0aa429b4 header_version = 0 -trace_fmt = 'LLLLLLL' +trace_fmt = '=QQQQQQQ' trace_len = struct.calcsize(trace_fmt) event_re = re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\)\s+"([^"]*)"') diff --git a/tracetool b/tracetool index c5a5bdc..29473d4 100755 --- a/tracetool +++ b/tracetool @@ -151,11 +151,11 @@ EOF simple_event_num=0 } -cast_args_to_ulong() +cast_args_to_uint64_t() { local arg for arg in $(get_argnames "$1"); do - echo -n "(unsigned long)$arg" + echo -n "(uint64_t)(uintptr_t)$arg" done } @@ -173,7 +173,7 @@ linetoh_simple() trace_args="$simple_event_num" if [ "$argc" -gt 0 ] then - trace_args="$trace_args, $(cast_args_to_ulong "$1")" + trace_args="$trace_args, $(cast_args_to_uint64_t "$1")" fi cat <<EOF -- 1.6.2.5 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-08-11 11:13 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-08-09 8:56 [Qemu-devel] [Tracing] Compilation failure Prerna Saxena 2010-08-09 9:35 ` [Qemu-devel] " Stefan Hajnoczi 2010-08-09 13:35 ` [Qemu-devel] [PATCH] trace: Make trace record fields 64-bit Stefan Hajnoczi 2010-08-11 6:03 ` Prerna Saxena 2010-08-11 9:37 ` malc 2010-08-11 11:13 ` [Qemu-devel] [PATCH v2] " Prerna Saxena
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.