X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FProcess.pm;h=01c6a7b8f5300485293e15260795392128bd4b1c;hb=949b8910a5e23c4285d0b1aedacfc82a14dc97a5;hp=fe72a0812b70a905019b9baa33d14752182ea2b3;hpb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;p=debian%2Famanda

diff --git a/perl/Amanda/Process.pm b/perl/Amanda/Process.pm
index fe72a08..01c6a7b 100644
--- a/perl/Amanda/Process.pm
+++ b/perl/Amanda/Process.pm
@@ -1,20 +1,20 @@
-# Copyright (c) 2005-2008 Zmanda, Inc.  All Rights Reserved.
-# 
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 2.1 as 
-# published by the Free Software Foundation.
-# 
-# This library is distributed in the hope that it will be useful, but
+# Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA.
-# 
-# Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
-# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
 
 package Amanda::Process;
 
@@ -28,12 +28,6 @@ use File::Basename;
 use Amanda::Constants;
 @ISA = qw( Exporter );
 
-use Amanda::Paths;
-use Amanda::Util;
-use Amanda::MainLoop qw( :GIOCondition );
-use Amanda::Config;
-use Amanda::Device qw( :constants );
-
 =head1 NAME
 
 Amanda::Process -- interface to process
@@ -48,6 +42,8 @@ Amanda::Process -- interface to process
 
   Amanda::Process::add_child();
 
+  Amanda::Process::set_master_process(@pname);
+
   Amanda::Process::set_master($pname, $pid);
 
   Amanda::Process::kill_process($signal);
@@ -58,10 +54,6 @@ Amanda::Process -- interface to process
 
   my $alive = Amanda::Process::process_alive($pid, $pname);
 
-=head1 API STATUS
-
-Stable
-
 =head1 INTERFACE
 
 This module provides an object-oriented interface to track process used by
@@ -89,6 +81,12 @@ Parse all 'pid' and 'pid-done' lines of the logfile.
 
 Add all children of already known amanda processes.
 
+=item set_master_process
+
+  $Amanda_process->set_master_process($arg, @pname);
+
+Search the process table to find a process in @pname and make it the master, $arg must be an argument of the process.
+
 =item set_master
 
   $Amanda_process->set_master($pname, $pid);
@@ -179,8 +177,18 @@ sub load_ps_table() {
 	my $psline = <PSTABLE>; #header line
 	while($psline = <PSTABLE>) {
 	    chomp $psline;
-	    my ($pid, $ppid, $pname) = split " ", $psline;
+	    my ($pid, $ppid, $pname, $arg1, $arg2) = split " ", $psline;
 	    $pname = basename($pname);
+	    if ($pname =~ /^perl/ && defined $arg1) {
+		if ($arg1 !~ /^\-/) {
+		    $pname = $arg1;
+		} elsif (defined $arg2) {
+		    if ($arg2 !~ /^\-/) {
+			$pname = $arg2;
+		    }
+		}
+		$pname = basename($pname);
+	    }
 	    $self->{pstable}->{$pid} = $pname;
 	    $self->{ppid}->{$pid} = $ppid;
 	}
@@ -222,6 +230,9 @@ sub scan_log($) {
 	    }
 	    if (defined $self->{pstable}->{$pid} && $pname eq $self->{pstable}->{$pid}) {
 		$self->{pids}->{$pid} = $pname;
+	    } elsif (defined $self->{pstable}->{$pid} && $self->{pstable}->{$pid} =~ /^perl/) {
+		# We can get 'perl' for a perl script.
+		$self->{pids}->{$pid} = $pname;
 	    } elsif (defined $self->{pstable}->{$pid}) {
 		print "pid $pid doesn't match: ", $pname, " != ", $self->{pstable}->{$pid}, "\n" if $self->{verbose};
 	    }
@@ -295,7 +306,33 @@ sub add_child() {
 # Set master_pname and master_pid.
 #
 # Side-effects:
-# - sets $master_pname and $master_pid.
+# - sets $self->{master_pname} and $self->{master_pid}.
+#
+sub set_master_process {
+    my $self = shift;
+    my $arg = shift;
+    my @pname = @_;
+
+    my $ps_argument_args = $Amanda::Constants::PS_ARGUMENT_ARGS;
+    for my $pname (@pname) {
+	my $pid;
+
+	if ($ps_argument_args eq "CYGWIN") {
+	    $pid = `ps -ef|grep -w ${pname}|grep -w ${arg}| grep -v grep | awk '{print \$2}'`;
+	} else {
+	    $pid = `$Amanda::Constants::PS $ps_argument_args|grep -w ${pname}|grep -w ${arg}| grep -v grep | awk '{print \$1}'`;
+	}
+	chomp $pid;
+	if ($pid ne "") {
+	    $self->set_master($pname, $pid);
+	}
+    }
+}
+
+# Set master_pname and master_pid.
+#
+# Side-effects:
+# - sets $self->{master_pname} and $self->{master_pid}.
 #
 sub set_master($$) {
     my $self = shift;
@@ -306,7 +343,6 @@ sub set_master($$) {
     $self->{master_pid} = $pid;
     $self->{pids}->{$pid} = $pname;
 }
-
 # Send a signal to all amanda process
 #
 # Side-effects: