Commit 510a3d4e authored by Joanne Hugé's avatar Joanne Hugé

Add new metadata and add option to update report-info in measure-analysis script

parent 906654ca
...@@ -390,6 +390,20 @@ class MeasureSetHandler: ...@@ -390,6 +390,20 @@ class MeasureSetHandler:
report.write("\n") report.write("\n")
report.write("\n") report.write("\n")
def update_report_info(self):
for mtype in self.measure_sets:
for mid in self.measure_sets[mtype]['ids']:
measure = self.get_measure_set("{}{}".format(mtype, mid))
for abr in self.metadata_defvals:
if not abr in measure.metadata:
measure.metadata[abr] = self.metadata_defvals[abr]
measure_file_name = "{}/{}{}.json".format(MeasureSetHandler.measures_dir, mtype, mid)
measure.export_to_json(measure_file_name)
class MeasureSet: class MeasureSet:
def __init__(self, defvals): def __init__(self, defvals):
...@@ -736,6 +750,7 @@ def parse_args(): ...@@ -736,6 +750,7 @@ def parse_args():
parser.add_argument('-R', action='store_true', required=False, help='generate full measure report') parser.add_argument('-R', action='store_true', required=False, help='generate full measure report')
parser.add_argument('-G', action='store_true', required=False, help='generate all graphs') parser.add_argument('-G', action='store_true', required=False, help='generate all graphs')
parser.add_argument('-s', action='store_true', help='show measures') parser.add_argument('-s', action='store_true', help='show measures')
parser.add_argument('-u', action='store_true', required=False, help='update data accordingly to report-info')
args = parser.parse_args() args = parser.parse_args()
...@@ -784,6 +799,9 @@ def parse_args(): ...@@ -784,6 +799,9 @@ def parse_args():
if args.R: if args.R:
ms_handler.generate_report() ms_handler.generate_report()
if args.u:
ms_handler.update_report_info()
if args.G: if args.G:
ms_handler.generate_graphs() ms_handler.generate_graphs()
......
{"measure_sets": [{"measure_type": "cyclictest_wake-up_latency", "props_names": ["Wake-up latency"], "units": ["us"], "middle": 0, "props": [[0, 296668951, 1253067, 600224, 1797, 141, 49, 10, 7, 6, 5, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], "props_type": "histogram", "metadata": {"dev": "Shuttle", "ker": "4.19", "prio": "98", "i": "200us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "16h35", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "lost_packets": "0"}}]} {"measure_sets": [{"measure_type": "cyclictest_wake-up_latency", "props_names": ["Wake-up latency"], "units": ["us"], "middle": 0, "props": [[0, 296668951, 1253067, 600224, 1797, 141, 49, 10, 7, 6, 5, 1, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], "props_type": "histogram", "metadata": {"dev": "Shuttle", "ker": "4.19", "prio": "98", "i": "200us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "16h35", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "client": "A20", "XDP": "no", "lost_packets": "0"}}]}
\ No newline at end of file \ No newline at end of file
{"measure_sets": [{"measure_type": "cyclictest_wake-up_latency", "props_names": ["Wake-up latency"], "units": ["us"], "middle": 0, "props": [[0, 0, 0, 0, 0, 0, 0, 0, 19708967, 290863204, 843353, 116187, 57711, 55555, 143818, 10818251, 4130587, 1281816, 69168, 24688, 11616, 5276, 3337, 2511, 2031, 1507, 1364, 1201, 1116, 1064, 937, 841, 654, 568, 515, 588, 762, 762, 735, 617, 537, 391, 277, 188, 156, 108, 105, 73, 43, 40, 33, 20, 10, 13, 14, 9, 8, 6, 2, 7, 8, 7, 5, 2, 5, 2, 1, 1, 2, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], "props_type": "histogram", "metadata": {"dev": "A20", "ker": "5.6", "prio": "98", "i": "200us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "18h13", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "lost_packets": "0"}}]} {"measure_sets": [{"measure_type": "cyclictest_wake-up_latency", "props_names": ["Wake-up latency"], "units": ["us"], "middle": 0, "props": [[0, 0, 0, 0, 0, 0, 0, 0, 19708967, 290863204, 843353, 116187, 57711, 55555, 143818, 10818251, 4130587, 1281816, 69168, 24688, 11616, 5276, 3337, 2511, 2031, 1507, 1364, 1201, 1116, 1064, 937, 841, 654, 568, 515, 588, 762, 762, 735, 617, 537, 391, 277, 188, 156, 108, 105, 73, 43, 40, 33, 20, 10, 13, 14, 9, 8, 6, 2, 7, 8, 7, 5, 2, 5, 2, 1, 1, 2, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], "props_type": "histogram", "metadata": {"dev": "A20", "ker": "5.6", "prio": "98", "i": "200us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "18h13", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "client": "A20", "XDP": "no", "lost_packets": "0"}}]}
\ No newline at end of file \ No newline at end of file
{"measure_sets": [{"measure_type": "shuttle_signal_jitter", "props_names": ["Shuttle signal output jitter"], "units": ["us"], "middle": 0, "props": [[296, 321, 309, 295, 311, 304, 285, 291, 301, 284, 307, 300, 283, 294, 299, 275, 269, 293, 297, 282, 276, 325, 281, 298, 296, 273, 292, 268, 297, 256, 271, 310, 287, 285, 302, 277, 272, 283, 270, 260, 271, 276, 270, 280, 279, 269, 275, 275, 278, 282, 277, 246, 273, 279, 257, 251, 252, 261, 275, 279, 261, 244, 252, 256, 260, 271, 254, 258, 245, 247, 255, 235, 222, 235, 270, 227, 229, 228, 231, 224, 225, 225, 207, 225, 210, 211, 196, 214, 206, 195, 186, 219, 199, 194, 202, 192, 177, 201, 171, 175, 181, 173, 180, 177, 169, 169, 160, 172, 177, 149, 172, 162, 153, 153, 146, 153, 162, 158, 148, 143, 151, 143, 120, 124, 141, 131, 129, 131, 120, 131, 132, 132, 99, 134, 135, 104, 110, 119, 107, 112, 130, 107, 96, 106, 114, 101, 111, 112, 100, 107, 110, 101, 95, 110, 102, 105, 106, 102, 105, 118, 120, 93, 108, 100, 110, 114, 111, 114, 119, 106, 106, 103, 125, 129, 115, 130, 137, 126, 117, 139, 136, 118, 147, 135, 128, 149, 150, 149, 151, 151, 151, 144, 162, 156, 153, 153, 159, 155, 144, 162, 180, 154, 191, 167, 177, 179, 172, 171, 180, 189, 160, 177, 183, 196, 183, 193, 190, 198, 198, 197, 195, 178, 189, 208, 190, 208, 211, 206, 198, 180, 192, 199, 211, 212, 197, 223, 221, 210, 203, 205, 224, 207, 200, 215, 216, 222, 224, 228, 217, 225, 205, 215, 206, 219, 209, 203, 210, 193, 201, 218, 202, 181, 199, 191, 196, 198, 174, 181, 170, 190, 186, 175, 162, 167, 171, 153, 163, 154, 157, 145, 154, 148, 145, 142, 142, 159, 138, 131, 141, 133, 126, 122, 133, 118, 122, 123, 111, 112, 123, 97, 94, 101, 111, 106, 97, 108, 95, 88, 93, 92, 74, 85, 91, 68, 93, 79, 71, 68, 70, 64, 61, 64, 61, 56, 54, 56, 53, 45, 54, 42, 40, 45, 41, 29, 42, 27, 31, 18, 23, 20, 24, 26, 22, 19, 13, 16, 9, 18, 8, 10, 17, 10, 8, 4, 7, 4, 1, 2, 4, 1, 6, 4, 2, 1, 0, 1, 0, 0, 2, 0, 0, 1, 0, 0, 1]], "props_type": "histogram", "metadata": {"dev": "Shuttle", "ker": "4.19", "prio": "98", "i": "10000us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "0h10", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "lost_packets": "0"}}]} {"measure_sets": [{"measure_type": "shuttle_signal_jitter", "props_names": ["Shuttle signal output jitter"], "units": ["us"], "middle": 0, "props": [[296, 321, 309, 295, 311, 304, 285, 291, 301, 284, 307, 300, 283, 294, 299, 275, 269, 293, 297, 282, 276, 325, 281, 298, 296, 273, 292, 268, 297, 256, 271, 310, 287, 285, 302, 277, 272, 283, 270, 260, 271, 276, 270, 280, 279, 269, 275, 275, 278, 282, 277, 246, 273, 279, 257, 251, 252, 261, 275, 279, 261, 244, 252, 256, 260, 271, 254, 258, 245, 247, 255, 235, 222, 235, 270, 227, 229, 228, 231, 224, 225, 225, 207, 225, 210, 211, 196, 214, 206, 195, 186, 219, 199, 194, 202, 192, 177, 201, 171, 175, 181, 173, 180, 177, 169, 169, 160, 172, 177, 149, 172, 162, 153, 153, 146, 153, 162, 158, 148, 143, 151, 143, 120, 124, 141, 131, 129, 131, 120, 131, 132, 132, 99, 134, 135, 104, 110, 119, 107, 112, 130, 107, 96, 106, 114, 101, 111, 112, 100, 107, 110, 101, 95, 110, 102, 105, 106, 102, 105, 118, 120, 93, 108, 100, 110, 114, 111, 114, 119, 106, 106, 103, 125, 129, 115, 130, 137, 126, 117, 139, 136, 118, 147, 135, 128, 149, 150, 149, 151, 151, 151, 144, 162, 156, 153, 153, 159, 155, 144, 162, 180, 154, 191, 167, 177, 179, 172, 171, 180, 189, 160, 177, 183, 196, 183, 193, 190, 198, 198, 197, 195, 178, 189, 208, 190, 208, 211, 206, 198, 180, 192, 199, 211, 212, 197, 223, 221, 210, 203, 205, 224, 207, 200, 215, 216, 222, 224, 228, 217, 225, 205, 215, 206, 219, 209, 203, 210, 193, 201, 218, 202, 181, 199, 191, 196, 198, 174, 181, 170, 190, 186, 175, 162, 167, 171, 153, 163, 154, 157, 145, 154, 148, 145, 142, 142, 159, 138, 131, 141, 133, 126, 122, 133, 118, 122, 123, 111, 112, 123, 97, 94, 101, 111, 106, 97, 108, 95, 88, 93, 92, 74, 85, 91, 68, 93, 79, 71, 68, 70, 64, 61, 64, 61, 56, 54, 56, 53, 45, 54, 42, 40, 45, 41, 29, 42, 27, 31, 18, 23, 20, 24, 26, 22, 19, 13, 16, 9, 18, 8, 10, 17, 10, 8, 4, 7, 4, 1, 2, 4, 1, 6, 4, 2, 1, 0, 1, 0, 0, 2, 0, 0, 1, 0, 0, 1]], "props_type": "histogram", "metadata": {"dev": "Shuttle", "ker": "4.19", "prio": "98", "i": "10000us", "boot_p": "isolcpus,rcu_nocbs,irqaffinity", "delta": "None", "load": "None", "duration": "0h10", "speed": "1000", "etf_offset": "500us", "route": "E2E", "qdisc": "pfifo_fast", "client": "A20", "XDP": "no", "lost_packets": "0"}}]}
\ No newline at end of file \ No newline at end of file
...@@ -69,6 +69,16 @@ Default value: pfifo_fast ...@@ -69,6 +69,16 @@ Default value: pfifo_fast
Short name: qdisc Short name: qdisc
Description: qdisc used to send packets Description: qdisc used to send packets
##client
Default value: A20
Short name: Client device
Description: Device which sent the packets
##XDP
Default value: no
Short name: XDP
Description: Were XDP sockets used
#Ignored metadata #Ignored metadata
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment