Make test 040 less verbose since only I need to know this; integrate some old IRIX performance unit tests - metaperf and dirperf

040

@@ -36,7 +36,7 @@
 #-----------------------------------------------------------------------
 #
 # creator
-owner=dxm@sgi.com
+owner=nathans@sgi.com
 
 seq=`basename $0`
 echo "QA output created by $seq"
@@ -74,8 +74,13 @@ then
     _notrun "Can't find XFS command headers under \"$WORKAREA\""
 fi
 
-cd $WORKAREA/cmd/xfstests/tools
+cd $WORKAREA/cmd/xfstests
-perl ./srcdiff -q
+echo Silence is golden.
+perl tools/srcdiff -q >$seq.full
+if ! diff $seq.full $seq.good >/dev/null; then
+    echo "FAILED: srcdiff output $seq.full differs to $seq.good"
+    exit 1
+fi
 
 # success, all done
 status=0

040.good

@@ -0,0 +1,16 @@
+
+=== Checking attr package ===
+
+=== Checking acl package ===
+
+=== Checking dmapi package ===
+
+=== Checking xfsdump package ===
+
+=== Checking xfsprogs package ===
+
+=== Checking headers ===
+
+=== Checking libxfs code ===
+
+=== Checking libxlog code ===

040.out

@@ -1,17 +1,2 @@
 QA output created by 040
-
+Silence is golden.
-=== Checking attr package ===
-
-=== Checking acl package ===
-
-=== Checking dmapi package ===
-
-=== Checking xfsdump package ===
-
-=== Checking xfsprogs package ===
-
-=== Checking headers ===
-
-=== Checking libxfs code ===
-
-=== Checking libxlog code ===

src/Makefile

@@ -36,7 +36,8 @@ include $(TOPDIR)/include/builddefs
 TARGETS = alloc acl_get bstat devzero dirstress fault feature \
 	  fill fill2 getpagesize holes xfsctl loggen lstat64 \
 	  nametest permname randholes runas truncfile usemem \
-	  fstest mmapcat append_reader append_writer
+	  fstest mmapcat append_reader append_writer \
+	  dirperf metaperf
 ifeq ($(ENABLE_DBM), yes)
 TARGETS += dbtest
 endif
@@ -67,5 +68,8 @@ bstat: bstat.o $(LIBHANDLE)
 loggen:	loggen.o
 	$(LINKTEST) $(LDLIBS)
 
+fstest:	fstest.o
+	$(LINKTEST)
+
 acl_get: acl_get.o $(LIBACL) $(LIBATTR)
 	$(LINKTEST) $(LIBACL) $(LIBATTR) $(LDLIBS)

src/dirperf.c

@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like.  Any license provided herein, whether implied or
+ * otherwise, applies only to this software file.  Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ * 
+ * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
+ * Mountain View, CA  94043, or:
+ * 
+ * http://www.sgi.com 
+ * 
+ * For further information regarding this notice, see: 
+ * 
+ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define MAXNAMELEN 256
+typedef unsigned int uint_t;
+
+/*
+ * Loop over directory sizes:
+ *	make m directories
+ *	touch n files in each directory
+ *	stat the files round-robin
+ *	readdir/unlink the files 
+ * Change directory sizes by multiplication or addition.
+ * Allow control of starting & stopping sizes, name length, target directory.
+ * Print size and wallclock time (ms per file).
+ * Output can be used to make graphs (gnuplot)
+ */
+
+static uint_t	addval;
+static uint_t	dirchars;
+static char	*dirname;
+static uint_t	firstsize;
+static uint_t	lastsize;
+static uint_t	minchars;
+static double	mulval;
+static uint_t	nchars;
+static uint_t	ndirs;
+static uint_t	pfxchars;
+static uint_t	stats;
+
+static void	filename(int, int, char *);
+static int	hexchars(uint_t);
+static uint_t	nextsize(uint_t);
+static double	now(void);
+static void	usage(void);
+
+/*
+ * Maximum size allowed, this is pretty nuts.
+ * The largest one we've ever built has been about 2 million.
+ */
+#define	MAX_DIR_SIZE	(16 * 1024 * 1024)
+#define	DFL_FIRST_SIZE	1
+#define	DFL_LAST_SIZE	(1024 * 1024)
+#define	MAX_DIR_COUNT	1024
+
+int
+main(int argc, char **argv)
+{
+	int		c;
+	uint_t		cursize;
+	DIR		*dirp;
+	int		i;
+	int		j;
+	char		name[MAXNAMELEN];
+	struct stat	stb;
+	double		stime;
+
+	while ((c = getopt(argc, argv, "a:c:d:f:l:m:n:s:")) != -1) {
+		switch (c) {
+		case 'a':
+			addval = (uint_t)atoi(optarg);
+			break;
+		case 'c':
+			nchars = (uint_t)atoi(optarg);
+			break;
+		case 'd':
+			dirname = optarg;
+			break;
+		case 'f':
+			firstsize = (uint_t)atoi(optarg);
+			break;
+		case 'l':
+			lastsize = (uint_t)atoi(optarg);
+			break;
+		case 'm':
+			mulval = atof(optarg);
+			break;
+		case 'n':
+			ndirs = (uint_t)atoi(optarg);
+			break;
+		case 's':
+			stats = (uint_t)atoi(optarg);
+			break;
+		case '?':
+		default:
+			usage();
+			exit(1);
+		}
+	}
+	if (!addval && !mulval)
+		mulval = 2.0;
+	else if ((addval && mulval) || mulval < 0.0) {
+		usage();
+		exit(1);
+	}
+	if (stats == 0)
+		stats = 1;
+	if (!dirname)
+		dirname = ".";
+	else {
+		if (mkdir(dirname, 0777) < 0 && errno != EEXIST) {
+			perror(dirname);
+			exit(1);
+		}
+		if (chdir(dirname) < 0) {
+			perror(dirname);
+			exit(1);
+		}
+	}
+	if (firstsize == 0)
+		firstsize = DFL_FIRST_SIZE;
+	else if (firstsize > MAX_DIR_SIZE)
+		firstsize = MAX_DIR_SIZE;
+	if (lastsize == 0)
+		lastsize = DFL_LAST_SIZE;
+	else if (lastsize > MAX_DIR_SIZE)
+		lastsize = MAX_DIR_SIZE;
+	if (lastsize < firstsize)
+		lastsize = firstsize;
+	minchars = hexchars(lastsize - 1);
+	if (nchars < minchars)
+		nchars = minchars;
+	else if (nchars >= MAXNAMELEN)
+		nchars = MAXNAMELEN - 1;
+	if (ndirs > MAX_DIR_COUNT)
+		ndirs = MAX_DIR_COUNT;
+	dirchars = hexchars(ndirs);
+	pfxchars = nchars - minchars;
+	if (pfxchars)
+		memset(&name[dirchars + 1], 'a', pfxchars);
+	for (j = 0; j < ndirs; j++) {
+		filename(0, j, name);
+		name[dirchars] = '\0';
+		mkdir(name, 0777);
+	}
+	for (cursize = firstsize;
+	     cursize <= lastsize;
+	     cursize = nextsize(cursize)) {
+		stime = now();
+		for (i = 0; i < cursize; i++) {
+			for (j = 0; j < ndirs; j++) {
+				filename((i + j) % cursize, j, name);
+				close(creat(name, 0666));
+			}
+		}
+		for (i = 0; i < cursize * stats; i++) {
+			for (j = 0; j < ndirs; j++) {
+				filename((i + j) % cursize, j, name);
+				stat(name, &stb);
+			}
+		}
+		for (j = 0; j < ndirs; j++) {
+			filename(0, j, name);
+			name[dirchars] = '\0';
+			dirp = opendir(name);
+			while (readdir(dirp))
+				continue;
+			closedir(dirp);
+		}
+		for (i = 0; i < cursize; i++) {
+			for (j = 0; j < ndirs; j++) {
+				filename((i + j) % cursize, j, name);
+				unlink(name);
+			}
+		}
+		printf("%d %.3f\n", cursize,
+			(now() - stime) * 1.0e3 / (cursize * ndirs));
+	}
+	for (j = 0; j < ndirs; j++) {
+		filename(0, j, name);
+		name[dirchars] = '\0';
+		rmdir(name);
+	}
+	return 0;
+}
+
+static void
+filename(int idx, int dir, char *name)
+{
+	static char	hexc[16] = "0123456789abcdef";
+	int		i;
+
+	for (i = dirchars - 1; i >= 0; i--)
+		*name++ = hexc[(dir >> (4 * i)) & 0xf];
+	*name++ = '/';
+	name += pfxchars;		/* skip pfx a's */
+	for (i = minchars - 1; i >= 0; i--)
+		*name++ = hexc[(idx >> (4 * i)) & 0xf];
+	*name = '\0';
+}
+
+static int
+hexchars(uint_t maxval)
+{
+	if (maxval < 16)
+		return 1;
+	if (maxval < 16 * 16)
+		return 2;
+	if (maxval < 16 * 16 * 16)
+		return 3;
+	if (maxval < 16 * 16 * 16 * 16)
+		return 4;
+	if (maxval < 16 * 16 * 16 * 16 * 16)
+		return 5;
+	if (maxval < 16 * 16 * 16 * 16 * 16 * 16)
+		return 6;
+	if (maxval < 16 * 16 * 16 * 16 * 16 * 16 * 16)
+		return 7;
+	return 8;
+}
+
+static uint_t
+nextsize(uint_t cursize)
+{
+	double	n;
+
+	n = cursize;
+	if (addval)
+		n += addval;
+	else
+		n *= mulval;
+	if (n > (double)lastsize + 0.5)
+		return lastsize + 1;	/* i.e. out of bounds */
+	else if ((uint_t)n == cursize)
+		return cursize + 1;
+	else
+		return (uint_t)n;
+}
+
+static double
+now(void)
+{
+	struct timeval	tv;
+
+	gettimeofday(&tv, NULL);
+	return (double)tv.tv_sec + 1.0e-6 * (double)tv.tv_usec;
+}
+
+static void
+usage(void)
+{
+	fprintf(stderr,
+		"usage: dirperf [-d dir] [-a addstep | -m mulstep] [-f first] "
+		"[-l last] [-c nchars] [-n ndirs] [-s nstats]\n");
+}