summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Makefile4
-rwxr-xr-xutil/decode_packet_trace.py42
2 files changed, 11 insertions, 35 deletions
diff --git a/util/Makefile b/util/Makefile
new file mode 100644
index 000000000..f7254518b
--- /dev/null
+++ b/util/Makefile
@@ -0,0 +1,4 @@
+PROTO_PATH=../src/proto
+
+packet_pb2.py: $(PROTO_PATH)/packet.proto
+ protoc --python_out=. --proto_path=$(PROTO_PATH) $<
diff --git a/util/decode_packet_trace.py b/util/decode_packet_trace.py
index dab43c314..9ef9b5fa9 100755
--- a/util/decode_packet_trace.py
+++ b/util/decode_packet_trace.py
@@ -38,45 +38,17 @@
# Authors: Andreas Hansson
# This script is used to dump protobuf packet traces to ASCII
-# format. It assumes that protoc has been executed and already
-# generated the Python package for the packet messages. This can
-# be done manually using:
-# protoc --python_out=. --proto_path=src/proto src/proto/packet.proto
-#
-# The ASCII trace format uses one line per request on the format cmd,
-# addr, size, tick,flags. For example:
-# r,128,64,4000,0
-# w,232123,64,500000,0
+# format.
+import os
import protolib
+import subprocess
import sys
-# Import the packet proto definitions. If they are not found, attempt
-# to generate them automatically.
-try:
- import packet_pb2
-except:
- print "Did not find packet proto definitions, attempting to generate"
- import os
- util_dir = os.path.dirname(os.path.realpath(__file__))
- proto_dir = os.path.join(os.path.dirname(util_dir), 'src', 'proto')
- proto_file = os.path.join(proto_dir, 'packet.proto')
- from subprocess import call
- error = call(['protoc', '--python_out=' + util_dir,
- '--proto_path=' + proto_dir, proto_file])
- if not error:
- print "Generated packet proto definitions"
-
- try:
- import google.protobuf
- except:
- print "Please install Python protobuf module"
- exit(-1)
-
- import packet_pb2
- else:
- print "Failed to import packet proto definitions"
- exit(-1)
+util_dir = os.path.dirname(os.path.realpath(__file__))
+# Make sure the proto definitions are up to date.
+subprocess.check_call(['make', '--quiet', '-C', util_dir, 'packet_pb2.py'])
+import packet_pb2
def main():
if len(sys.argv) != 3: