add exp_name to the ns3 prob output file name

experiments/pyexps/e2e_bg_homa.py

@@ -33,7 +33,7 @@ from simbricks.orchestration.e2e_topologies import (
 random.seed(42)
 
 types_of_host = ['qemu', 'qt', 'gem5']
-types_of_protocol = ['tcp', 'dctcp', 'homa']
+types_of_protocol = ['tcp', 'homa']
 
 options = {
     'ns3::TcpSocket::SegmentSize': '1448',
@@ -69,7 +69,7 @@ for h in types_of_host:
                     n_agg_bl=1,
                     n_agg_sw=1,
                     n_agg_racks=1,
-                    h_per_rack=2,
+                    h_per_rack=4,
                 )
         
 
@@ -124,7 +124,7 @@ for h in types_of_host:
         topology.add_simbricks_host_r(client_nic)
         topology.add_simbricks_host_r(server_nic)
 
-        add_homa_bg(topology, app_proto=p)
+        add_homa_bg(topology, app_proto=p, exp_name=e.name)
         net.init_network()
 
         experiments.append(e)

experiments/simbricks/orchestration/e2e_topologies.py

@@ -353,7 +353,8 @@ def add_homa_bg(topo, subnet='10.0.0.0/16', **kwargs):
             s_host.add_component(s_app)
             s_probe = e2e.E2EPeriodicSampleProbe('probe', 'Rx')
             s_probe.interval = '1s'
-            s_probe.file = f'sink-rx-{i}'
+            exp_name = params['exp_name']
+            s_probe.file = f'{exp_name}_sink-rx-{i}'
             s_app.add_component(s_probe)
         elif(params['app_proto'] == 'homa'):
             s_app = e2e.E2EMsgGenApplication('msggen')
@@ -362,7 +363,8 @@ def add_homa_bg(topo, subnet='10.0.0.0/16', **kwargs):
             s_host.add_component(s_app)
             s_probe = e2e.E2EPeriodicSampleProbe('probe', 'Rx')
             s_probe.interval = '1s'
-            s_probe.file = f'sink-rx-{i}'
+            exp_name = params['exp_name']
+            s_probe.file = f'{exp_name}_sink-rx-{i}'
             s_app.add_component(s_probe)
 
         topo.add_host_r(s_host)