Changeset 34931

Timestamp:

Jan 15, 2013, 2:34:34 PM (13 years ago)

Author:

Serge CHASTEL

Message:

Plotting theoretical available space in czartool now

Location:

trunk/ippMonitor/czartool/czartool

Files:

• CzarDb.pm (modified) (5 diffs)
• Plotter.pm (modified) (1 diff)

trunk/ippMonitor/czartool/czartool/CzarDb.pm

@@ -988 +988 @@
 sub createStorageTimeSeriesData {
     my ($self, $tmpFile, $fromTime, $toTime, $minX, $maxX, $minY, $maxY, $timeDiff) = @_;
+    my $maxAvailable;
+    my $maxUsable;
+    my $minAvailable;
+    my $minUsable;
 
     open (GNUDAT, ">".$tmpFile->filename);
@@ -993 +997 @@
     my $query = $self->{_db}->prepare(<<SQL);
     SELECT
-        MAX(available), MIN(available),
+        MAX(available), MIN(available), MAX(usable), MIN(usable),
         DATE_FORMAT(MAX(timestamp),'$self->{_dateFormat}'),
         DATE_FORMAT(MIN(timestamp),'$self->{_dateFormat}'),
@@ -1003 +1007 @@
     if (!$query->execute) {return undef;}
 
-    (${$maxY}, ${$minY}, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
-
+    ($maxAvailable, $minAvailable, $maxUsable, $minUsable, ${$maxX}, ${$minX}, ${$timeDiff}) = $query->fetchrow_array();
+    ${$maxY} = ($maxAvailable > $maxUsable ? $maxAvailable : $maxUsable);
+    ${$minY} = ($minAvailable > $minUsable ? $minAvailable : $minUsable);
 
     if (!${$maxY} || !${$minY} || !${$maxX} || !${$minX} || !${$timeDiff}) {return 0;}
@@ -1010 +1015 @@
     $query = $self->{_db}->prepare(<<SQL);
     SELECT
-        DATE_FORMAT(timestamp, '$self->{_dateFormat}'), available
+        DATE_FORMAT(timestamp, '$self->{_dateFormat}'), available, usable
         FROM cluster_space
         WHERE timestamp >= '$fromTime' AND timestamp <= '$toTime'
@@ -1021 +1026 @@
     while (my @row = $query->fetchrow_array()) {
 
-        my ($timestamp, $available) = @row;
-        print GNUDAT "$timestamp $available\n";
+        my ($timestamp, $available, $usable) = @row;
+        print GNUDAT "$timestamp $available $usable\n";
     }
 

trunk/ippMonitor/czartool/czartool/Plotter.pm

@@ -630 +630 @@
         set xlabel "Time"
         set ylabel "Available (TB)"
-        plot "$datFile" using 1:2 title "Available" with lines lt 2 lw 2
+        plot "$datFile" using 1:2 title "Available" with lines lt 2 lw 2, "$datFile" using 1:3 title "Theoretical" with lines lt 3 lw 2
 PLOT