Commit a8a7ec8d authored by Hejing Li's avatar Hejing Li
Browse files

sync mode experiment and parser modification

parent 90dfce58
...@@ -33,7 +33,7 @@ import simbricks.nodeconfig as node ...@@ -33,7 +33,7 @@ import simbricks.nodeconfig as node
# app: DCTCPm # app: DCTCPm
types_of_host = ['qemu', 'qt','gt'] types_of_host = ['qemu', 'qt','gt']
types_of_nic = ['cv','cb'] types_of_nic = ['ib', 'cv','cb']
types_of_net = ['switch'] types_of_net = ['switch']
types_of_app = ['TCPm'] types_of_app = ['TCPm']
...@@ -53,7 +53,7 @@ for mode in types_of_mode: ...@@ -53,7 +53,7 @@ for mode in types_of_mode:
net.sync_mode = mode net.sync_mode = mode
#net.opt = link_rate_opt + link_latency_opt #net.opt = link_rate_opt + link_latency_opt
e = exp.Experiment( f'modetcp-{mode}-' + h + '-' + c + '-' + 'switch' + f'-{num_pairs}') e = exp.Experiment( f'mode-{mode}-' + h + '-' + c + '-' + 'switch' + f'-{num_pairs}')
e.add_network(net) e.add_network(net)
# host # host
...@@ -82,6 +82,9 @@ for mode in types_of_mode: ...@@ -82,6 +82,9 @@ for mode in types_of_mode:
elif c == 'cv': elif c == 'cv':
nic_class = sim.CorundumVerilatorNIC nic_class = sim.CorundumVerilatorNIC
nc_class = node.CorundumLinuxNode nc_class = node.CorundumLinuxNode
elif c == 'ib':
nic_class = sim.I40eNIC
nc_class = node.I40eDCTCPNode
else: else:
raise NameError(c) raise NameError(c)
......
...@@ -32,7 +32,7 @@ import json ...@@ -32,7 +32,7 @@ import json
mode = ['0', '1'] mode = ['0', '1']
nics = ['cb', 'cv'] nics = ['cb', 'cv', 'ib']
num_client = ['1', '4'] num_client = ['1', '4']
outdir = sys.argv[1] outdir = sys.argv[1]
...@@ -54,7 +54,7 @@ for c in num_client: ...@@ -54,7 +54,7 @@ for c in num_client:
for n in nics: for n in nics:
line = f'{n}' line = f'{n}'
for m in mode: for m in mode:
path = '%s/modetcp-%s-gt-%s-switch-%s-1.json' % (outdir, m, n, c) path = '%s/mode-%s-gt-%s-switch-%s-1.json' % (outdir, m, n, c)
data = parse_sim_time(path) data = parse_sim_time(path)
if 'simtime' in data: if 'simtime' in data:
t = data['simtime'] t = data['simtime']
......
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