fix all DXChannel->get to ::get

[spider.git] / perl / Thingy.pm

diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index 61068e06b2f7e5df80cd4275b33627eca633edd6..a420206d5ef402a7c70f038927ab575a068fd41d 100644 (file)
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -2,6 +2,9 @@
 # Thingy handling
 #
 # This is the new fundamental protocol engine handler
+# 
+# This is where all the new things (and eventually all the old things
+# as well) happen.
 #
 # $Id$
 #
@@ -12,11 +15,24 @@ use strict;
 
 package Thingy;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+use vars qw($VERSION $BRANCH @queue @permin @persec);
+
+main::mkver($VERSION = q$Revision$);
+
+@queue = ();                                   # the input / processing queue
+
+#
+# these are set up using the Thingy->add_second_process($addr, $name)
+# and Thingy->add_minute_process($addr, $name)
+#
+# They replace the old cycle in cluster.pl
+#
+
+@persec = ();                                  # this replaces the cycle in cluster.pl
+@permin = ();                                  # this is an extra per minute cycle
+
+my $lastsec = time;
+my $lastmin = time;
 
 use DXChannel;
 use DXDebug;
@@ -26,6 +42,8 @@ sub new
 {
        my $class = shift;
        my $thing = {@_};
+
+       $thing->{origin} ||= $main::mycall;
        
        bless $thing, $class;
        return $thing;
@@ -35,26 +53,134 @@ sub new
 sub send
 {
        my $thing = shift;
-       my $chan = shift;
+       my $dxchan = shift;
        my $class;
        if (@_) {
                $class = shift;
-       } elsif ($chan->isa('DXChannel')) {
-               $class = ref $chan;
+       } elsif ($dxchan->isa('DXChannel')) {
+               $class = ref $dxchan;
+       }
+
+       # do output filtering
+       if ($thing->can('out_filter')) {
+               return unless $thing->out_filter($dxchan);
        }
 
        # generate the line which may (or not) be cached
-       my @out;
-       if (my $ref = $thing->{class}) {
-               push @out, ref $ref ? @$ref : $ref;
-       } else {
+       my $ref;
+       unless ($ref = $thing->{class}) {
                no strict 'refs';
                my $sub = "gen_$class";
-               push @out, $thing->$sub() if $thing->can($sub);
+               $ref = $thing->$sub($dxchan) if $thing->can($sub);
+       }
+       $dxchan->send(ref $ref ? @$ref : $ref) if $ref;
+}
+
+# broadcast to all except @_
+sub broadcast
+{
+       my $thing = shift;
+       dbg("Thingy::broadcast: " . $thing->ascii) if isdbg('thing'); 
+
+       foreach my $dxchan (DXChannel::get_all()) {
+               next if $dxchan == $main::me;
+               next if grep $dxchan == $_, @_;
+               $thing->send($dxchan); 
+       }
+}
+
+# queue this thing for processing
+sub queue
+{
+       my $thing = shift;
+       my $dxchan = shift;
+       $thing->{dxchan} = $dxchan->call;
+       push @queue, $thing;
+}
+
+#
+# this is the main commutator loop. In due course it will
+# become the *only* commutator loop, This can be called in one
+# of two ways: either with 2 args or with none.
+#
+# The two arg form is an immediate "queue and handle" and does
+# a full cycle, immediately
+#
+sub process
+{
+       my $thing;
+       if (@_ == 2) {
+               $thing = shift;
+               $thing->queue(shift);
+       }
+       while (@queue) {
+               $thing = shift @queue;
+               my $dxchan = DXChannel::get($thing->{dxchan});
+               if ($dxchan) {
+                       if ($thing->can('in_filter')) {
+                               next unless $thing->in_filter($dxchan);
+                       }
+
+                       # remember any useful routes
+                       RouteDB::update($thing->{origin}, $dxchan->{call}, $thing->{hopsaway});
+                       RouteDB::update($thing->{user}, $dxchan->{call}, $thing->{hopsaway}) if exists $thing->{user};
+               
+                       $thing->handle($dxchan);
+               }
+       }
+
+       # per second and per minute processing
+       if ($main::systime != $lastsec) {
+               if ($main::systime >= $lastmin+60) {
+                       foreach my $r (@permin) {
+                               &{$r->[0]}();
+                       }
+                       $lastmin = $main::systime;
+               }
+               foreach my $r (@persec) {
+                       &{$r->[0]}();
+               }
+               $lastsec = $main::systime;
        }
-       $chan->send(@out) if @out;
 }
 
+sub add_minute_process
+{
+       my $pkg = shift;
+       my $addr = shift;
+       my $name = shift;
+       dbg('Adding $name to Thingy per minute queue');
+       push @permin, [$addr, $name];
+}
+
+sub add_second_process
+{
+       my $pkg = shift;
+       my $addr = shift;
+       my $name = shift;
+       dbg('Adding $name to Thingy per second queue');
+       push @persec, [$addr, $name];
+}
+
+
+sub ascii
+{
+       my $thing = shift;
+       my $dd = new Data::Dumper([$thing]);
+       $dd->Indent(0);
+       $dd->Terse(1);
+       $dd->Sortkeys(1);
+    $dd->Quotekeys($] < 5.005 ? 1 : 0);
+       return $dd->Dumpxs;
+}
+
+sub add_auth
+{
+       my $thing = shift;
+       my $s = $thing->{'s'} = sprintf "%X", int(rand() * 100000000);
+       my $auth = Verify->new("DXSp,$main::mycall,$s,$main::version,$main::build");
+       $thing->{auth} = $auth->challenge($main::me->user->passphrase);
+}
 
 1;