From owner-svn-src-user@freebsd.org  Wed Jan 27 09:54:15 2016
Return-Path: <owner-svn-src-user@freebsd.org>
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 64BB1A6FAAE
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed, 27 Jan 2016 09:54:15 +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 mx1.freebsd.org (Postfix) with ESMTPS id 1CF331E7F;
 Wed, 27 Jan 2016 09:54:15 +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 u0R9sE9O095625;
 Wed, 27 Jan 2016 09:54:14 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R9sEOE095624;
 Wed, 27 Jan 2016 09:54:14 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601270954.u0R9sEOE095624@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 27 Jan 2016 09:54:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294906 - 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.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 09:54:15 -0000

Author: pho
Date: Wed Jan 27 09:54:13 2016
New Revision: 294906
URL: https://svnweb.freebsd.org/changeset/base/294906

Log:
  Rewrite argument parsing. Update external syscall exclude handling.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/pho/stress2/misc/syscall5.sh

Modified: user/pho/stress2/misc/syscall5.sh
==============================================================================
--- user/pho/stress2/misc/syscall5.sh	Wed Jan 27 07:42:11 2016	(r294905)
+++ user/pho/stress2/misc/syscall5.sh	Wed Jan 27 09:54:13 2016	(r294906)
@@ -37,33 +37,26 @@
 
 syscall=`grep SYS_MAXSYSCALL /usr/include/sys/syscall.h | awk '{print $NF}'`
 syscall=$((syscall - 1))
+uname -a | grep -q OneFS &&
+    syscall=`sysctl kern.syscalls | grep -v nosys | grep : | tail -1 | \
+    sed 's/:.*//'`
 
-args=`getopt ars:t: $*`
-[ $? -ne 0 ] && echo "Usage $0 [-a] [-r] [-s number] [-t seconds]" && exit 1
-set -- $args
 last=/tmp/syscall5.last
 log=/tmp/syscall5.log
-for i; do
-	case "$i" in
-	-a)	all=1		# Test all syscalls
-		shift
-		;;
-	-r)	[ -h $last ] &&
-			syscall=`ls -l $last | awk '{print $NF}'`
-			syscall=$((syscall - 1))
-		shift
-		;;
-	-s)	syscall=$2
-		shift; shift
-		;;
-	-t)	sleeptime=$2
-		export sleeptime=$((sleeptime / 10))	# used in syscall4.sh
-		shift; shift
-		;;
-	--)
-		shift
-		break
-		;;
+
+while getopts ars:t:u flag; do
+	case "$flag" in
+	a) all=1 ;;
+	r) [ -h $last ] &&
+	       syscall=`ls -l $last | awk '{print $NF}'`
+	       syscall=$((syscall - 1))
+	   ;;
+	s) syscall="$OPTARG" ;;
+	t) sleeptime="$OPTARG"
+	   export sleeptime=$((sleeptime / 10))	;; # used in syscall4.sh
+	u) unnamed=1 ;;
+	*) echo "Usage $0 [-a] [-r] [-s number] [-t seconds] [-u]"
+	   return 1 ;;
 	esac
 done
 
@@ -83,12 +76,15 @@ while [ $n -gt 0 ]; do
 	ln -fs $n $last
 	name=`grep -w "$n$" /usr/include/sys/syscall.h | awk '{print $2}' |
 		sed 's/SYS_//'`
+	[ -z "$name" -a -n "$unnamed" ] &&
+		{ n=$((n - 1)); continue; }
 	[ -z "$name" ] && name="unknown"
-	if [ -x ../tools/exclude_syscall.sh ]; then
-		name=`../tools/exclude_syscall.sh $n`
-		[ $name = "Excluded" ] &&
-		    { n=$((n - 1)); continue; }
-	fi
+	rm -f /tmp/syscall5.name
+	[ -x ../tools/exclude_syscall.sh ] &&
+	    ../tools/exclude_syscall.sh $n &&
+	    { n=$((n - 1)); continue; }
+	[ "$name" = "unknown" ] && [ -f /tmp/syscall5.name ] &&
+	    name=`cat /tmp/syscall5.name`
 	echo "`date '+%T'` syscall $n ($name)"
 	echo "`date '+%T'` syscall $n ($name)"  >> $log
 	printf "`date '+%T'` syscall $n ($name)\r\n" > /dev/console