Make syslogd test more reliable. Use Time::HiRes to sleep .01

seconds in the write_lines() loop.  This slows down the client, so
all messages reach syslogd and flood its buffers.  Increase the
timeout to wait until all buffers are full.  Use this code in all
TCP/TLS buffer and memory overflow tests.

12 files changed, 13 insertions, 21 deletions

diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
index ec5c322b642..e533e1c86ec 100644
--- a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
@@ -41,7 +41,7 @@ our %args = (
 		    $self->{redo}--;
 		    return;
 	    }
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    ${$self->{syslogd}}->kill_syslogd('HUP');
 	    ${$self->{syslogd}}->loggrep("syslogd: restarted", 5)
diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
index 01dffb640ef..d50ef1630dc 100644
--- a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
@@ -41,7 +41,7 @@ our %args = (
 		    $self->{redo}--;
 		    return;
 	    }
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    ${$self->{syslogd}}->kill_syslogd('HUP');
 	    ${$self->{syslogd}}->loggrep("syslogd: restarted", 5)
diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
index db269ca3ee9..7e8883de6c7 100644
--- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
@@ -36,7 +36,7 @@ our %args = (
 	redo => 0,
 	func => sub {
 	    my $self = shift;
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    ${$self->{syslogd}}->kill_syslogd('TERM');
 	    ${$self->{syslogd}}->loggrep("syslogd: exiting", 5)
diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
index c84549844bb..b425f15341f 100644
--- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
@@ -36,7 +36,7 @@ our %args = (
 	redo => 0,
 	func => sub {
 	    my $self = shift;
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    ${$self->{syslogd}}->kill_syslogd('TERM');
 	    ${$self->{syslogd}}->loggrep("syslogd: exiting", 5)
diff --git a/regress/usr.sbin/syslogd/args-dropped-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-tcp.pl
index 7770c5444b5..89998236b41 100644
--- a/regress/usr.sbin/syslogd/args-dropped-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-tcp.pl
@@ -36,7 +36,7 @@ our %args = (
 	listen => { domain => AF_UNSPEC, proto => "tcp", addr => "localhost" },
 	func => sub {
 	    my $self = shift;
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    read_log($self);
 	},
diff --git a/regress/usr.sbin/syslogd/args-dropped-tls.pl b/regress/usr.sbin/syslogd/args-dropped-tls.pl
index eff8d80218e..ffe36b7d709 100644
--- a/regress/usr.sbin/syslogd/args-dropped-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-tls.pl
@@ -36,7 +36,7 @@ our %args = (
 	listen => { domain => AF_UNSPEC, proto => "tls", addr => "localhost" },
 	func => sub {
 	    my $self = shift;
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    read_log($self);
 	},
diff --git a/regress/usr.sbin/syslogd/args-memory-overflow-cont.pl b/regress/usr.sbin/syslogd/args-memory-overflow-cont.pl
index 23e15a6ef78..6a9e4611342 100644
--- a/regress/usr.sbin/syslogd/args-memory-overflow-cont.pl
+++ b/regress/usr.sbin/syslogd/args-memory-overflow-cont.pl
@@ -7,17 +7,12 @@
 
 use strict;
 use warnings;
-use Time::HiRes 'sleep';
 
 our %args = (
     client => {
 	func => sub {
 	    my $self = shift;
-	    foreach (1..300) {
-		write_message($self, $_ x 1024);
-		# if client sends too fast, syslogd will not see everything
-		sleep .01;
-	    }
+	    write_lines($self, 300, 2000);
 	    write_log($self);
 	},
     },
diff --git a/regress/usr.sbin/syslogd/args-memory-overflow-flags.pl b/regress/usr.sbin/syslogd/args-memory-overflow-flags.pl
index bc6ed02852d..627a1e2f309 100644
--- a/regress/usr.sbin/syslogd/args-memory-overflow-flags.pl
+++ b/regress/usr.sbin/syslogd/args-memory-overflow-flags.pl
@@ -13,9 +13,7 @@ our %args = (
     client => {
 	func => sub {
 	    my $self = shift;
-	    foreach (1..40) {
-		write_message($self, $_ x 1024);
-	    }
+	    write_lines($self, 40, 2000);
 	    write_log($self);
 	},
     },
diff --git a/regress/usr.sbin/syslogd/args-memory-overflow.pl b/regress/usr.sbin/syslogd/args-memory-overflow.pl
index f3bc6a9faaa..9f94d32274f 100644
--- a/regress/usr.sbin/syslogd/args-memory-overflow.pl
+++ b/regress/usr.sbin/syslogd/args-memory-overflow.pl
@@ -12,9 +12,7 @@ our %args = (
     client => {
 	func => sub {
 	    my $self = shift;
-	    foreach (1..40) {
-		write_message($self, $_ x 1024);
-	    }
+	    write_lines($self, 40, 2000);
 	    write_log($self);
 	},
     },
diff --git a/regress/usr.sbin/syslogd/args-sync-tcp.pl b/regress/usr.sbin/syslogd/args-sync-tcp.pl
index 633a2b0d46c..3194ca64ce8 100644
--- a/regress/usr.sbin/syslogd/args-sync-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-sync-tcp.pl
@@ -44,7 +44,7 @@ our %args = (
 		$self->{redo}--;
 		return;
 	    }
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    shutdown(\*STDOUT, 1)
 		or die "shutdown write failed: $!";
diff --git a/regress/usr.sbin/syslogd/args-sync-tls.pl b/regress/usr.sbin/syslogd/args-sync-tls.pl
index 72a8656439d..91fd387e9ce 100644
--- a/regress/usr.sbin/syslogd/args-sync-tls.pl
+++ b/regress/usr.sbin/syslogd/args-sync-tls.pl
@@ -44,7 +44,7 @@ our %args = (
 		$self->{redo}--;
 		return;
 	    }
-	    ${$self->{client}}->loggrep(get_thirdlog(), 5)
+	    ${$self->{client}}->loggrep(get_thirdlog(), 20)
 		or die ref($self), " client did not send third log";
 	    shutdown(\*STDOUT, 1)
 		or die "shutdown write failed: $!";
diff --git a/regress/usr.sbin/syslogd/funcs.pl b/regress/usr.sbin/syslogd/funcs.pl
index 2e0dbd12d9d..e5d62348c89 100644
--- a/regress/usr.sbin/syslogd/funcs.pl
+++ b/regress/usr.sbin/syslogd/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.15 2015/02/08 15:24:14 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.16 2015/02/11 17:28:42 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -23,6 +23,7 @@ use List::Util qw(first);
 use Socket;
 use Socket6;
 use Sys::Syslog qw(:standard :extended :macros);
+use Time::HiRes 'sleep';
 use IO::Socket;
 use IO::Socket::INET6;