From owner-svn-src-user@freebsd.org Mon Jan 8 11:43:44 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A3DFE6648A for ; Mon, 8 Jan 2018 11:43:44 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 168AE7728C; Mon, 8 Jan 2018 11:43:44 +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 605932F349; Mon, 8 Jan 2018 11:43:43 +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 w08BhhCf031532; Mon, 8 Jan 2018 11:43:43 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w08BhhHA031531; Mon, 8 Jan 2018 11:43:43 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201801081143.w08BhhHA031531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 8 Jan 2018 11:43:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r327692 - 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: 327692 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.25 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: Mon, 08 Jan 2018 11:43:44 -0000 Author: pho Date: Mon Jan 8 11:43:42 2018 New Revision: 327692 URL: https://svnweb.freebsd.org/changeset/base/327692 Log: Limit runtime. Ensure that the buffer size is >= st_blksize. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/kinfo2.sh Modified: user/pho/stress2/misc/kinfo2.sh ============================================================================== --- user/pho/stress2/misc/kinfo2.sh Mon Jan 8 11:08:45 2018 (r327691) +++ user/pho/stress2/misc/kinfo2.sh Mon Jan 8 11:43:42 2018 (r327692) @@ -41,19 +41,26 @@ mycc -o kinfo2 -Wall -Wextra kinfo2.c -lutil || exit 1 rm -f kinfo2.c mount | grep -q procfs || mount -t procfs procfs /proc -for i in `jot 20`; do +s=0 +for i in `jot 15`; do + pids="" for j in `jot 5`; do /tmp/kinfo2 & + pids="$pids $!" done - wait + for p in $pids; do + wait $p + [ $? -ne 0 ] && s=1 + done done rm -f /tmp/kinfo2 -exit 0 +exit $s EOF #include #include +#include #include #include @@ -101,8 +108,9 @@ list(void) struct dirent *dp; struct kinfo_file *freep; struct kinfo_vmentry *freep_vm; + struct stat sb; pid_t pid; - long base; + off_t base; long l; int cnt, fd, n; int space = sizeof(buf); @@ -112,10 +120,14 @@ list(void) if ((fd = open("/proc", O_RDONLY)) == -1) err(1, "open(%s)", "/proc"); + if (fstat(fd, &sb) == -1) + err(1, "fstat()"); do { if ((n = getdirentries(fd, bp, space, &base)) == -1) err(1, "getdirentries"); space = space - n; + if (space < sb.st_blksize) + break; bp = bp + n; } while (n != 0); close(fd);