# HG changeset patch
# User suruga
# Date 1518674808 -32400
# Node ID afbd290bb017786e4aa49bbe9f9a904c32d51319
# Parent  8a33595a0d8cdf27ce83bcf6b64842e57f5f989e
scripts fix

diff -r 8a33595a0d8c -r afbd290bb017 scripts/LogupdateTest-qsub.sh
--- a/scripts/LogupdateTest-qsub.sh	Wed Feb 07 19:31:33 2018 +0900
+++ b/scripts/LogupdateTest-qsub.sh	Thu Feb 15 15:06:48 2018 +0900
@@ -1,7 +1,8 @@
 #!/bin/sh
 #PBS -q jungle
 #PBS -N LogUpdateTest
-#PBS -l nodes=3,walltime=00:04:00
+#PBS -l nodes=4,walltime=00:04:00
 
-/usr/bin/perl /mnt/data/jungle_workspace/LogupdateTest.pl
+cd /mnt/data/jungle_workspace/Log
+/usr/bin/perl /mnt/data/jungle_workspace/scripts/LogupdateTest.pl
 
diff -r 8a33595a0d8c -r afbd290bb017 scripts/LogupdateTest.pl
--- a/scripts/LogupdateTest.pl	Wed Feb 07 19:31:33 2018 +0900
+++ b/scripts/LogupdateTest.pl	Thu Feb 15 15:06:48 2018 +0900
@@ -1,6 +1,6 @@
 #!usr/bin/perl
 
-my $debug = 0;
+my $debug = 1;
 
 sub mysystem {
   my ($cmd) = @_;
@@ -11,6 +11,7 @@
   }
 }
 
+system("hostname") if ($debug);
 my $nodes = $ENV{'PBS_NODEFILE'};
 my $jungleDir = "/mnt/data/jungle_workspace";
 my $logFile  = "$jungleDir/Log/Log";
@@ -23,14 +24,19 @@
   unshift(@nodes,$_); 
 } 
 
-mysystem("ssh $nodes[0] \"cd $jungleDir;java -cp build/libs/Alice.jar alice.topology.manager.TopologyManager -host $nodes[0] -p 10000 -port 10001 --noKeepAlive > $logFile$logNum\" &");
+chdir $jungleDir;
+
+my $nodeNum = $#nodes;
+mysystem("cd $jungleDir; ruby scripts/tree.rb $nodeNum > scripts/tree.dot");
+mkdir "$logfile/$logNum";
+mysystem("ssh $nodes[0] \"cd $jungleDir/$logNum;java -cp ../../build/libs/Alice.jar alice.topology.manager.TopologyManager -conf ../../scripts/tree.dot -p 10000 --noKeepAlive > $logFile$logNum\" &");
 $logNum++;
 sleep 10;
 for my $i (1..($#nodes-1)) {
-  mysystem("ssh $nodes[$i] \"cd $jungleDir;java -jar build/libs/logupdateTest-1.1.jar -host $nodes[0] -p 10003 -port 10000  --noKeepAlive > $logFile$logNum\" & ");
+  mysystem("ssh $nodes[$i] \"cd $jungleDir/$logNum;java -Dlogfile.name=${Logfile}java$lognum -jar ../../build/libs/logupdateTest-1.1.jar -host $nodes[0] -p 10003 -port 10000  --noKeepAlive > $logFile$logNum\" & ");
   $logNum++;
 }
 
 sleep 10;
-mysystem("ssh $nodes[$#nodes] \"cd $jungleDir;java -jar build/libs/logupdateTest-1.1.jar -host $nodes[0] -p 10003 -port 10000  -write --noKeepAlive > $logFile$logNum\" &" );
-sleep 10;
+mysystem("ssh $nodes[$#nodes] \"cd $jungleDir/$logNum;java -Dlogfile.name=${Logfile}java$lognum -jar build/libs/logupdateTest-1.1.jar -host $nodes[0] -p 10003 -port 10000  -write --noKeepAlive > $logFile$logNum\" &" );
+sleep 30;
diff -r 8a33595a0d8c -r afbd290bb017 scripts/LogupdateTest.sh
--- a/scripts/LogupdateTest.sh	Wed Feb 07 19:31:33 2018 +0900
+++ b/scripts/LogupdateTest.sh	Thu Feb 15 15:06:48 2018 +0900
@@ -1,6 +1,6 @@
 export JAR=build/libs/logupdateTest-1.1.jar
 ruby scripts/tree.rb 3 > scripts/tree.dot
-java -cp $JAR  alice.topology.manager.TopologyManager -conf scripts/tree.dot -host localhost -p 10000 -port 10001 --noKeepAlive &
+java -cp $JAR  alice.topology.manager.TopologyManager -conf scripts/tree.dot -host localhost -p 10000 --noKeepAlive &
 sleep 3 
 java -jar $JAR  -host localhost -p 10003 -port 10000  --noKeepAlive &
 java -jar $JAR  -host localhost -p 10001 -port 10000  --noKeepAlive &
diff -r 8a33595a0d8c -r afbd290bb017 scripts/kill-java-qsub.sh
--- a/scripts/kill-java-qsub.sh	Wed Feb 07 19:31:33 2018 +0900
+++ b/scripts/kill-java-qsub.sh	Thu Feb 15 15:06:48 2018 +0900
@@ -2,6 +2,9 @@
 #PBS -q jungle
 #PBS -N KillJava
 #PBS -l nodes=16,walltime=00:00:30
+
+cd /mnt/data/jungle_workspace/Log
+
 for serv in `cat $PBS_NODEFILE`
 do
   ssh $serv 'hostname;sh /mnt/data/jungle_workspace/scripts/killLogupdate.sh' & 
diff -r 8a33595a0d8c -r afbd290bb017 scripts/tree.dot
--- a/scripts/tree.dot	Wed Feb 07 19:31:33 2018 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-digraph test{
-    graph [
-        layout = dot
-    ];
-
-    node0 -> node1 [label="child0"]
-    node0 -> node2 [label="child1"]
-    node1 -> node0 [label="parent"]
-    node2 -> node0 [label="parent"]
-    
-    node1 -> node3 [label="child0"]
-    node1 -> node4 [label="child1"]
-    node3 -> node1 [label="parent"]
-    node4 -> node1 [label="parent"]
-    
-    node2 -> node5 [label="child0"]
-    node2 -> node6 [label="child1"]
-    node5 -> node2 [label="parent"]
-    node6 -> node2 [label="parent"]
-
-    node3 -> node7 [label="child0"]
-    node3 -> node8 [label="child1"]
-    node7 -> node3 [label="parent"]
-    node8 -> node3 [label="parent"]
-
-    node4 -> node9 [label="child0"]
-    node4 -> node10 [label="child1"]
-    node9 -> node4 [label="parent"]
-    node10 -> node4 [label="parent"]
-
-    node5 -> node11 [label="child0"]
-    node5 -> node12 [label="child1"]
-    node11 -> node5 [label="parent"]
-    node12 -> node5 [label="parent"]
-
-    node6 -> node13 [label="child0"]
-    node6 -> node14 [label="child1"]
-    node13 -> node6 [label="parent"]
-    node14 -> node6 [label="parent"]
-
-    node7 -> node15 [label="child0"]
-    node15 -> node7 [label="parent"]
-
-}