Added StopCommand in the scenario description

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/ConfigFiles/scenario01.txt b/ConfigFiles/scenario01.txt
index ac25f83..c50c13e 100644 (file)
--- a/ConfigFiles/scenario01.txt
+++ b/ConfigFiles/scenario01.txt
@@ -5,11 +5,11 @@
 #   * 6 leechers
 #   * all peers have the same bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             2               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             2               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario02.txt b/ConfigFiles/scenario02.txt
index 4629b04..b080dfe 100644 (file)
--- a/ConfigFiles/scenario02.txt
+++ b/ConfigFiles/scenario02.txt
@@ -7,13 +7,13 @@
 #   * 2 proxies
 #   * all peers have the same bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario03.txt b/ConfigFiles/scenario03.txt
index 52d35c8..4555a55 100644 (file)
--- a/ConfigFiles/scenario03.txt
+++ b/ConfigFiles/scenario03.txt
@@ -5,11 +5,11 @@
 #   * 6 seeders
 #   * all peers have the same bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario04.txt b/ConfigFiles/scenario04.txt
index 1ac6b62..d1fe57a 100644 (file)
--- a/ConfigFiles/scenario04.txt
+++ b/ConfigFiles/scenario04.txt
@@ -6,13 +6,13 @@
 #   * 2 proxies
 #   * all peers have the same bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario05.txt b/ConfigFiles/scenario05.txt
index fbea608..08e0981 100644 (file)
--- a/ConfigFiles/scenario05.txt
+++ b/ConfigFiles/scenario05.txt
@@ -7,13 +7,13 @@
 #   * 2 proxies
 #   * The doe has a 32Mbps bandwidth, all the other peers have an 8Mbps bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario06.txt b/ConfigFiles/scenario06.txt
index 40698f6..fab277e 100644 (file)
--- a/ConfigFiles/scenario06.txt
+++ b/ConfigFiles/scenario06.txt
@@ -6,13 +6,13 @@
 #   * 2 proxies
 #   * The doe has a 32Mbps bandwidth, all the other peers have an 8Mbps bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario07.txt b/ConfigFiles/scenario07.txt
index a0a3894..f03f7d9 100644 (file)
--- a/ConfigFiles/scenario07.txt
+++ b/ConfigFiles/scenario07.txt
@@ -6,13 +6,13 @@
 #   * 2 proxies
 #   * The proxies have a 32Mbps bandwidth, all the other peers have an 8Mbps bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario08.txt b/ConfigFiles/scenario08.txt
index 42048b5..b1916a7 100644 (file)
--- a/ConfigFiles/scenario08.txt
+++ b/ConfigFiles/scenario08.txt
@@ -7,13 +7,13 @@
 #   * 2 proxies
 #   * The doe has a 32Mbps bandwidth, all the other peers have an 8Mbps bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      parse_leecher.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            32              400                     32              400             0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_leecher.sh Data.700M.swarm.torrent        detect_complete_leecher.sh      stop_tribler.sh         parse_leecher.sh
\ No newline at end of file

diff --git a/ConfigFiles/scenario09.txt b/ConfigFiles/scenario09.txt
index bf3aad3..6158d42 100644 (file)
--- a/ConfigFiles/scenario09.txt
+++ b/ConfigFiles/scenario09.txt
@@ -6,13 +6,13 @@
 #   * 2 proxies
 #   * The proxies have a 32Mbps bandwidth, all the other peers have an 8Mbps bandwidth
 #
-# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    LogParser
-p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          parse_doe.sh
-p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_proxy.sh 01                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_proxy.sh 02                               detect_complete_proxy.sh        parse_proxy.sh
-p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       parse_seeder.sh
\ No newline at end of file
+# Hostname                     SSHport User    RemoteFolder                    NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)  StartDelay(s)   StartCommand                                    StopDetector                    StopCommand             LogParser
+p2p-next-01.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           1               start_doe.sh Data.700M.swarm.torrent            detect_complete_doe.sh          stop_tribler.sh         parse_doe.sh
+p2p-next-03.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_proxy.sh 01                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-04.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_proxy.sh 02                               detect_complete_proxy.sh        stop_tribler.sh         parse_proxy.sh
+p2p-next-05.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
+p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            1000            12500                   1000            12500           0               start_seeder.sh Data.700M.swarm.torrent         detect_complete_seeder.sh       stop_tribler.sh         parse_seeder.sh
\ No newline at end of file

diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index 507135a..335935f 100755 (executable)
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -88,7 +88,7 @@ cat $CONFIG_FILES_REL_PATH/$SCENARIO_FILE | grep -v ^# | grep -v ^$ | tr -s '\t'
 # Setup the nodes
 scenario_setup() {
        echo "---------------------- scenario_setup_" >> $ERR_LOG
-       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD LOG_PARSER; do
+       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD STOP_CMD LOG_PARSER; do
                echo " ** Setting-up $SERVER"
                
                # Clean-up the host by using rsync
@@ -114,7 +114,7 @@ scenario_setup() {
 # The setup stage is separated to decrease the time required to start the clients
 scenario_start() {
        echo "---------------------- scenario_start_" >> $ERR_LOG
-       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD LOG_PARSER; do
+       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD STOP_CMD LOG_PARSER; do
                echo " ** Starting client on $SERVER"
                
                # Start the scripts on the remote clients
@@ -133,7 +133,7 @@ scenario_start() {
 # Wait until all the clients are finished
 scenario_wait() {
        echo "---------------------- scenario_wait_" >> $ERR_LOG
-       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD LOG_PARSER; do
+       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD STOP_CMD LOG_PARSER; do
                echo " ** Waiting for client on $SERVER to finish"
                
                # Start the scripts on the remote clients
@@ -153,12 +153,12 @@ scenario_wait() {
 # Clean the nodes and retrieve the log files
 scenario_clean() {
        echo "---------------------- scenario_clean_" >> $ERR_LOG
-       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD LOG_PARSER; do
+       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD STOP_CMD LOG_PARSER; do
                echo " ** Cleaning-up $SERVER"
                
                # stopping the client on the server
                # -n is used to redirect the ssh stdin from /dev/null, in order to keep the stdin in place for the read command
-               if ! ssh -n -p $PORT ${USER}@${SERVER} "killall python2.6" &>> $ERR_LOG; then
+               if ! ssh -n -p $PORT ${USER}@${SERVER} "cd $REMOTE_PATH/P2P-Testing-Infrastructure/ControlScripts; ./$STOP_CMD" &>> $ERR_LOG; then
                        echo "Error: error stopping client on $SERVER"
                fi
                # wait for the remote client to finish completly
@@ -187,7 +187,7 @@ scenario_clean() {
 # Parse the log files
 scenario_parse() {
        echo "---------------------- scenario_parse_" >> $ERR_LOG
-       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD LOG_PARSER; do
+       while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST START_DELAY START_CMD DETECT_STOP_CMD STOP_CMD LOG_PARSER; do
                echo " ** Parsing log files from $SERVER"
                
                if ! ./$LOG_PARSER $SCENARIO_RESULTS_FOLDER ${SERVER}.log; then

diff --git a/ControlScripts/start_hrk_regular.sh b/ControlScripts/start_hrk_leecher.sh
similarity index 100%
rename from ControlScripts/start_hrk_regular.sh
rename to ControlScripts/start_hrk_leecher.sh

diff --git a/ControlScripts/stop_hrk.sh b/ControlScripts/stop_hrk.sh
index 923fa8c..c63a631 100755 (executable)
--- a/ControlScripts/stop_hrk.sh
+++ b/ControlScripts/stop_hrk.sh
@@ -2,13 +2,13 @@
 #
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
-# Bash script used to start a hrktorrent instance
+# Bash script used to stop all hrktorrent instances
 # The script
-#  * stops all the krk instances
+#  * stops all the hrktorrent instances
 
 if [ ! $# -eq 0 ]; then
        echo "usage: $0"
        exit 1
 fi
 
-pkill hrk
+pkill hrktorrent

diff --git a/ControlScripts/stop_tribler.sh b/ControlScripts/stop_tribler.sh
new file mode 100755 (executable)
index 0000000..65229ec
--- /dev/null
+++ b/ControlScripts/stop_tribler.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Copyright: George Milescu 2010 - george.milescu@gmail.com
+#
+# Bash script used to stop all tribler instances
+# The script
+#  * stops all the tribler instances
+
+if [ ! $# -eq 0 ]; then
+       echo "usage: $0"
+       exit 1
+fi
+
+pkill python2.6