[ViewVC] Diff of: cvs/aor/aorscan

Comparing aor/aorscan (file contents):
Revision 1.3 by root, Sat Oct 1 11:29:14 2005 UTC vs.
Revision 1.4 by root, Sun Oct 2 09:36:37 2005 UTC

 acmd $record_init;
 acmd $record_set, $record_vol;
 acmd $playback_off;
 my @send_jobs;
+my $send_requeue;
 my ($curfreq, $curmode);
 my $pipeline = 4;
 my $rbuf;
 my @resp_jobs;
 sub send_scheduler {
    while (@send_jobs
           && @resp_jobs < $pipeline
           && (!@resp_jobs || !$resp_jobs[-1]{exclusive})
    ) {
+      if ($send_requeue) {
+         # re-sort queue
+         $send_requeue = 0;
+         @send_jobs = sort {
+            $b->{nice} <=> $a->{nice}
+            || $b->{mode} <=> $a->{mode}
+            || $b->{freq} <=> $a->{freq};
+         } @send_jobs;
+      }
-      my $job = (pop_heap @send_jobs)->[1];
+      my $job = pop @send_jobs;
       my ($cmd, @exp);
       if ($curmode != $job->{mode}) {
          $cmd .= "MD$job->{mode}\015\012";
       if ($curfreq != $job->{freq}) {
          $cmd .= "RF$job->{freq}\015\012";
          $curfreq = $job->{freq};
       }
+      printf "\rMD%d RF%9d %4d %4d         ", $curmode, $curfreq, $job->{nice}, scalar @send_jobs;
       $job->{exp} = [];
       $job->{res} = [];
       for (@{ $job->{cmd} }) {
    my $job = bless {
       freq => round $freq,
       mode => $mode,
       cmd  => \@cmd,
       done => new Coro::Signal,
+      nice => $nice,
    }, job::;
    if (@cmd && ref $cmd[-1]) {
       $job->{exclusive} = pop @cmd;
    }
-   push_heap @send_jobs, [$nice, $job];
+   push @send_jobs, $job;
+   $send_requeue = 1;
    send_scheduler;
    $job
 }
    my ($nice, $mode, $center, $radius) = @_;
    $radius = List::Util::max RESOLUTION, $radius * 0.1;
    my @level = map [$_->{freq}, (List::Util::sum lm $_->result) / 5],
-                  map +(job $nice, $mode, $center + $radius * $_, (delay 0.0020, "LM=LM") x 5),
+                  map +(job $nice, $mode, $center + $radius * $_, (delay 0.020, "LM=LM") x 5),
                      -10 .. 10;
    my ($tune, $weight);
    for (@level) {
       my ($f, $w) = @$_;
       $tune   += $f * $w;
       $weight += $w;
    }
+   my $lm = ($weight / @level) ** (1/8);
-   (int ($tune / $weight / RESOLUTION) * RESOLUTION, $weight ** 0.1 * 100)
+   (int ($tune / $weight / RESOLUTION) * RESOLUTION, $lm * 100)
 }
 sub sweep {
    my ($nice, $freqs, $cb) = @_;
-   my $job;
+   my @jobs = map {
+      job $nice, $_->[0], $_->[1], "LM=LM";
+   } @$freqs;
-   for (@$freqs, undef) {
+   $cb->($freqs->[$_], lm $jobs[$_]->result)
-      my ($mode, $freq, $width) = $_ ? @$_ : ();
+      for 0 .. $#jobs;
-      my $next_job = $freq && job $nice, $mode, $freq, delay 0.050, "LM=LM";
-      $cb->($mode, $freq, $width, lm $job->result)
-         if $job;
-      $job = $next_job;
-   }
 }
 #############################################################################
-# raw aearch
+# raw search
 async {
    my $nice = 1000;
    while () {
                                limit 1000",
                               $NOW - SEARCH_INTERVAL_MIN;
       if (@freq) {
          sweep $nice, \@freq, sub {
-            my ($mode, $freq, $width, $lm) = @_;
+            my ($info, $lm) = @_;
             sql_exec "update freq set search_time = ?, search_level = ?
                       where mode = ? and freq = ?",
                      $NOW, $lm,
-                     $mode, $freq;
+                     $info->[0], $info->[1];
          };
       } else {
          Coro::Timer::sleep 60;
       }
    }
 async {
    my $nice = 500;
    while () {
-      my $st = sql_exec \my ($aft_time, $mode, $freq, $width, $activity_level),
+      my @info = sql_fetchall
-                        "select aft_time, mode, freq, width, activity_level
+                        "select mode, freq, width, activity_level
                          from freq
                          where (search_level >= activity_level
                                 or aft_time > 0)
                            and aft_time < ?
-                         order by aft_time, mode, freq
+                         order by mode, freq
-                         limit 10",
+                         limit 100",
                         $NOW;
-      if ($st->rows) {
+      if (@info) {
-         while ($st->fetch) {
+         sweep $nice, \@info, sub {
-            my @lm = lm +(job $nice, $mode, $freq, delay 0.050, "LM=LM")->result;
+            my ($info, $lm) = @_;
+            my ($mode, $freq, $width, $activity_level) = @$info;
-            if ($lm[0] >= $activity_level) {
+            if ($lm >= $activity_level) {
                my ($tune, $weight) = aft $nice, $mode, $freq, $width * 0.9;
+               print "$mode $tune($freq) $lm>=$activity_level ";
                if ($freq - 0.5 * $width <= $tune && $tune <= $freq + 0.5 * $width) {
+                  print "tuned\n";
                   sql_exec "update freq set aft_time = ?, aft_freq = ?, aft_level = ?
                             where mode = ? and freq = ?",
-                           $NOW + 86400 - 3600, $tune, $weight,
+                           $NOW + 86400*5 - (rand 86400), $tune, $weight,
                            $mode, $freq;
                } else {
                   # outlier
+                  print "outlier\n";
                   sql_exec "update freq set aft_time = ?, aft_level = 0
                             where mode = ? and freq = ?",
-                           $NOW + 86400 + 3600,
+                           $NOW + 86400*7 - (rand 86400),
                            $mode, $freq;
                }
             } else {
                # currently inactive
                sql_exec "update freq set aft_time = ?
                          where mode = ? and freq = ?",
-                        $NOW + 3600,
+                        $NOW + 57,
                         $mode, $freq;
             }
-         }
+         };
       } else {
-         Coro::Timer::sleep 60;
+         Coro::Timer::sleep 10;
       }
    }
 };
 #############################################################################
 # scan active freqs
 async {
-   return;
+return;
    my $nice = 100;
    while () {
       my $st = sql_exec \my ($mode, $freq, $width, $activity_level),
                         "select mode, aft_freq, width, activity_level
       if ($st->rows) {
          my @jobs;
          while ($st->fetch) {
-            push @jobs, [$activity_level, job $nice, $mode, $freq, delay 0.030, "LM=LM"];
+            push @jobs, [$activity_level, job $nice, $mode, $freq, delay 0.040, "LM=LM"];
          }
          for (@jobs) {
             my ($activity_level, $job) = @$_;
             if ($lm[0] >= $activity_level) {
                warn "scan $job->{mode} $job->{freq} @lm\n";
                (job $nice-1, $mode, $job->{freq}, "LM=LM", sub {
 #               (job $nice-1, 0, 98400000, "LM=LM", sub {
                   acmd $playback_on;
-                  Coro::Timer::sleep 0.5;
+                  Coro::Timer::sleep 1;
 #                  my $data = 0.5 + (1 / 65536) * float unpack "v*", record_nsamples $record_rate * 0.1;
                   acmd $playback_off;
                   #$data = sin +(1/480) * xvals zeroes 48000;
 #                  $data->reshape (100, $record_rate / 100);
                   #
       }
    }
 };
 #############################################################################
+$| = 1;
 Coro::Event::loop;
 __END__
 mysql -e "delete from freq" aor

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing aor/aorscan (file contents): Revision 1.3 by root, Sat Oct 1 11:29:14 2005 UTC vs. Revision 1.4 by root, Sun Oct 2 09:36:37 2005 UTC

Diff Legend

Comparing aor/aorscan (file contents):
Revision 1.3 by root, Sat Oct 1 11:29:14 2005 UTC vs.
Revision 1.4 by root, Sun Oct 2 09:36:37 2005 UTC