Commit 705c73b6 authored by unknown's avatar unknown
Browse files

Verbose printouts added


mysql-test/lib/mtr_process.pl:
  Printouts in mtr_ping_port, telling what port was pinged nad if it was free or not
parent 37c8042c
Loading
Loading
Loading
Loading
+22 −8
Original line number Diff line number Diff line
@@ -629,6 +629,10 @@ sub mtr_check_stop_servers ($) {
      {
	mtr_error("we could not kill or clean up all processes");
      }
      else
      {
	mtr_verbose("All ports where free, continuing");
      }
    }
  }

@@ -736,8 +740,9 @@ sub mtr_ping_with_timeout($) {
    foreach my $srv ( @$spec )
    {
      $res= 1;                          # We are optimistic
      if ( $srv->{'pid'} and
	   defined $srv->{'port'} and mtr_ping_port($srv->{'port'}) )
      if ( $srv->{'pid'} and defined $srv->{'port'} )
      {
	if ( mtr_ping_port($srv->{'port'}) )
	{
	  mtr_verbose("waiting for process $srv->{'pid'} to stop ".
		      "using port $srv->{'port'}");
@@ -747,6 +752,11 @@ sub mtr_ping_with_timeout($) {
	  $res= 0;
	  next TIME;
	}
	else
	{
	  # Process was not using port
	}
      }
    }
    last;                               # If we got here, we are done
  }
@@ -845,6 +855,8 @@ sub stop_reap_all {
sub mtr_ping_port ($) {
  my $port= shift;

  mtr_verbose("mtr_ping_port: $port");

  my $remote= "localhost";
  my $iaddr=  inet_aton($remote);
  if ( ! $iaddr )
@@ -860,10 +872,12 @@ sub mtr_ping_port ($) {
  if ( connect(SOCK, $paddr) )
  {
    close(SOCK);                        # FIXME check error?
    mtr_verbose("USED");
    return 1;
  }
  else
  {
    mtr_verbose("FREE");
    return 0;
  }
}