diff --git a/vldb-protocols.py b/vldb-protocols.py index ba872178139c8b123ac60f187833f2b64bd18921..24def5f77df515ee20b4d02601f150f04f4bd28b 100644 --- a/vldb-protocols.py +++ b/vldb-protocols.py @@ -91,7 +91,7 @@ def benchmark_command(cmd, system, protocol, network, tuple, r, dummy): transmittedpackets = rxpackets() - startpackets if retcode != 0: duration = -1 - stats = {'system': system['name'], 'db': system['db'], 'protocol': protocol, 'network': network['name'], 'throughput': network['throughput'], 'latency': network['latency'], 'tuple': tuple, 'run': r, 'time': duration, "bytes" : transmittedbytes, 'packets': transmittedpackets, 'timeout' : int(retcode != 0)} + stats = {'system': system['name'], 'db': system['db'], 'protocol': protocol, 'network': network['name'], 'throughput': network['throughput'], 'latency': network['latency'], 'tuple': tuple, 'run': r, 'time': duration, "bytes" : transmittedbytes, 'packets': transmittedpackets, 'timeout' : int(retcode != 0), 'bin_orientation' : system['fileext'] if 'fileext' in system else '', 'bin_chunksize': system['chunksize'] if 'chunksize' in system else '', 'bin_compress':system['compress'] if 'compress' in system else ''} stats.update(json.load(open('timing'))) if not dummy: w.writerow(stats) @@ -121,7 +121,7 @@ oqfile = open("query-oracle.sql", "w") oqfile.write(oq) oqfile.close() -w = csv.DictWriter(sys.stdout, ['system', 'db', 'protocol', 'network', 'throughput', 'latency', 'tuple', 'run', 'timeout', 'time', 'bytes', 'packets', 'cpu_kernel_sec', 'cpu_user_sec', 'io_page_faults', 'memory_max_kb']) +w = csv.DictWriter(sys.stdout, ['system', 'db', 'protocol', 'network', 'throughput', 'latency', 'tuple', 'run', 'timeout', 'time', 'bytes', 'packets', 'cpu_kernel_sec', 'cpu_user_sec', 'io_page_faults', 'memory_max_kb', 'bin_orientation', 'bin_chunksize', 'bin_compress']) w.writeheader()