From 84559fe46721d745d0a7bf7925980a0a99eae5a1 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Wed, 3 Apr 2013 18:22:05 +0200 Subject: [PATCH] dump-trace.py: update after trace.proto relocation Change-Id: I4f4b9870cdbe9b81338dde76453755700e6fea94 --- tools/dump-trace/.gitignore | 2 +- tools/dump-trace/Makefile | 4 +--- tools/dump-trace/dump-trace.py | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/dump-trace/.gitignore b/tools/dump-trace/.gitignore index b94d6830..c9eb240e 100644 --- a/tools/dump-trace/.gitignore +++ b/tools/dump-trace/.gitignore @@ -1 +1 @@ -trace_pb2.py +TracePlugin_pb2.py{,c} diff --git a/tools/dump-trace/Makefile b/tools/dump-trace/Makefile index 8e1ead58..da53517a 100644 --- a/tools/dump-trace/Makefile +++ b/tools/dump-trace/Makefile @@ -1,4 +1,2 @@ -all: trace_pb2.py - -trace_pb2.py: ../../src/plugins/tracing/trace.proto +TracePlugin_pb2.py: ../../src/core/comm/TracePlugin.proto protoc --python_out=. --proto_path `dirname $<` $< diff --git a/tools/dump-trace/dump-trace.py b/tools/dump-trace/dump-trace.py index 3a071290..794ae6c0 100755 --- a/tools/dump-trace/dump-trace.py +++ b/tools/dump-trace/dump-trace.py @@ -3,7 +3,7 @@ # create python bindings before running: # protoc --python_out=. trace.proto -import trace_pb2 +import TracePlugin_pb2 import sys import struct from gzip import GzipFile @@ -12,7 +12,7 @@ if len(sys.argv) != 2: print "Usage:", sys.argv[0], "tracefile.pb" sys.exit(-1) -trace_event = trace_pb2.Trace_Event() +trace_event = TracePlugin_pb2.Trace_Event() def open_trace(filename): f = open(filename, "rb") @@ -56,7 +56,7 @@ while True: if len(trace_event.trace_ext.stack) > 0: ext += " STACK: " + "".join(["%x"%x for x in trace_event.trace_ext.stack]) print "MEM {0} {1:x} width {2:d} IP {3:x} {4}".format( - "R" if trace_event.accesstype == trace_pb2.Trace_Event.READ else "W", + "R" if trace_event.accesstype == trace_event.READ else "W", trace_event.memaddr, trace_event.width, trace_event.ip, ext) f.close()