Changeset 29107

Timestamp:

Sep 1, 2010, 4:57:14 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Bug fixes. Need some feedback now

Location:

trunk/tools/who_uses_the_cluster

Files:

• _who_uses_the_cluster.sh (modified) (1 diff)
• _who_uses_the_cluster_analyze.pl (modified) (4 diffs)

trunk/tools/who_uses_the_cluster/_who_uses_the_cluster.sh

@@ -46 +46 @@
     echo "########### $computer ###########" >> $LOGFILE
 #    /usr/bin/ssh $computer 'setenv TERM xterm; top -d 3 -b -n 5 -i -c' >> $LOGFILE 2> /dev/null &
-    /usr/bin/ssh $computer 'setenv COLUMNS 300; top -d 3 -b -n 5 -i -c' >> $LOGFILE 2> /dev/null &
+    /usr/bin/ssh $computer 'setenv TERM xterm; setenv COLUMNS 1000; top -d 3 -b -n 5 -c -i' >> $LOGFILE 2> /dev/null &
 done
 

trunk/tools/who_uses_the_cluster/_who_uses_the_cluster_analyze.pl

@@ -39 +39 @@
                 # We don't want the 'top' process to be shown
                 $line  =~ s/\s+/;/g;
-                print "$line\n";
                 $line =~ s/^;//g;
+                # print "$line\n";
                 @values = split ';', $line;
                 $pid = $values[0];
+                #print $pid, "\n";
                 $username = $values[1];
                 $proc =$values[8];
                 $mem =$values[9];
                 $size = scalar(@values);
-                $procname = join(" ", @values[11..$size]); #$values[11..-1];
-                #print "$size PROCNAME = [$procname]\n";
+                #$procname = $values[11];
+                $fullprocname = "";
+                #print "$procname \n";
+                for ($i=11;$i<$size;$i++) {
+                        $fullprocname = $fullprocname.$values[$i]." ";
+                }
                 if (!defined $summary{$pid}) {
                     # The pid is a new one
@@ -55 +60 @@
                     $summary{$pid}{"proc"} = $proc;
                     $summary{$pid}{"memory"} = $mem;
-                    $summary{$pid}{"procname"} = $procname;
+                    $summary{$pid}{"procname"} = $fullprocname;
                 } else {
-                    # The pid is a new onehas already been observed
-                    if ($summary{$pid}{"procname"} eq $procname) {
+                    # The pid has already been observed
+                    # print "The pid has already been observed\n";
+                    #if ($summary{$pid}{"procname"} eq $procname) {
                         $before = $summary{$pid}{"count"};
                         $summary{$pid}{"count"}++;
@@ -67 +73 @@
                         $summary{$pid}{"memory"} = $ratio *
                             $summary{$pid}{"memory"} + $proc / $after;
-                    }
+                    #}
                 }
             }
@@ -79 +85 @@
         $onceShown = 0;
         while ( my ($pid, $value) = each(%summary) ) {
+                # print $value->{"count"} , " ", $pid, "\n";
             if ($value->{"count"} > 1) {
+                #print "Ok\n";
                 $onceShown = 1;
                 printf("<tr>\n");