Remove redundant 'type' field from binary SimpleVehicleMessage.

[apps/low-level-can-service.git] / benchmark / proto / compare_sizes.py

diff --git a/benchmark/proto/compare_sizes.py b/benchmark/proto/compare_sizes.py
index b8b79bb..0ed445f 100755 (executable)
--- a/benchmark/proto/compare_sizes.py
+++ b/benchmark/proto/compare_sizes.py
@@ -13,6 +13,7 @@ def sizeof_fmt(num):
             return "%3.1f%s" % (num, unit)
         num /= 1024.0
 
+total_raw_can_size = 0
 total_raw_json_size = 0
 total_raw_binary_size = 0
 total_translated_json_size = 0
@@ -25,26 +26,49 @@ for trace_file in sys.argv[1:]:
         except ValueError:
             continue
 
+        del json_message['timestamp']
+
+        message = openxc_pb2.VehicleMessage()
+
         if 'id' and 'data' in json_message:
-            total_raw_json_size += len(line)
-            binary_message = openxc_pb2.RawMessage()
-            binary_message.message_id = json_message['id']
-            binary_message.data = int(json_message['data'], 0)
-            total_raw_binary_size += len(binary_message.SerializeToString())
+            # rough approx. that CAN messages are 10 bytes - they could be less
+            # but most of ours are full 64+11 bits
+            total_raw_can_size += 10
+            total_raw_json_size += len(json.dumps(json_message))
+            message.type = openxc_pb2.VehicleMessage.RAW
+            message.raw_message.message_id = json_message['id']
+            message.raw_message.data = int(json_message['data'], 0)
+            total_raw_binary_size += len(message.SerializeToString())
         else:
-            if isinstance(json_message['value'], bool):
-                binary_message = openxc_pb2.TranslatedBooleanMessage()
-            elif isinstance(json_message['value'], numbers.Number):
-                binary_message = openxc_pb2.TranslatedNumericMessage()
+            message.type = openxc_pb2.VehicleMessage.TRANSLATED
+            message.translated_message.name = json_message['name']
+            if 'event' in json_message:
+                message.translated_message.string_value = json_message['value']
+                if isinstance(json_message['event'], bool):
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_BOOL
+                    message.translated_message.boolean_event = json_message['event']
+                elif isinstance(json_message['event'], numbers.Number):
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_NUM
+                    message.translated_message.numeric_value = json_message['event']
+                else:
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.EVENTED_STRING
+                    message.translated_message.string_value = json_message['event']
             else:
-                binary_message = openxc_pb2.TranslatedStringMessage()
-            binary_message.name = json_message['name']
-            binary_message.value = json_message['value']
-            total_translated_json_size += len(line)
-            total_translated_binary_size += len(binary_message.SerializeToString())
+                if isinstance(json_message['value'], bool):
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.BOOL
+                    message.translated_message.boolean_value = json_message['value']
+                elif isinstance(json_message['value'], numbers.Number):
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.NUM
+                    message.translated_message.numeric_value = json_message['value']
+                else:
+                    message.translated_message.type = openxc_pb2.TranslatedMessage.STRING
+                    message.translated_message.string_value = json_message['value']
+            total_translated_json_size += len(json.dumps(json_message))
+            total_translated_binary_size += len(message.SerializeToString())
 
 
 print("For the %d trace files given..." % len(sys.argv[1:]))
+print("Total transferred raw CAN size is %s" % sizeof_fmt(total_raw_can_size))
 print("Total transferred raw JSON size is %s" % sizeof_fmt(total_raw_json_size))
 print("Total transferred raw binary size is %s" % sizeof_fmt(total_raw_binary_size))
 print("Total transferred translated JSON size is %s" %
@@ -57,9 +81,16 @@ print("Total transferred JSON size is %s" % sizeof_fmt(total_json_size))
 total_binary_size = total_raw_binary_size + total_translated_binary_size
 print("Total transferred binary size is %s" % sizeof_fmt(total_binary_size))
 
-print("Binary encoding is %f%% smaller than JSON for raw messages" % (
-        100 - (total_raw_binary_size / total_raw_json_size * 100)))
-print("Binary encoding is %f%% smaller than JSON for translated messages" % (
-        100 - (total_translated_binary_size / total_translated_json_size * 100)))
+if total_raw_can_size > 0:
+    print("Binary encoding adds %f%% overhead to raw CAN messages" % (
+            total_raw_binary_size / total_raw_can_size * 100 - 100))
+    print("JSON encoding adds %f%% overhead to raw CAN messages" % (
+            total_raw_json_size / total_raw_can_size * 100 - 100))
+if total_raw_json_size > 0:
+    print("Binary encoding is %f%% smaller than JSON for raw messages" % (
+            100 - (total_raw_binary_size / total_raw_json_size * 100)))
+if total_translated_json_size > 0:
+    print("Binary encoding is %f%% smaller than JSON for translated messages" % (
+            100 - (total_translated_binary_size / total_translated_json_size * 100)))
 print("Binary encoding is %f%% smaller than JSON overall" % (
         100 - (total_binary_size / total_json_size * 100)))