Changeset 1085

Timestamp:

07/05/08 18:00:18 (5 years ago)

Author:

max

Message:

shepherd: Discriminate based on time period (peak/nonpeak/other) when determining whether a gap is "critical," i.e. worth logging to stats for grabbers known to have noncritical gaps

Location:

trunk

Files:

• applications/shepherd (modified) (3 diffs)
• status (modified) (1 diff)

trunk/applications/shepherd

@@ -2 +2 @@
 
 our $progname = 'shepherd';
-my $version = '1.3.15';
+my $version = '1.3.16';
 
 # tv_grab_au
@@ -4226 +4226 @@
 }
 
+# Don't bother reporting small gaps when we already know that this
+# grabber tends to have them.
+#
 # It's actually difficult to say exactly which gaps are critical
 # (or policy-violating), because our analysis operates on a 
@@ -4231 +4234 @@
 # in prime time is a policy violation, even though each individual
 # gap isn't. So our solution is not perfect: we are simply 
-# stripping SMALL gaps (less than 15 minutes), regardless of how
-# many there are.
+# disregarding SMALL gaps, regardless of how many there are.
+#
+# A gap is considered non-critical if it's:
+# (a) in peak time and less than 15 minutes long; or
+# (b) in nonpeak time and less than 30 minutes long; or
+# (c) in other time and less than 25 minutes long
 sub is_noncritical_gap
 {
     my $gap = shift;
 
-    return 1 if ($gap =~ /(\d+)-(\d+)/ and $2 - $1 < $policy{peak_max_missing});
-    return 0;
+    return 0 unless ($gap =~ /(\d+)-(\d+)/);
+    my $zero_hr = $policy{starttime} - $policy{first_bucket_offset};
+
+    my $gap_start = (($1 - $zero_hr) % 86400);
+    my $gap_stop = (($2 - $zero_hr) % 86400);
+    my $diff = $gap_stop - $gap_start;
+
+    if ($gap_start <= $policy{peak_stop} and $gap_stop >= $policy{peak_start})
+    {
+        # PEAK
+        return ($diff < 15*60);
+    }
+    elsif ($gap_start <= $policy{nonpeak_stop} and $gap_stop >= $policy{nonpeak_start})
+    {
+        # NONPEAK
+        return ($diff < 30*60);
+    }
+    else
+    {
+        # OTHER
+        return ($diff < 25*60);
+    }
 }
 

trunk/status

@@ -1 @@
-application     shepherd            1.3.15
+application     shepherd            1.3.16
 reference       channel_list        22
 reference       Shepherd/Common.pm  0.36