X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=bdd1f7d9c2020b5252be34f54d9cddf736488459;hb=f46017e7bef9ee062cd5a8648d214eabe585da25;hp=c324930fad4b8ac9d9190b2fcd1bac07c6a31342;hpb=2e16209416d1d189707935868a708b525c93097b;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index c324930f..bdd1f7d9 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -9,61 +9,63 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
+# $Id$
 # 
 
 use Msg;
 use DXVars;
 use DXUtil;
-use DXConnect;
+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};
+  if ($user->{sort} eq 'A') {           # and here (when I find out how to write it!)
+    $dxchan->pc_finish();  
+  } else {
+    $dxchan->user_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 = DXConnect->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;
+     $dxchan = DXChannel->new($call, $conn, $user);  
+  }
+  
+  # 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;
   }
@@ -77,10 +79,11 @@ sub login
 # cease running this program, close down all the connections nicely
 sub cease
 {
-  my $dxconn;
-  foreach $dxconn (DXConnect->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
@@ -91,21 +94,34 @@ 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";
   
   # handle A records
+  my $user = $dxchan->{user};
   if ($sort eq 'A') {
-    if ($dxconn) {                         # there should not be one of these, disconnect
-
+	$user->{sort} = 'U' if !defined $user->{sort};
+    if ($user->{sort} eq 'A') {
+	  $dxchan->pc_start($line);  
+	} else {
+	  $dxchan->user_start($line);
+	}
+  } elsif ($sort eq 'D') {
+    die "\$user not defined for $call" if !defined $user;
+    if ($user->{sort} eq 'A') {           # we will have a symbolic ref to a proc here
+	  $dxchan->pc_normal($line);  
+	} else {
+	  $dxchan->user_normal($line);
 	}
-    my $user = DXUser->get($call);         # see if we have one of these
+  } elsif ($sort eq 'Z') {
+    disconnect($dxchan);
+  } else {
+    print STDERR atime, " Unknown command letter ($sort) received from $call\n";
   }
-  
 }
 
 #############################################################
@@ -115,7 +131,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;
 
@@ -132,7 +148,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::user_process();     # process ongoing command mode stuff
+  DXProt::pc_process();              # process ongoing ak1a pcxx stuff
 }