From owner-svn-src-user@FreeBSD.ORG  Wed Jul  3 06:43:50 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 22F23FEC;
 Wed,  3 Jul 2013 06:43:50 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 16167101B;
 Wed,  3 Jul 2013 06:43:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r636hnFN058655;
 Wed, 3 Jul 2013 06:43:49 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r636hngp058654;
 Wed, 3 Jul 2013 06:43:49 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307030643.r636hngp058654@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 3 Jul 2013 06:43:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r252546 - user/pho/stress2
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.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 06:43:50 -0000

Author: pho
Date: Wed Jul  3 06:43:49 2013
New Revision: 252546
URL: http://svnweb.freebsd.org/changeset/base/252546

Log:
  Allow swapINCARNATIONS to be user defined. Add file systems check.

Modified:
  user/pho/stress2/default.cfg

Modified: user/pho/stress2/default.cfg
==============================================================================
--- user/pho/stress2/default.cfg	Wed Jul  3 06:43:06 2013	(r252545)
+++ user/pho/stress2/default.cfg	Wed Jul  3 06:43:49 2013	(r252546)
@@ -25,7 +25,7 @@ export runRUNTIME=${runRUNTIME:-3d}		# R
 export runINCARNATIONS=1
 export runLOAD=100
 
-export swapINCARNATIONS=$((2 * INCARNATIONS))
+export swapINCARNATIONS=${swapINCARNATIONS:-$((2 * INCARNATIONS))}
 export swapLOAD=80
 
 export syscallKILL=1
@@ -72,5 +72,21 @@ dede () {        # file, blocksize, coun
    return $status 
 }
 
+# fsck and dumpfs comparison
+checkfs () {
+   dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.1
+   sleep 1
+   fsck -t ufs -y $1 > /tmp/fsck.log 2>&1
+   dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.2
+   if egrep -q "INCONSISTENCY|MODIFIED" /tmp/fsck.log ||
+     ! cmp -s /tmp/dumpfs.1 /tmp/dumpfs.2; then
+      diff -c /tmp/dumpfs.1 /tmp/dumpfs.2
+      echo "fsck -t ufs -y $1"
+      cat /tmp/fsck.log
+   else
+      rm -f /tmp/fsck.log /tmp/dumpfs.[12]
+   fi
+}
+
 [ -f  "./`hostname`" ] && .  "./`hostname`"	# source in local configuration
 [ -f "../`hostname`" ] && . "../`hostname`"	# source in local configuration