From owner-svn-src-user@freebsd.org Wed May 13 06:41:42 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF4BD2EB870 for ; Wed, 13 May 2020 06:41:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49MQ7V4mB2z4c1X; Wed, 13 May 2020 06:41:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9ECC61D53C; Wed, 13 May 2020 06:41:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04D6fgma077934; Wed, 13 May 2020 06:41:42 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04D6fg8Y077933; Wed, 13 May 2020 06:41:42 GMT (envelope-from pho@FreeBSD.org) Message-Id: <202005130641.04D6fg8Y077933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 13 May 2020 06:41:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r361003 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 361003 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2020 06:41:42 -0000 Author: pho Date: Wed May 13 06:41:42 2020 New Revision: 361003 URL: https://svnweb.freebsd.org/changeset/base/361003 Log: Added a regression test. PR: 246385 Added: user/pho/stress2/misc/sigfastblock2.sh (contents, props changed) Added: user/pho/stress2/misc/sigfastblock2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sigfastblock2.sh Wed May 13 06:41:42 2020 (r361003) @@ -0,0 +1,134 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2020 corydoras@ridiculousfish.com +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# The test scenario is from: +# Bug 246385 - SIGCHLD dropped if generated while blocked in sigfastblock +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246385 +# Fixed by r360940 + +. ../default.cfg + +cat > /tmp/sigfastblock2.c < +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static int pipes[2]; + +static void assert_noerr(int res) +{ + if (res < 0) + { + fprintf(stderr, "error: %s", strerror(res)); + exit(EXIT_FAILURE); + } +} + +static void sigchld_handler(int sig) +{ + // Write a byte to the write end of pipes. + (void)sig; + char c = 0; + ssize_t amt = write(pipes[1], &c, 1); + if (amt < 0) + { + perror("write"); + exit(EXIT_FAILURE); + } +} + +static pid_t spawn_child() +{ + pid_t pid = fork(); + assert_noerr(pid); + if (pid == 0) + { + _exit(0); + } + return pid; +} + +int main(void) +{ + // Install SIGCHLD handler with SA_RESTART. + struct sigaction chld_act = {}; + sigemptyset(&chld_act.sa_mask); + chld_act.sa_handler = &sigchld_handler; + chld_act.sa_flags = SA_RESTART; + assert_noerr(sigaction(SIGCHLD, &chld_act, NULL)); + + // Make our self-pipes. + assert_noerr(pipe(pipes)); + + // Spawn and reap children in a loop. + for (;;) + { + // Spawn a child. + pid_t child = spawn_child(); + assert(child >= 0 && "Invalid pid"); + + // Wait for the SIGCHLD handler to write to us. + for (;;) + { + char buf[PIPE_BUF]; + alarm(5); + ssize_t amt = read(pipes[0], buf, sizeof buf); + if (amt >= 0) + break; + alarm(0); + } + + // Reap it. + int status = 0; + int pid_res = waitpid(child, &status, WUNTRACED | WCONTINUED); + assert(pid_res == child && "Unexpected pid"); + } + + return 0; +} +EOF +mycc -o /tmp/sigfastblock2 -Wall -Wextra /tmp/sigfastblock2.c -lpthread || + exit 1 + +timeout 5m /tmp/sigfastblock2; s=$? +[ $s -eq 124 ] && s=0 + +rm -f /tmp/sigfastblock2 /tmp/sigfastblock2.c +exit $s