update ns-3 to version 3.38

Update to newer ns-3 version and adapt code for changes (mostly
renamed files and command line parameters) in the ns-3 submodule.

docker/Dockerfile.buildenv

@@ -8,6 +8,7 @@ RUN apt-get update \
 	bc \
 	bison \
 	build-essential \
+	cmake \
 	doxygen \
 	g++ \
 	flex \

docker/cleanup_ns3.sh

@@ -3,11 +3,11 @@ set -e
 
 mkdir -p sims/external/ns-3-new/
 cd sims/external/ns-3
-find build -name '*.o' -delete
 cp -r \
   build/ \
-  cosim-run.sh \
-  cosim-dctcp-run.sh \
+  simbricks-run.sh \
+  ns3 \
+  .lock-ns3* \
   ../ns-3-new/
 cd ..
 git submodule deinit -f ns-3

experiments/ae/eth_accuracy.sh

@@ -16,7 +16,7 @@ mkdir -p $RUN_DIR
 
 # Runs the SENDER host first
 echo "run sender host"
-build/src/cosim/examples/ns3-dev-cosim-nicif-example-debug  --verbose --uxsoc=$RUN_DIR/uxsoc --shm=$RUN_DIR/shm --syncDelay=500000 --pollDelay=500000 --ethLatency=500000 --sync=1 --sync_mode=0 > $RUN_DIR/sender.out 2>&1 &
+./simbricks-run.sh simbricks-nicif-example --verbose --uxsoc=$RUN_DIR/uxsoc --shm=$RUN_DIR/shm --syncDelay=500000 --pollDelay=500000 --ethLatency=500000 --sync=1 --sync_mode=0 > $RUN_DIR/sender.out 2>&1 &
 
 pid=$!
 ALL_PIDS="$ALL_PIDS $pid"
@@ -25,7 +25,7 @@ sleep 1
 
 # Runs the RECEIVER host
 echo "run receiver host"
-build/src/cosim/examples/ns3-dev-cosim-netif-example-debug --verbose --uxsoc=$RUN_DIR/uxsoc --syncDelay=500000 --pollDelay=500000 --ethLatency=500000 --sync=1 > $RUN_DIR/receiver.out 2>&1 & 
+./simbricks-run.sh simbricks-netif-example --verbose --uxsoc=$RUN_DIR/uxsoc --syncDelay=500000 --pollDelay=500000 --ethLatency=500000 --sync=1 > $RUN_DIR/receiver.out 2>&1 &
 
 # 
 # 
@@ -54,7 +54,7 @@ sleep 2
 
 ### Run single instance ns-3
 echo "Run single instance ns-3"
-build/src/network/examples/ns3-dev-packet-socket-apps-debug --verbose > $RUN_DIR/single_ns3.out 2>&1 
+./simbricks-run.sh packet-socket-apps --verbose > $RUN_DIR/single_ns3.out 2>&1
 
 echo "parsing data"
 cat $RUN_DIR/sender.out | awk '/Time:/ {print "Tx at: "$11}' > $RUN_DIR/sender.time

experiments/pyexps/ae/ns3-dctcp.sh

@@ -82,7 +82,7 @@ do
         for k in $(seq $k_start $k_step $k_end)
         do
             echo "latency: $lat MtU: $m  K: $k  "
-            ./cosim-dctcp-run.sh $k $m $lat &
+            ./simbricks-run.sh dctcp-cwnd-devred --EcnTh=$k --mtu=$m --LinkLatency=$lat &
             pid=$!
             pids="$pids $pid"
             proc=$(($proc + 1))

experiments/pyexps/ns3-dctcp.sh

@@ -84,7 +84,7 @@ do
         for k in $(seq $k_start $k_step $k_end)
         do
             echo "latency: $lat MtU: $m  K: $k  "
-            ./cosim-dctcp-run.sh $k $m $lat &
+            ./simbricks-run.sh dctcp-cwnd-devred --EcnTh=$k --mtu=$m --LinkLatency=$lat &
             pid=$!
             pids="$pids $pid"
             proc=$(($proc + 1))

experiments/simbricks/orchestration/simulators.py

@@ -892,13 +892,13 @@ class NS3DumbbellNet(NetSim):
         ports = ''
         for (n, s) in self.connect_sockets(env):
             if 'server' in n.name:
-                ports += f'--CosimPortLeft={s} '
+                ports += f'--SimbricksPortLeft={s} '
             else:
-                ports += f'--CosimPortRight={s} '
+                ports += f'--SimbricksPortRight={s} '
 
         cmd = (
             f'{env.repodir}/sims/external/ns-3'
-            f'/cosim-run.sh cosim cosim-dumbbell-example {ports} {self.opt}'
+            f'/simbricks-run.sh simbricks-dumbbell-example {ports} {self.opt}'
         )
         print(cmd)
 
@@ -910,11 +910,11 @@ class NS3BridgeNet(NetSim):
     def run_cmd(self, env: ExpEnv) -> str:
         ports = ''
         for (_, n) in self.connect_sockets(env):
-            ports += '--CosimPort=' + n + ' '
+            ports += '--SimbricksPort=' + n + ' '
 
         cmd = (
             f'{env.repodir}/sims/external/ns-3'
-            f'/cosim-run.sh cosim cosim-bridge-example {ports} {self.opt}'
+            f'/simbricks-run.sh simbricks-bridge-example {ports} {self.opt}'
         )
         print(cmd)
 
@@ -936,7 +936,7 @@ class NS3SequencerNet(NetSim):
                 raise KeyError('Wrong NIC type')
         cmd = (
             f'{env.repodir}/sims/external/ns-3'
-            f'/cosim-run.sh sequencer sequencer-single-switch-example'
+            f'/simbricks-run.sh sequencer-single-switch-example'
             f' {ports} {self.opt}'
         )
         return cmd

ns-3 @ 29e4f095

-Subproject commit 853cafc9c883fd64e7890b0710441c6bd3a25196
+Subproject commit 29e4f0953b546e413cc6858e60a2e4e9d38dca00

sims/external/rules.mk

@@ -78,11 +78,11 @@ $(d)ns-3:
 	git clone https://github.com/simbricks/ns-3.git $@
 
 $(d)ns-3/ready: $(d)ns-3 $(lib_netif)
-	+cd $< && COSIM_PATH=$(abspath $(base_dir)) ./cosim-build.sh configure
+	+cd $< && SIMBRICKS_PATH=$(abspath $(base_dir)) ./simbricks-build.sh configure
 	touch $@
 
 ns-3-clean:
-	-cd $(EXTERNAL_SIMS_DIR)ns-3 && ./waf clean
+	-cd $(EXTERNAL_SIMS_DIR)ns-3 && ./ns3 clean
 	rm -f $(EXTERNAL_SIMS_DIR)ns-3/ready
 
 $(d)femu: