X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=435d00873768fce04a968f74434151a40aa09c15;hb=6b6a8002929017b6d4217f68fa492a2d728ee1fe;hp=2f96af8814e9a2e2333e0d9118716bf61e28210e;hpb=625ce0adf070a7e900fa03714a391652db0c065a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 2f96af88..435d0087 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -20,6 +20,8 @@ use DXUser;
 use DXM;
 use DXCommandmode;
 use DXProt;
+use DXCluster;
+use DXDebug;
 
 package main;
 
@@ -33,11 +35,7 @@ sub disconnect
   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();
-  }
+  $dxchan->finish();
   $user->close() if defined $user;
   $conn->disconnect() if defined $conn;
   $dxchan->del();
@@ -59,7 +57,33 @@ sub rec
      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);  
+	 $user->sort('U') if (!$user->sort());
+	 my $sort = $user->sort();
+	 
+	 # is there one already connected?
+	 if (DXChannel->get($call)) {
+	   my $mess = DXM::msg('conother', $call);
+	   dbg('chan', "-> D $call $mess\n"); 
+       $conn->send_now("D$call|$mess");
+	   dbg('chan', "-> Z $call bye\n");
+       $conn->send_now("Z$call|bye");          # this will cause 'client' to disconnect
+	   return;
+     }
+
+	 # is there one already connected elsewhere in the cluster?
+	 if (DXCluster->get($call)) {
+	   my $mess = DXM::msg('concluster', $call);
+	   dbg('chan', "-> D $call $mess\n"); 
+       $conn->send_now("D$call|$mess");
+	   dbg('chan', "-> Z $call bye\n");
+       $conn->send_now("Z$call|bye");          # this will cause 'client' to disconnect
+	   return;
+     }
+
+	 # create the channel
+     $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
@@ -98,25 +122,15 @@ sub process_inqueue
   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";
+  dbg('chan', "<- $sort $call $line\n");
   
   # handle A records
-  my $user = $dxchan->{user};
+  my $user = $dxchan->user;
   if ($sort eq 'A') {
-	$user->{sort} = 'U' if !defined $user->{sort};
-    if ($user->{sort} eq 'A') {
-	  $dxchan->pc_start($line);  
-	} else {
-	  $dxchan->user_start($line);
-	}
+    $dxchan->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);
-	}
+	$dxchan->normal($line);  
     disconnect($dxchan) if ($dxchan->{state} eq 'bye');
   } elsif ($sort eq 'Z') {
     disconnect($dxchan);
@@ -132,9 +146,11 @@ sub process_inqueue
 #############################################################
 
 # open the debug file, set various FHs to be unbuffered
-open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)";
-select DEBUG; $| = 1;
-select STDOUT; $| = 1;
+dbginit($debugfn);
+foreach(@debug) {
+  dbgadd($_);
+}
+STDOUT->autoflush(1);
 
 # initialise User file system
 DXUser->init($userfn);
@@ -158,7 +174,7 @@ for (;;) {
 	$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
+  DXCommandmode::process();     # process ongoing command mode stuff
+  DXProt::process();              # process ongoing ak1a pcxx stuff
 }