From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH] gnu: dmd: Sleep longer in tests, for slower machines
Date: Tue, 18 Feb 2014 17:49:07 +0100
Message-ID: <87fvng9xj0.fsf@gnu.org>
References: <87sirjpl58.fsf@netris.org> <87y51au5a9.fsf@gnu.org>
	<20140217090149.GA4474@debian.eduroam.u-bordeaux.fr>
	<8761odq49b.fsf@netris.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55557)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1WFnrE-0002c8-3f
	for guix-devel@gnu.org; Tue, 18 Feb 2014 11:49:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1WFnrA-0005Da-3D
	for guix-devel@gnu.org; Tue, 18 Feb 2014 11:49:20 -0500
Received: from hera.aquilenet.fr ([2a01:474::1]:53068)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1WFnr9-0005DH-NF
	for guix-devel@gnu.org; Tue, 18 Feb 2014 11:49:15 -0500
In-Reply-To: <8761odq49b.fsf@netris.org> (Mark H. Weaver's message of "Mon, 17
	Feb 2014 08:04:48 -0500")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Mark H Weaver <mhw@netris.org> skribis:

> Andreas Enge <andreas@enge.fr> writes:
>> It looks like the patch broke dmd on i686 and x86_64:
>>    http://hydra.gnu.org/eval/52352
>
> Wow, those tests must be very fragile.  All I did was increase all of
> the sleep times by a factor of about 3.  I didn't look closely at the
> logic.

I think this is fixed by dmd commit 3c45967 (below), which I just pushed.

Thanks,
Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

commit 3c459670690f90f85905d241d230a7541a41fe15
Author: Ludovic Court=C3=A8s <ludo@gnu.org>
Date:   Tue Feb 18 15:10:28 2014 +0100

    dmd: Add '--pid' option.
=20=20=20=20
    * modules/dmd.scm (main): Add '--pid' option and honor it.
    * tests/basic.sh: Run dmd with '--pid'.  Wait for the PID file to be
      available, for synchronization.
    * tests/respawn.sh: Likewise.
    * dmd.texi (Invoking dmd): Document '--pid'.

	Modified   dmd.texi
diff --git a/dmd.texi b/dmd.texi
index a970894..f7306db 100644
--- a/dmd.texi
+++ b/dmd.texi
@@ -369,6 +369,10 @@ Log output into @var{file}, or if @var{file} is not gi=
ven,
 @code{/var/log/dmd.log} when running as superuser, @var{~/.dmd.log}
 otherwise.
=20
+@item --pid[=3D@var{file}]
+When dmd is ready to accept connections, write its PID to @var{file} or
+to the standard output if @var{file} is omitted.
+
 @item -p [@var{file}]
 @itemx --persistency[=3D@var{file}]
 @c FIXME-CRITICAL
	Modified   modules/dmd.scm
diff --git a/modules/dmd.scm b/modules/dmd.scm
index df41eb3..bfa579f 100644
--- a/modules/dmd.scm
+++ b/modules/dmd.scm
@@ -1,5 +1,5 @@
 ;; dmd.scm -- Daemon managing Daemons (or Daemons-managing Daemon?)
-;; Copyright (C) 2013 Ludovic Courts <ludo@gnu.org>
+;; Copyright (C) 2013, 2014 Ludovic Courts <ludo@gnu.org>
 ;; Copyright (C) 2002, 2003 Wolfgang Jhrling <wolfgang@pro-linux.de>
 ;;
 ;; This file is part of GNU dmd.
@@ -23,6 +23,7 @@
   #:use-module (ice-9 readline) ;; Readline (for interactive use).
   #:use-module (oop goops)      ;; Defining classes and methods.
   #:use-module (srfi srfi-1)    ;; List library.
+  #:use-module (srfi srfi-26)
   #:use-module (dmd config)
   #:use-module (dmd support)
   #:use-module (dmd service)
@@ -54,6 +55,7 @@
=20
   (let ((config-file default-config-file)
 	(socket-file default-socket-file)
+        (pid-file    #f)
 	(insecure #f)
 	(logfile default-logfile))
     ;; Process command line arguments.
@@ -99,6 +101,12 @@
 		    #:action (lambda (file)
 			       (set! logfile file)))
 		  (make <option>
+		    #:long "pid"
+		    #:takes-arg? #t #:optional-arg? #t #:arg-name "FILE"
+		    #:description "when ready write PID to FILE or stdout"
+		    #:action (lambda (file)
+			       (set! pid-file (or file #t))))
+		  (make <option>
 		    #:long "config" #:short #\c
 		    #:takes-arg? #t #:optional-arg? #f #:arg-name "FILE"
 		    #:description "read configuration from FILE"
@@ -173,6 +181,16 @@
               ;; EINTR, which happens anytime we receive a signal, such as
               ;; SIGCHLD.  Thus, wrap the 'accept' call.
               (accept (EINTR-safe accept)))
+
+          ;; Possibly write out our PID, which means we're ready to accept
+          ;; connections.  XXX: What if we daemonized already?
+          (match pid-file
+            ((? string? file)
+             (call-with-output-file pid-file
+               (cute display (getpid) <>)))
+            (#t (display (getpid)))
+            (_  #t))
+
           (let next-command ()
             (match (accept sock)
               ((command-source . client-address)
	Modified   tests/basic.sh
diff --git a/tests/basic.sh b/tests/basic.sh
index 0311f20..e9ad970 100644
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -1,5 +1,5 @@
 # GNU dmd --- Test basic communication capabilities.
-# Copyright =C2=A9 2013 Ludovic Court=C3=A8s <ludo@gnu.org>
+# Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s <ludo@gnu.org>
 #
 # This file is part of GNU dmd.
 #
@@ -23,11 +23,12 @@ socket=3D"t-socket-$$"
 conf=3D"t-conf-$$"
 log=3D"t-log-$$"
 stamp=3D"t-stamp-$$"
+pid=3D"t-pid-$$"
=20
 deco=3D"deco -s $socket"
-dmd_pid=3D""
=20
-trap "rm -f $socket $conf $stamp $log; test -z $dmd_pid || kill $dmd_pid" =
EXIT
+trap "rm -f $socket $conf $stamp $log $pid;
+      test -f $pid && kill \`cat $pid\` || true" EXIT
=20
 cat > "$conf"<<EOF
 (use-modules (srfi srfi-26))
@@ -43,10 +44,14 @@ cat > "$conf"<<EOF
    #:respawn? #f))
 EOF
=20
-dmd -I -s "$socket" -c "$conf" -l "$log" &
-dmd_pid=3D$!
+rm -f "$pid"
+dmd -I -s "$socket" -c "$conf" -l "$log" --pid=3D"$pid" &
+
+# Wait till it's ready.
+while ! test -f "$pid" ; do : ; done
+
+dmd_pid=3D"`cat $pid`"
=20
-sleep 1				# XXX: wait till it's up
 kill -0 $dmd_pid
 test -S "$socket"
 $deco status dmd | grep -E '(Start.*dmd|Stop.*test)'
	Modified   tests/respawn.sh
diff --git a/tests/respawn.sh b/tests/respawn.sh
index 96fad66..161eead 100644
--- a/tests/respawn.sh
+++ b/tests/respawn.sh
@@ -1,5 +1,5 @@
 # GNU dmd --- Test respawnable services.
-# Copyright =C2=A9 2013 Ludovic Court=C3=A8s <ludo@gnu.org>
+# Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s <ludo@gnu.org>
 #
 # This file is part of GNU dmd.
 #
@@ -25,11 +25,12 @@ log=3D"t-log-$$"
 stamp=3D"t-stamp-$$"
 service1_pid=3D"t-service1-pid-$$"
 service2_pid=3D"t-service2-pid-$$"
+pid=3D"t-pid-$$"
=20
 deco=3D"deco -s $socket"
-dmd_pid=3D""
=20
-trap "rm -f $socket $conf $stamp $log; test -z $dmd_pid || kill $dmd_pid ;
+trap "rm -f $socket $conf $stamp $log $pid $service1_pid $service2_pid ;
+  test -f $pid && kill \`cat $pid\` || true ;
   test -f $service1_pid && kill \`cat $service1_pid\` || true ;
   test -f $service2_pid && kill \`cat $service2_pid\` || true ;
   rm -f $service1_pid $service2_pid" EXIT
@@ -79,10 +80,14 @@ cat > "$conf"<<EOF
 (start 'test2)
 EOF
=20
-dmd -I -s "$socket" -c "$conf" -l "$log" &
-dmd_pid=3D$!
+rm -f "$pid"
+dmd -I -s "$socket" -c "$conf" -l "$log" --pid=3D"$pid" &
+
+# Wait till it's ready.
+wait_for_file "$pid"
+
+dmd_pid=3D"`cat $pid`"
=20
-sleep 1				# XXX: wait till it's up
 kill -0 $dmd_pid
 test -S "$socket"
 $deco status test1 | grep started

--=-=-=--