From owner-svn-src-user@FreeBSD.ORG Sun Nov 24 09:09:44 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 147B746E; Sun, 24 Nov 2013 09:09:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04423278F; Sun, 24 Nov 2013 09:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAO99h3v084801; Sun, 24 Nov 2013 09:09:43 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAO99hcV084800; Sun, 24 Nov 2013 09:09:43 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201311240909.rAO99hcV084800@svn.freebsd.org> From: Peter Holm Date: Sun, 24 Nov 2013 09:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258509 - user/pho/stress2/misc X-SVN-Group: user 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.16 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: Sun, 24 Nov 2013 09:09:44 -0000 Author: pho Date: Sun Nov 24 09:09:43 2013 New Revision: 258509 URL: http://svnweb.freebsd.org/changeset/base/258509 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/vfork.sh (contents, props changed) Added: user/pho/stress2/misc/vfork.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/vfork.sh Sun Nov 24 09:09:43 2013 (r258509) @@ -0,0 +1,125 @@ +#!/bin/sh + +# +# Copyright (c) 2013 EMC Corp. +# All rights reserved. +# +# 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$ +# + +# Regression test for r246484. + +cat > vfork1.c <<- EOF +#include +#include +#include + +int +main(void) +{ + pid_t pid; + + fprintf(stderr, "%d\n", getpid()); + if ((pid = vfork()) == 0) { +#if 0 + if (ptrace(PT_TRACE_ME, 0, 0, 0) == -1) + err(1, "PT_TRACEME"); +#endif + sleep(30); + _exit(0); + } + if (pid == -1) + err(1, "vfork"); + + return (0); +} +EOF +cc -o vfork1 -Wall -Wextra -g vfork1.c +rm vfork1.c + +cat > vfork2.c <<- EOF +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +main(int argc, char **argv) +{ + pid_t pid, rpid; + struct rusage ru; + int status; + + if (argc != 2) + errx(1, "Usage: %s ", argv[0]); + pid = atoi(argv[1]); + + if (pid == -1) + err(1, "fork()"); + if (ptrace(PT_ATTACH, pid, NULL, 0) == -1) + err(1, "ptrace(%d) attach", pid); + if (wait(NULL) == -1) + err(1, "wait"); + bzero(&ru, sizeof(ru)); + usleep(2000); + if ((rpid = wait4(-1, &status, WNOHANG, &ru)) == -1) { + err(1, "OK wait4"); + } + if (rpid == 0) { +// fprintf(stderr, "No rusage info.\n"); + if (ptrace(PT_DETACH, pid, NULL, 0) == -1) + err(1, "ptrace(%d) detach", pid); + if (wait(&status) == -1) + err(1, "wait"); + } else { + fprintf(stderr, "FAIL Got unexpected rusage.\n"); + if (ru.ru_utime.tv_sec != 0) + fprintf(stderr, "FAIL tv_sec\n"); + } + if (status != 0x4000) + fprintf(stderr, "FAIL Child exit status 0x%x\n", status); + + return (0); +} +EOF +cc -o vfork2 -Wall -Wextra -g vfork2.c +rm vfork2.c + +./vfork1 & +sleep .2 +childpid=`ps -l | grep -v grep | grep vfork1 | + tail -1 | grep nanslp | awk '{print $2}'` +# Seen before fix: +# failed to set signal flags properly for ast() +./vfork2 $childpid + +rm -f vfork1 vfork2