From c74875d94e9fee0c3778ea4d3896961ceab16a53 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 23 Dec 2009 15:20:20 +0000
Subject: Back out some pingpong server stopping changes introduced last week
 in order to re-use 'classic' stopping and allow taking test-suite run time
 references from this state.

---
 tests/ftp.pm | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'tests/ftp.pm')

diff --git a/tests/ftp.pm b/tests/ftp.pm
index d19d0c70f..10ad79eda 100644
--- a/tests/ftp.pm
+++ b/tests/ftp.pm
@@ -170,8 +170,6 @@ sub killpid {
 sub ftpkillslave {
     my ($id, $ext, $verbose)=@_;
     my $base;
-    my $pidlist;
-    my @pidfiles;
 
     for $base (('filt', 'data')) {
         my $f = ".sock$base$id$ext.pid";
@@ -179,15 +177,10 @@ sub ftpkillslave {
         if($pid > 0) {
             printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext", $pid)
                 if($verbose);
-            $pidlist .= "$pid ";
+            kill (9, $pid);
+            waitpid($pid, 0);
         }
-        push @pidfiles, $f;
-    }
-
-    killpid($verbose, $pidlist);
-
-    foreach my $pidfile (@pidfiles) {
-        unlink($pidfile);
+        unlink($f);
     }
 }
 
@@ -197,8 +190,6 @@ sub ftpkillslave {
 #
 sub ftpkillslaves {
     my ($verbose) = @_;
-    my $pidlist;
-    my @pidfiles;
 
     for $ext (('', 'ipv6')) {
         for $id (('', '2')) {
@@ -208,18 +199,13 @@ sub ftpkillslaves {
                 if($pid > 0) {
                     printf ("* kill pid for %s => %d\n", "ftp-$base$id$ext",
                         $pid) if($verbose);
-                    $pidlist .= "$pid ";
+                    kill (9, $pid);
+                    waitpid($pid, 0);
                 }
-                push @pidfiles, $f;
+                unlink($f);
             }
         }
     }
-
-    killpid($verbose, $pidlist);
-
-    foreach my $pidfile (@pidfiles) {
-        unlink($pidfile);
-    }
 }
 
 
-- 
cgit v1.2.3