Changed Regular to Leecher in script names.

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

diff --git a/ConfigFiles/scenario01.txt b/ConfigFiles/scenario01.txt
index 917671b..ac25f83 100644 (file)
--- a/ConfigFiles/scenario01.txt
+++ b/ConfigFiles/scenario01.txt
@@ -7,9 +7,9 @@
 #
 # 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_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
\ No newline at end of file
+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

diff --git a/ConfigFiles/scenario02.txt b/ConfigFiles/scenario02.txt
index e5d0207..4629b04 100644 (file)
--- a/ConfigFiles/scenario02.txt
+++ b/ConfigFiles/scenario02.txt
@@ -9,11 +9,11 @@
 #
 # 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-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_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
\ No newline at end of file
+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

diff --git a/ConfigFiles/scenario03.txt b/ConfigFiles/scenario03.txt
index 85e6869..52d35c8 100644 (file)
--- a/ConfigFiles/scenario03.txt
+++ b/ConfigFiles/scenario03.txt
@@ -6,7 +6,7 @@
 #   * 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_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
+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

diff --git a/ConfigFiles/scenario04.txt b/ConfigFiles/scenario04.txt
index 809468a..1ac6b62 100644 (file)
--- a/ConfigFiles/scenario04.txt
+++ b/ConfigFiles/scenario04.txt
@@ -8,8 +8,8 @@
 #
 # 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-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

diff --git a/ConfigFiles/scenario05.txt b/ConfigFiles/scenario05.txt
index ad7198e..fbea608 100644 (file)
--- a/ConfigFiles/scenario05.txt
+++ b/ConfigFiles/scenario05.txt
@@ -9,11 +9,11 @@
 #
 # 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_regular.sh      parse_regular.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
\ No newline at end of file
+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

diff --git a/ConfigFiles/scenario06.txt b/ConfigFiles/scenario06.txt
index aecfcf6..40698f6 100644 (file)
--- a/ConfigFiles/scenario06.txt
+++ b/ConfigFiles/scenario06.txt
@@ -8,8 +8,8 @@
 #
 # 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-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

diff --git a/ConfigFiles/scenario07.txt b/ConfigFiles/scenario07.txt
index 553cbfc..a0a3894 100644 (file)
--- a/ConfigFiles/scenario07.txt
+++ b/ConfigFiles/scenario07.txt
@@ -8,8 +8,8 @@
 #
 # 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-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

diff --git a/ConfigFiles/scenario08.txt b/ConfigFiles/scenario08.txt
index 34defff..42048b5 100644 (file)
--- a/ConfigFiles/scenario08.txt
+++ b/ConfigFiles/scenario08.txt
@@ -9,11 +9,11 @@
 #
 # 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_regular.sh      parse_regular.sh
-p2p-next-06.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-07.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-08.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-09.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
-p2p-next-10.grid.pub.ro                22      p2p     /home/p2p/george/P2P-Next       eth0            8               100                     8               100             0               start_regular.sh Data.700M.swarm.torrent        detect_complete_regular.sh      parse_regular.sh
\ No newline at end of file
+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

diff --git a/ConfigFiles/scenario09.txt b/ConfigFiles/scenario09.txt
index 867ed7e..bf3aad3 100644 (file)
--- a/ConfigFiles/scenario09.txt
+++ b/ConfigFiles/scenario09.txt
@@ -8,8 +8,8 @@
 #
 # 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-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

diff --git a/ControlScripts/_sync_cluster_containers.sh b/ControlScripts/_sync_cluster_containers.sh
index b5e008a..b89e552 100755 (executable)
--- a/ControlScripts/_sync_cluster_containers.sh
+++ b/ControlScripts/_sync_cluster_containers.sh
@@ -9,6 +9,6 @@ source ../ConfigFiles/globalconfig.txt
 for host in p2p-next-01.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do
        for port in 10122 10222 10322 10422 10522 10622 10722 10822 10922 11022; do
                echo "Syncing $host $port"
-               rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure p2p@$host:/home/p2p/george/ &> /dev/null
+               rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure p2p@$host:/home/p2p/george/ > /dev/null
        done
 done

diff --git a/ControlScripts/detect_complete_regular.sh b/ControlScripts/detect_complete_leecher.sh
similarity index 86%
rename from ControlScripts/detect_complete_regular.sh
rename to ControlScripts/detect_complete_leecher.sh
index 8554bf5..e828197 100755 (executable)
--- a/ControlScripts/detect_complete_regular.sh
+++ b/ControlScripts/detect_complete_leecher.sh
@@ -2,7 +2,7 @@
 #
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
-# Bash script used to detect when a regular client finished downloading a torrent
+# Bash script used to detect when a regular client (a leecher) finished downloading a torrent
 # The script
 #  * monitors a log file provided as an argument
 #  * as long as the doe is not finished the script keeps running

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

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

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