From owner-svn-src-user@freebsd.org Tue Sep 3 14:06:14 2019 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 28837DC592 for ; Tue, 3 Sep 2019 14:06:14 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z95Cq4z4PLF; Tue, 3 Sep 2019 14:06:13 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 4BFE01A357; Tue, 3 Sep 2019 14:06:02 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id E27DA5407; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3821183C08; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 116F953CC; Fri, 5 Apr 2019 07:45:17 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 1037C53CA for ; Fri, 5 Apr 2019 07:45:14 +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 D486283BFE; Fri, 5 Apr 2019 07:45:13 +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 A92C1A08D; Fri, 5 Apr 2019 07:45:13 +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 x357jDM7091690; Fri, 5 Apr 2019 07:45:13 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x357jDdC091689; Fri, 5 Apr 2019 07:45:13 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201904050745.x357jDdC091689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345905 - 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: 345905 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3821183C08 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:14 -0000 X-Original-Date: Fri, 5 Apr 2019 07:45:13 +0000 (UTC) X-List-Received-Date: Tue, 03 Sep 2019 14:06:14 -0000 Author: pho Date: Fri Apr 5 07:45:13 2019 New Revision: 345905 URL: https://svnweb.freebsd.org/changeset/base/345905 Log: Added a timeout to this test. Do not call pthread_kill(3) with a undefined thread argument. Style fixes. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/signal0.sh Modified: user/pho/stress2/misc/signal0.sh ============================================================================== --- user/pho/stress2/misc/signal0.sh Fri Apr 5 03:37:16 2019 (r345904) +++ user/pho/stress2/misc/signal0.sh Fri Apr 5 07:45:13 2019 (r345905) @@ -47,16 +47,20 @@ rm -f signal0.c cd $odir (cd ../testcases/swap; ./swap -t 5m -i 20 -h -v) > /dev/null 2>&1 & +s=0 +# The timeout was added after r345702, due to a longer runtime for +# an INVARIANTS kernel +start=`date +%s` for i in `jot 500`; do /tmp/signal0 + [ $((`date +%s` - start)) -gt 900 ] && + { echo "Timeout @ loop $i/500"; s=1; break; } done -while pkill -9 swap; do - : -done +while pkill -9 swap; do :; done wait rm -f /tmp/signal0 -exit +exit $s EOF #include @@ -64,32 +68,35 @@ EOF #include #include -void signal_handler(int signum, siginfo_t *si, void *context) { - if (signum != SIGUSR1) { - printf("FAIL bad signal, signum=%d\n", signum); - exit(1); - } +static void +signal_handler(int signum, siginfo_t *si, void *context) { + if (signum != SIGUSR1) { + printf("FAIL bad signal, signum=%d\n", signum); + exit(1); + } } -void *thread_func(void *arg) { - return arg; +static void +*thread_func(void *arg) { + return arg; } -int main(void) { - struct sigaction sa = { 0 }; - sa.sa_flags = SA_SIGINFO; - sa.sa_sigaction = signal_handler; - if (sigfillset(&sa.sa_mask) != 0) abort(); - if (sigaction(SIGUSR1, &sa, NULL) != 0) abort(); - for (int i = 0; i < 10000; i++) { - pthread_t t; - pthread_create(&t, NULL, thread_func, NULL); - pthread_kill(t, SIGUSR1); - /* - Side note. pthread_kill(3) call behaviour is undefined if pthread_create(3) - in the line before failed. - */ +int +main(void) +{ + struct sigaction sa = { 0 }; - } - return 0; + sa.sa_flags = SA_SIGINFO; + sa.sa_sigaction = signal_handler; + if (sigfillset(&sa.sa_mask) != 0) abort(); + if (sigaction(SIGUSR1, &sa, NULL) != 0) abort(); + for (int i = 0; i < 10000; i++) { + pthread_t t; + + if (pthread_create(&t, NULL, thread_func, NULL) == 0) + pthread_kill(t, SIGUSR1); + + } + + return (0); }