nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StartXdummy.pm: make Xdummy startup a bit more robust

This commit is contained in:
Maik Fischer 2011-11-24 14:06:55 +01:00
parent b1b139df1e
commit 423b891995
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testcases/complete-run.pl
View File

@ -12,7 +12,7 @@ use File::Basename qw(basename);
use File::Temp qw(tempfile tempdir); use File::Temp qw(tempfile tempdir);
use Getopt::Long; use Getopt::Long;
use IO::Socket::UNIX; use IO::Socket::UNIX;
use POSIX; use POSIX ();
use Time::HiRes qw(sleep gettimeofday tv_interval); use Time::HiRes qw(sleep gettimeofday tv_interval);
use TAP::Harness; use TAP::Harness;
use TAP::Parser; use TAP::Parser;

23
testcases/lib/StartXDummy.pm
View File

@ -23,6 +23,9 @@ the file ./Xdummy) and returns two arrayrefs: a list of X11 display numbers to
the Xdummy processes and a list of PIDs of the processes. the Xdummy processes and a list of PIDs of the processes.
=cut =cut
my $x_socketpath = '/tmp/.X11-unix/X';
sub start_xdummy { sub start_xdummy {
my ($parallel) = @_; my ($parallel) = @_;
@ -40,12 +43,12 @@ sub start_xdummy {
# First get the last used display number, then increment it by one. # First get the last used display number, then increment it by one.
# Effectively falls back to 1 if no X server is running. # Effectively falls back to 1 if no X server is running.
my ($displaynum) = reverse ('0', sort </tmp/.X11-unix/X*>); my ($displaynum) = map { /(\d+)$/ } reverse sort glob($x_socketpath . '*');
$displaynum =~ s/.*(\d)$/$1/;
$displaynum++; $displaynum++;
say "Starting $parallel Xdummy instances, starting at :$displaynum..."; say "Starting $parallel Xdummy instances, starting at :$displaynum...";
my @sockets_waiting;
for my $idx (0 .. ($parallel-1)) { for my $idx (0 .. ($parallel-1)) {
my $pid = fork(); my $pid = fork();
die "Could not fork: $!" unless defined($pid); die "Could not fork: $!" unless defined($pid);
@ -53,6 +56,9 @@ sub start_xdummy {
# Child, close stdout/stderr, then start Xdummy. # Child, close stdout/stderr, then start Xdummy.
close STDOUT; close STDOUT;
close STDERR; close STDERR;
# make sure this display isn’t in use yet
$displaynum++ while -e ($x_socketpath . $displaynum);
# We use -config /dev/null to prevent Xdummy from using the system # We use -config /dev/null to prevent Xdummy from using the system
# Xorg configuration. The tests should be independant from the # Xorg configuration. The tests should be independant from the
# actual system X configuration. # actual system X configuration.
@ -61,20 +67,17 @@ sub start_xdummy {
} }
push(@childpids, $pid); push(@childpids, $pid);
push(@displays, ":$displaynum"); push(@displays, ":$displaynum");
push(@sockets_waiting, $x_socketpath . $displaynum);
$displaynum++; $displaynum++;
} }
# Wait until the X11 sockets actually appear. Pretty ugly solution, but as # Wait until the X11 sockets actually appear. Pretty ugly solution, but as
# long as we can’t socket-activate X11… # long as we can’t socket-activate X11…
my $sockets_ready; while (1) {
do { @sockets_waiting = grep { ! -S $_ } @sockets_waiting;
$sockets_ready = 1; last unless @sockets_waiting;
for (@displays) {
my $path = "/tmp/.X11-unix/X" . substr($_, 1);
$sockets_ready = 0 unless -S $path;
}
sleep 0.1; sleep 0.1;
} until $sockets_ready; }
return \@displays, \@childpids; return \@displays, \@childpids;
} }