X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=51d14f21382951ed14b422dc43c2521678f6f16c;hb=5835ca385fb719194163512276666aaf75e82484;hp=e510a165e2736e1d78cac926f419a0678716e192;hpb=3634fba90a64fe488d237f438d9945d81158da52;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index e510a165..51d14f21 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -3,33 +3,28 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 package Route::User;
 
 use DXDebug;
 use Route;
+use DXUtil;
+use DXJSON;
+use Time::HiRes qw(gettimeofday);
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
-%valid = (
-		  parent => '0,Parent Calls,parray',
-);
-
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
 
+our $cachefn = localdata('route_user_cache');
+
 sub count
 {
 	my $n = scalar(keys %list);
@@ -49,22 +44,37 @@ sub new
 	my $call = uc shift;
 	my $ncall = uc shift;
 	my $flags = shift;
+	my $ip = shift;
+
 	confess "already have $call in $pkg" if $list{$call};
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = [ $ncall ];
-	$self->{flags} = $flags;
+	$self->{flags} = $flags || Route::here(1);
+	$self->{ip} = $ip if defined $ip;
 	$list{$call} = $self;
+	dbg("CLUSTER: user $call added") if isdbg('cluster');
 
 	return $self;
 }
 
+sub get_all
+{
+	return values %list;
+}
+
 sub del
 {
 	my $self = shift;
 	my $pref = shift;
-	my @out = $self->delparent($pref);
-	return @out;
+	my $call = $self->{call};
+	$self->delparent($pref);
+	unless (@{$self->{parent}}) {
+		delete $list{$call};
+		dbg("CLUSTER: user $call deleted") if isdbg('cluster');
+		return $self;
+	}
+	return undef;
 }
 
 sub get
@@ -88,6 +98,30 @@ sub delparent
     return $self->_dellist('parent', @_);
 }
 
+sub TO_JSON { return { %{ shift() } }; }
+
+sub write_cache
+{
+	my $json = DXJSON->new;
+	$json->canonical(0)->allow_blessed(1)->convert_blessed(1);
+	
+	my $ta = [ gettimeofday ];
+	$json->indent(1)->canonical(1) if isdbg('routecache');
+	my $s = eval {$json->encode(\%list)};
+	if ($s) {
+		my $fh = IO::File->new(">$cachefn") or confess("writing $cachefn $!");
+		$fh->print($s);
+		$fh->close;
+	} else {
+		dbg("Route::User:Write_cache error '$@'");
+		return;
+	}
+	$json->indent(0)->canonical(0);
+	my $diff = _diffms($ta);
+	my $size = sprintf('%.3fKB', (length($s) / 1000));
+	dbg("Route::User:WRITE_CACHE size: $size time to write: $diff mS");
+}
+
 #
 # generic AUTOLOAD for accessors
 #
@@ -95,18 +129,17 @@ sub delparent
 sub AUTOLOAD
 {
 	no strict;
-
-	my $self = shift;
-	$name = $AUTOLOAD;
-	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	my ($pkg,$name) = $AUTOLOAD =~ /^(.*)::(\w+)$/;
+	return if $name eq 'DESTROY';
   
 	confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
 
 	# this clever line of code creates a subroutine which takes over from autoload
 	# from OO Perl - Conway
-#	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+	*$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+	goto &$AUTOLOAD;	
+#	*{"${pkg}::$name"} = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+#	goto &{"${pkg}::$name"};	
 }
 
 1;