X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=8da9fe00ec069578b9e52f102400ad23932a4971;hb=0121434f428d8e7d1f31a9d69a4ee250b952b468;hp=6fded2416f3decac8ccbf985a6c2ebf5061e6e1b;hpb=0017002e2dc438d49fcc090dc99b6d22f7037aa7;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 6fded241..8da9fe00 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -17,54 +17,55 @@ use DXVars;
 use DXUtil;
 use DXChannel;
 use DXUser;
+use DXM;
+use DXCommandmode;
+use DXProt;
 
 package main;
 
-@inqueue = undef;                # the main input queue, an array of hashes 
-
-# handle out going messages
-sub send_now
-{
-  my ($conn, $sort, $call, $line) = @_;
-
-  print DEBUG "$t > $sort $call $line\n" if defined DEBUG;
-  print "> $sort $call $line\n";
-  $conn->send_now("$sort$call|$line");
-}
-
-sub send_later
-{
-  my ($conn, $sort, $call, $line) = @_;
-
-  print DEBUG "$t > $sort $call $line\n" if defined DEBUG;
-  print "> $sort $call $line\n";
-  $conn->send_later("$sort$call|$line");
-}
+@inqueue = ();                # the main input queue, an array of hashes
+$systime = 0;                 # the time now (in seconds)
 
 # handle disconnections
 sub disconnect
 {
-  my $dxconn = shift;
-  my ($user) = $dxconn->{user};
-  my ($conn) = $dxconn->{conn};
+  my $dxchan = shift;
+  return if !defined $dxchan;
+  my $user = $dxchan->{user};
+  my $conn = $dxchan->{conn};
+  $dxchan->finish();
   $user->close() if defined $user;
-  $conn->disconnect();
-  $dxconn->del();
+  $conn->disconnect() if defined $conn;
+  $dxchan->del();
 }
 
 # handle incoming messages
 sub rec
 {
   my ($conn, $msg, $err) = @_;
-  my $dxconn = DXChannel->get_by_cnum($conn);      # get the dxconnnect object for this message
+  my $dxchan = DXChannel->get_by_cnum($conn);      # get the dxconnnect object for this message
   
   if (defined $err && $err) {
-    disconnect($dxconn);
+    disconnect($dxchan) if defined $dxchan;
 	return;
-  } 
+  }
+  
+  # set up the basic channel info - this needs a bit more thought - there is duplication here
+  if (!defined $dxchan) {
+     my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+     my $user = DXUser->get($call);
+	 $user = DXUser->new($call) if !defined $user;
+	 $user->sort('U') if (!$user->sort());
+	 my $sort = $user->sort();
+     $dxchan = DXCommandmode->new($call, $conn, $user) if ($sort eq 'U');
+     $dxchan = DXProt->new($call, $conn, $user) if ($sort eq 'A');
+	 die "Invalid sort of user on $call = $sort" if !$dxchan;
+  }
+  
+  # queue the message and the channel object for later processing
   if (defined $msg) {
     my $self = bless {}, "inqueue";
-    $self->{dxconn} = $dxconn;
+    $self->{dxchan} = $dxchan;
     $self->{data} = $msg;
 	push @inqueue, $self;
   }
@@ -78,10 +79,11 @@ sub login
 # cease running this program, close down all the connections nicely
 sub cease
 {
-  my $dxconn;
-  foreach $dxconn (DXChannel->get_all()) {
-    disconnect($dxconn);
+  my $dxchan;
+  foreach $dxchan (DXChannel->get_all()) {
+    disconnect($dxchan);
   }
+  exit(0);
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -92,21 +94,26 @@ sub process_inqueue
   return if !$self;
   
   my $data = $self->{data};
-  my $dxconn = $self->{dxconn};
-  my ($sort, $call, $line) = $data =~ /^(\w)(\S+)|(.*)$/;
+  my $dxchan = $self->{dxchan};
+  my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
   
   # do the really sexy console interface bit! (Who is going to do the TK interface then?)
-  print DEBUG atime, " < $sort $call $line\n" if defined DEBUG;
-  print "< $sort $call $line\n";
+  print DEBUG atime, " <- $sort $call $line\n" if defined DEBUG;
+  print "<- $sort $call $line\n";
   
   # handle A records
+  my $user = $dxchan->user;
   if ($sort eq 'A') {
-    if ($dxconn) {                         # there should not be one of these, disconnect
-
-	}
-    my $user = DXUser->get($call);         # see if we have one of these
+    $dxchan->start($line);  
+  } elsif ($sort eq 'D') {
+    die "\$user not defined for $call" if !defined $user;
+	$dxchan->normal($line);  
+    disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+  } elsif ($sort eq 'Z') {
+    disconnect($dxchan);
+  } else {
+    print STDERR atime, " Unknown command letter ($sort) received from $call\n";
   }
-  
 }
 
 #############################################################
@@ -116,7 +123,7 @@ sub process_inqueue
 #############################################################
 
 # open the debug file, set various FHs to be unbuffered
-open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)\n";
+open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)";
 select DEBUG; $| = 1;
 select STDOUT; $| = 1;
 
@@ -133,7 +140,16 @@ $SIG{'HUP'} = 'IGNORE';
 
 # this, such as it is, is the main loop!
 for (;;) {
+  my $timenow;
   Msg->event_loop(1, 0.001);
-  process_inqueue();
+  $timenow = time;
+  if ($timenow != $systime) {
+    $systime = $timenow;
+	$cldate = &cldate();
+	$ztime = &ztime();
+  }
+  process_inqueue();                 # read in lines from the input queue and despatch them
+  DXCommandmode::process();     # process ongoing command mode stuff
+  DXProt::process();              # process ongoing ak1a pcxx stuff
 }