From: Tomi Ollila Date: Tue, 18 Sep 2012 14:23:01 +0000 (+0300) Subject: [PATCH V3 1/2] test/smtp-dummy: add --background option and functionality X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a3d054c9ee93af50ad7eac603e3b631efd9fd785;p=notmuch-archives.git [PATCH V3 1/2] test/smtp-dummy: add --background option and functionality --- diff --git a/8e/ab5670c69dbf0828a17be23ef1c64cb4a4e8df b/8e/ab5670c69dbf0828a17be23ef1c64cb4a4e8df new file mode 100644 index 000000000..99b3ff352 --- /dev/null +++ b/8e/ab5670c69dbf0828a17be23ef1c64cb4a4e8df @@ -0,0 +1,148 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 60B4B431FAF + for ; Tue, 18 Sep 2012 07:23:13 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id qhNImnqC3i5Y for ; + Tue, 18 Sep 2012 07:23:12 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 30F80431FAE + for ; Tue, 18 Sep 2012 07:23:12 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 2956E1002A4; Tue, 18 Sep 2012 17:23:17 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH V3 1/2] test/smtp-dummy: add --background option and + functionality +Date: Tue, 18 Sep 2012 17:23:01 +0300 +Message-Id: <1347978182-8771-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.1 +Cc: Tomi Ollila +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 18 Sep 2012 14:23:13 -0000 + +From: Tomi Ollila + +When shell executes background process using '&' the scheduling of +that new process is arbitrary. It could be that smtp-dummy doesn't +get execution time to listen() it's server socket until some other +process attempts to connect() to it. The --background option in +smtp-dummy makes it to go background *after* it started to listen +its server socket. + +When --background option is used, the line "smtp_dummy_pid=''" +is printed to stdout from where shell can eval it. +--- + +This is v3 of id:"1323766883-17607-1-git-send-email-tomi.ollila@iki.fi" + +addressing (some) Dmitry's comments. + + test/smtp-dummy.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 54 insertions(+), 1 deletion(-) + +diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c +index 86d4316..bb13668 100644 +--- a/test/smtp-dummy.c ++++ b/test/smtp-dummy.c +@@ -119,6 +119,7 @@ do_smtp_to_file (FILE *peer, FILE *output) + int + main (int argc, char *argv[]) + { ++ const char * progname; + char *output_filename; + FILE *peer_file, *output; + int sock, peer, err; +@@ -126,9 +127,31 @@ main (int argc, char *argv[]) + struct hostent *hostinfo; + socklen_t peer_addr_len; + int reuse; ++ int background; ++ ++ progname = argv[0]; ++ ++ background = 0; ++ for (; argc >= 2; argc--, argv++) { ++ if (argv[1][0] != '-') ++ break; ++ if (strcmp (argv[1], "--") == 0) { ++ argc--; ++ argv++; ++ break; ++ } ++ if (strcmp (argv[1], "--background") == 0) { ++ background = 1; ++ continue; ++ } ++ fprintf(stderr, "%s: unregognized option '%s'\n", ++ progname, argv[1]); ++ return 1; ++ } + + if (argc != 2) { +- fprintf (stderr, "Usage: %s \n", argv[0]); ++ fprintf (stderr, ++ "Usage: %s [--background] \n", progname); + return 1; + } + +@@ -181,6 +204,36 @@ main (int argc, char *argv[]) + return 1; + } + ++ if (background) { ++ int pid = fork (); ++ if (pid > 0) { ++ printf ("smtp_dummy_pid='%d'\n", pid); ++ fflush (stdout); ++ close (sock); ++ return 0; ++ } ++ if (pid < 0) { ++ fprintf (stderr, "Error: fork() failed: %s\n", ++ strerror (errno)); ++ close (sock); ++ return 1; ++ } ++ /* Reached if pid == 0 (the child process). */ ++ /* Close stdout so that the one interested in pid value will ++ also get EOF. */ ++ close (STDOUT_FILENO); ++ /* dup2() will re-reserve fd of stdout (1) (opportunistically), ++ in case fd of stderr (2) is open. If that was not open we ++ don't care fd of stdout (1) either. */ ++ dup2 (STDERR_FILENO, STDOUT_FILENO); ++ ++ /* This process is now out of reach of shell's job control. ++ To resolve the rare but possible condition where this ++ "daemon" is started but never connected this process will ++ (only) have 30 seconds to exist. */ ++ alarm (30); ++ } ++ + peer_addr_len = sizeof (peer_addr); + peer = accept (sock, (struct sockaddr *) &peer_addr, &peer_addr_len); + if (peer == -1) { +-- +1.7.11.4 +