From 8f269306445c7916de2978f0950e57e4a9f4fbd8 Mon Sep 17 00:00:00 2001
From: Ian Chen <ichen@osrfoundation.org>
Date: Thu, 2 Apr 2020 15:50:56 -0700
Subject: [PATCH 1/2] add atop process monitoring

---
 docker/cloudsim_bridge/Dockerfile      | 1 +
 docker/cloudsim_bridge/run_bridge.bash | 3 +++
 docker/cloudsim_sim/Dockerfile         | 1 +
 docker/cloudsim_sim/run_sim.bash       | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/docker/cloudsim_bridge/Dockerfile b/docker/cloudsim_bridge/Dockerfile
index 444fac75..2735b54b 100644
--- a/docker/cloudsim_bridge/Dockerfile
+++ b/docker/cloudsim_bridge/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update -qq \
  && apt-get install --no-install-recommends -y -qq \
         build-essential \
         bwm-ng \
+        atop \
         cmake \
         cppcheck \
         gdb \
diff --git a/docker/cloudsim_bridge/run_bridge.bash b/docker/cloudsim_bridge/run_bridge.bash
index 5f2cced5..7f389120 100755
--- a/docker/cloudsim_bridge/run_bridge.bash
+++ b/docker/cloudsim_bridge/run_bridge.bash
@@ -18,4 +18,7 @@ echo "log4j.logger.ros.roscpp=DEBUG" >> /home/developer/.ros/config/rosconsole.c
 # See also https://bitbucket.org/osrf/subt/issues/204
 export ROSCONSOLE_STDOUT_LINE_BUFFERED=1
 
+# atop process monitoring
+atop -R -w /home/developer/.ros/atop_log &
+
 ign launch cloudsim_bridge.ign -v 4 $@
diff --git a/docker/cloudsim_sim/Dockerfile b/docker/cloudsim_sim/Dockerfile
index 855e8d60..deb1cefa 100644
--- a/docker/cloudsim_sim/Dockerfile
+++ b/docker/cloudsim_sim/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update -qq \
  && apt-get install --no-install-recommends -y -qq \
         build-essential \
         bwm-ng \
+        atop \
         cmake \
         cppcheck \
         gdb \
diff --git a/docker/cloudsim_sim/run_sim.bash b/docker/cloudsim_sim/run_sim.bash
index 858d661f..c8493846 100755
--- a/docker/cloudsim_sim/run_sim.bash
+++ b/docker/cloudsim_sim/run_sim.bash
@@ -10,4 +10,7 @@ FILE=/tmp/ign/logs/network_traffic.csv
 echo "unix timestamp;iface_name;bytes_out/s;bytes_in/s;bytes_total/s;bytes_in;bytes_out;packets_out/s;packets_in/s;packets_total/s;packets_in;packets_out;errors_out/s;errors_in/s;errors_in;errors_out" > $FILE
 bwm-ng -o csv -c 0 -t 1000 -T rate -I eth0 >> $FILE &
 
+# atop process monitoring
+atop -R -w /tmp/ign/logs/atop_log &
+
 ign launch -v 4 $@

From 123bd7b34d6de468b043b2b99ffec0e8c15f2710 Mon Sep 17 00:00:00 2001
From: Nate Koenig <natekoenig@gmail.com>
Date: Mon, 6 Apr 2020 13:30:51 +0000
Subject: [PATCH 2/2] Close branch atop