--- a/usr/src/Makefile.lint	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/Makefile.lint	Fri Jun 05 10:28:40 2009 -0400
@@ -373,6 +373,7 @@
 	lib/libinetcfg \
 	lib/libinetsvc \
 	lib/libinetutil \
+	lib/libinstzones \
 	lib/libipmi \
 	lib/libipmp \
 	lib/libipp \

--- a/usr/src/Targetdirs	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/Targetdirs	Fri Jun 05 10:28:40 2009 -0400
@@ -161,6 +161,8 @@
 	/var/log \
 	/var/log/pool \
 	/var/sadm \
+	/var/sadm/pkg \
+	/var/sadm/security \
 	/var/opt \
 	/var/run \
 	/var/smb \
@@ -317,6 +319,7 @@
 	/usr/proc/bin \
 	/usr/sadm \
 	/usr/sadm/install \
+	/usr/sadm/install/bin \
 	/usr/sadm/install/scripts \
 	/usr/sadm/sysadm \
 	/usr/sadm/sysadm/add-ons \
@@ -344,7 +347,11 @@
 	/var/news \
 	/var/preserve \
 	/var/saf \
-	/var/spool
+	/var/sadm/install \
+	/var/sadm/install/admin \
+	/var/sadm/install/logs \
+	/var/spool \
+	/var/spool/pkg
 
 sparcv9_ROOT.BIN64= \
 	/platform/sun4u/lib \
@@ -593,6 +600,7 @@
 $(ROOT)/usr/mail \
 $(ROOT)/var/mail  :=	GROUP= mail
 
+
 $(ROOT)/etc/dladm :=		OWNER= dladm
 $(ROOT)/etc/dladm :=		GROUP= sys
 
@@ -615,6 +623,15 @@
 
 
 #
+# These permissions must match those set
+# in pkgdefs.
+#
+$(ROOT)/var/sadm/pkg \
+$(ROOT)/var/sadm/security \
+$(ROOT)/var/sadm/install/logs :=	DIRMODE= 555
+
+
+#
 # These permissions must match the ones set
 # internally by fdfs and autofs.
 #

--- a/usr/src/cmd/Makefile	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/Makefile	Fri Jun 05 10:28:40 2009 -0400
@@ -386,6 +386,7 @@
 	sulogin		\
 	sunpc		\
 	svc		\
+	svr4pkg		\
 	swap		\
 	sync		\
 	sysdef		\
@@ -709,6 +710,7 @@
 	strings		\
 	su		\
 	svc		\
+	svr4pkg		\
 	swap		\
 	syseventadm	\
 	syseventd	\

--- a/usr/src/cmd/Makefile.cmd	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/Makefile.cmd	Fri Jun 05 10:28:40 2009 -0400
@@ -22,7 +22,7 @@
 # Use is subject to license terms.
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Definitions common to command source.
@@ -59,6 +59,10 @@
 ROOTLIBZONES=		$(ROOT)/lib/zones
 
 ROOTSHLIB=	$(ROOT)/usr/share/lib
+ROOTPKGBIN=	$(ROOT)/usr/sadm/install/bin
+ROOTCLASS_SCR_DIR= $(ROOT)/usr/sadm/install/scripts
+ROOTADMIN_SRC_DIR= $(ROOT)/var/sadm/install/admin
+
 ROOTSHLIBCCS=	$(ROOTSHLIB)/ccs
 ROOTSBIN=	$(ROOT)/sbin
 ROOTUSRSBIN=	$(ROOT)/usr/sbin
@@ -97,8 +101,8 @@
 ROOTMAN3=	$(ROOTMAN)/man3
 ROOTVARSMB=	$(ROOT)/var/smb
 
+
 #
-
 # Like ROOTLIBDIR in $(SRC)/Makefile.lib, any lower-level Makefiles that
 # put their binaries in a non-standard location should reset this and use
 # $(ROOTCMD) in their `install' target. By default we set this to a bogus
@@ -139,6 +143,8 @@
 ROOTLIBSHFILES= $(SHFILES:%=$(ROOTLIB)/%)
 ROOTSHLIBPROG=	$(PROG:%=$(ROOTSHLIB)/%)
 ROOTSBINPROG=	$(PROG:%=$(ROOTSBIN)/%)
+ROOTPKGBINPROG= $(PROG:%=$(ROOTPKGBIN)/%)
+ROOTCLASS_SCR_FILES= $(SCRIPTS:%=$(ROOTCLASS_SCR_DIR)/%)
 ROOTUSRSBINPROG=$(PROG:%=$(ROOTUSRSBIN)/%)
 ROOTUSRSBINSCRIPT=$(SCRIPT:%=$(ROOTUSRSBIN)/%)
 ROOTETCPROG=	$(PROG:%=$(ROOTETC)/%)
@@ -202,6 +208,8 @@
 ROOTLIBZONESFILES=	$(LIBZONESFILES:%=$(ROOTLIBZONES)/%)
 $(ROOTLIBZONESFILES) :=	FILEMODE = 0555
 
+ROOTADMIN_SRC_FILE= $(ADMINFILE:%=$(ROOTADMIN_SRC_DIR)/%)
+$(ROOTADMIN_SRC_FILE) := FILEMODE = 0444
 
 #
 # Directories for smf(5) service manifests and profiles.
@@ -307,6 +315,15 @@
 $(ROOTSHLIB)/%: %
 	$(INS.file)
 
+$(ROOTPKGBIN)/%: %
+	$(INS.file)
+
+$(ROOTCLASS_SCR_DIR)/%: %
+	$(INS.file)
+
+$(ROOTADMIN_SRC_DIR)/%: %
+	$(INS.file)
+
 $(ROOTSBIN)/%: %
 	$(INS.file)
 

--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/generic.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/generic.c	Fri Jun 05 10:28:40 2009 -0400
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,9 @@
  *
  * CDDL HEADER END
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -179,7 +177,7 @@
 nm_cmp(const void *n1, const void *n2)
 {
 	void *v1 = (void *) (((NNODE *)n1)->net.s_addr &
-				((NNODE *)n2)->mask.s_addr);
+	    ((NNODE *)n2)->mask.s_addr);
 	void *v2 = (void *) ((NNODE *)n2)->net.s_addr;
 
 	return (memcmp(&v1, &v2, sizeof (struct in_addr)));
@@ -273,8 +271,8 @@
 	ushort_t	code;
 	uint_t		vend_len;
 	uchar_t		len, *vp, *vdata, *data, *endp, *main_optp, *opt_endp;
-	uchar_t		overload = DHCP_OVRLD_CLR,
-			    using_overload = DHCP_OVRLD_CLR;
+	uchar_t		overload = DHCP_OVRLD_CLR;
+	uchar_t		using_overload = DHCP_OVRLD_CLR;
 	boolean_t	srv_using_file = B_FALSE, clnt_ovrld_file = B_FALSE;
 	boolean_t	echo_clnt_file;
 
@@ -488,7 +486,9 @@
 					using_overload |= DHCP_OVRLD_FILE;
 					break;
 				}
-			} else {
+			}
+			/* Skip the option if it's too long to fit */
+			if (len < (endp - optp - 1)) {
 				/* Load options. */
 				*optp++ = (uchar_t)code;
 				*optp++ = len;
@@ -587,7 +587,7 @@
 		} else {
 			dhcpmsg(LOG_ERR,
 			    "Unrecognized option with code: %d %d\n", cat,
-				code);
+			    code);
 		}
 	}
 

--- a/usr/src/cmd/cmd-inet/usr.lib/inetd/config.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/config.c	Fri Jun 05 10:28:40 2009 -0400
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Routines used by inetd to read inetd's configuration from the repository,
  * to validate it and setup inetd's data structures appropriately based on
@@ -630,14 +628,16 @@
  * 'errstr' is set to point at an appropriate error string.
  */
 struct method_context *
-read_method_context(const char *inst_fmri, const char *method, const char *path,
-    const char **errstr)
+read_method_context(const char *inst_fmri, const char *method, const char *path)
 {
 	scf_instance_t			*scf_inst = NULL;
 	struct method_context		*ret;
 	uint_t				retries;
-	const char			*tmpstr;
+	mc_error_t			*tmperr;
+	char				*fail;
 
+	fail = gettext("Failed to retrieve method context for the %s method of "
+	    "instance %s : %s");
 	for (retries = 0; retries <= REP_OP_RETRIES; retries++) {
 		if (make_handle_bound(rep_handle) == -1)
 			goto inst_failure;
@@ -659,11 +659,12 @@
 	if (retries > REP_OP_RETRIES)
 		goto inst_failure;
 
-	if ((tmpstr = restarter_get_method_context(
+	if ((tmperr = restarter_get_method_context(
 	    RESTARTER_METHOD_CONTEXT_VERSION, scf_inst, NULL, method, path,
 	    &ret)) != NULL) {
 		ret = NULL;
-		*errstr = tmpstr;
+		error_msg(fail, method, inst_fmri, tmperr->msg);
+		restarter_mc_error_destroy(tmperr);
 	}
 
 	scf_instance_destroy(scf_inst);
@@ -675,7 +676,8 @@
 	 * since we don't call bind_textdomain_codeset() or
 	 * setlocale(3C) after initialization.
 	 */
-	*errstr = gettext("failed to get instance from repository");
+	error_msg(fail, method, inst_fmri,
+	    gettext("failed to get instance from repository"));
 	return (NULL);
 }
 

--- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd.c	Fri Jun 05 10:28:40 2009 -0400
@@ -2975,7 +2975,6 @@
 	pid_t			child_pid;
 	method_info_t		*mi;
 	struct method_context	*mthd_ctxt = NULL;
-	const char		*errstr;
 	int			sig = 0;
 	int			ret;
 	instance_cfg_t		*cfg = instance->config;
@@ -3047,12 +3046,8 @@
 	 * modify the instances state if things go wrong.
 	 */
 	if ((mthd_ctxt = read_method_context(instance->fmri,
-	    methods[method].name, mi->exec_path, &errstr)) == NULL) {
-		error_msg(gettext("Failed to retrieve method context for the "
-		    "%s method of instance %s: %s"), methods[method].name,
-		    instance->fmri, errstr);
+	    methods[method].name, mi->exec_path)) == NULL)
 		goto prefork_failure;
-	}
 
 	/*
 	 * Perform some basic checks before we fork to limit the possibility

--- a/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd_impl.h	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/inetd_impl.h	Fri Jun 05 10:28:40 2009 -0400
@@ -300,7 +300,7 @@
 extern boolean_t method_info_equal(const method_info_t *,
     const method_info_t *);
 extern struct method_context *read_method_context(const char *, const char *,
-    const char *, const char **);
+    const char *);
 extern void destroy_instance_cfg(instance_cfg_t *);
 extern instance_cfg_t *read_instance_cfg(const char *);
 extern boolean_t bind_config_equal(const basic_cfg_t *, const basic_cfg_t *);

--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c	Fri Jun 05 10:28:40 2009 -0400
@@ -4476,21 +4476,26 @@
 	if (ioctl(fd, SIOCGLIFFLAGS, &lifrl) == -1)
 		return (_B_FALSE);
 
-	if (up) {
+	if (up)
 		lifrl.lifr_flags |= IFF_UP;
-	} else {
-		/*
-		 * If we've been asked to bring down an IFF_DUPLICATE address,
-		 * then get the address and set it.  This will cause IP to
-		 * clear IFF_DUPLICATE and stop the automatic recovery timer.
-		 */
-		if (lifrl.lifr_flags & IFF_DUPLICATE) {
-			return (ioctl(fd, SIOCGLIFADDR, &lifrl) != -1 &&
-			    ioctl(fd, SIOCSLIFADDR, &lifrl) != -1);
+	else
+		lifrl.lifr_flags &= ~IFF_UP;
+
+	if (ioctl(fd, SIOCSLIFFLAGS, &lifrl) == -1)
+		return (_B_FALSE);
+
+	/*
+	 * If we're trying to bring the address down, ensure that DAD activity
+	 * (observable by IFF_DUPLICATE) has also been stopped.
+	 */
+	if (!up && ioctl(fd, SIOCGLIFFLAGS, &lifrl) != -1 &&
+	    lifrl.lifr_flags & IFF_DUPLICATE) {
+		if (ioctl(fd, SIOCGLIFADDR, &lifrl) == -1 ||
+		    ioctl(fd, SIOCSLIFADDR, &lifrl) == -1) {
+			return (_B_FALSE);
 		}
-		lifrl.lifr_flags &= ~IFF_UP;
-	}
-	return (ioctl(fd, SIOCSLIFFLAGS, &lifrl) == 0);
+	}
+	return (_B_TRUE);
 }
 
 static boolean_t

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/popen.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/popen.c	Fri Jun 05 10:28:40 2009 -0400
@@ -1,10 +1,8 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /****************************************************************************    
   Copyright (c) 1999,2000 WU-FTPD Development Group.  
   All rights reserved.
@@ -198,11 +196,10 @@
 	/* begin CERT suggested fixes */
 	close(0);
 	i = geteuid();
-	delay_signaling();	/* we can't allow any signals while euid==0: kinch */
-	seteuid(0);
+	setid_priv_on(0);
 	setgid(getegid());
 	setuid(i);
-	enable_signaling();	/* we can allow signals once again: kinch */
+	setid_priv_off(i);
 	/* end CERT suggested fixes */
 	execv(gargv[0], gargv);
 	perror(gargv[0]);

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/privs.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/privs.c	Fri Jun 05 10:28:40 2009 -0400
@@ -1,10 +1,8 @@
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Least privilege support functions.
  */
@@ -24,17 +22,8 @@
 #include "proto.h"
 
 #ifdef SOLARIS_PRIVS
-/*
- * Before becoming privilege aware in init_privs(), no explicit privilege
- * manipulation using priv_on()/priv_off() is necessary as seteuid(0) sets
- * the effective privilege set to the limit set. Thus these are all
- * initialized to TRUE.
- */
-static boolean_t got_setid_priv = B_TRUE;
-static boolean_t got_privaddr_priv = B_TRUE;
-static boolean_t got_read_priv = B_TRUE;
-static boolean_t got_search_priv = B_TRUE;
-static boolean_t got_chown_priv = B_TRUE;
+/* When ununitialized, this indicates we still have all privs */
+static priv_set_t *uprivs;
 #endif /* SOLARIS_PRIVS */
 
 #ifdef SOLARIS_PRIVS
@@ -55,20 +44,20 @@
 }
 #endif /* PRIVS_DEBUG */
 
-static void priv_on(const char *priv, boolean_t already_have)
+static void priv_on(const char *priv)
 {
     /* no need to add the privilege if already have it */
-    if (already_have)
+    if (uprivs == NULL || priv_ismember(uprivs, priv))
 	return;
 
     if (priv_set(PRIV_ON, PRIV_EFFECTIVE, priv, NULL) == -1)
 	syslog(LOG_ERR, "priv_set: error adding privilege %s: %m", priv);
 }
 
-static void priv_off(const char *priv, boolean_t already_had)
+static void priv_off(const char *priv)
 {
     /* don't remove the privilege if already had it */
-    if (already_had)
+    if (uprivs == NULL || priv_ismember(uprivs, priv))
 	return;
 
     if (priv_set(PRIV_OFF, PRIV_EFFECTIVE, priv, NULL) == -1)
@@ -85,52 +74,64 @@
 {
 #ifdef SOLARIS_PRIVS
     uid_t euid = geteuid();
-    priv_set_t *privset;
+    priv_set_t *pset1, *pset2;
 
     /*
-     * The FTP server runs with "basic" inheritable privileges, which are
-     * reset in pam_setcred() for non anonymous users. The seteuid() call in
-     * pass() sets the effective privileges to the inheritable privileges.
+     * The FTP server runs with the inheritable set and the limit set
+     * filled in through user_attr (or with default values of basic and all).
+     * The privileges available to the user at login, is an intersection
+     * of both those sets.  The only way to limit the root user is by
+     * changing the limit set, not by changing the I set.
      */
-    if ((privset = priv_allocset()) == NULL) {
-	syslog(LOG_ERR, "priv_allocset failed: %m");
+    if ((pset1 = priv_allocset()) == NULL ||
+	(uprivs = priv_allocset()) == NULL ||
+	(pset2 = priv_allocset()) == NULL) {
+	    syslog(LOG_ERR, "priv_allocset failed: %m");
+	    dologout(1);
+    }
+    if (getppriv(PRIV_LIMIT, pset1) == -1) {
+	syslog(LOG_ERR, "getppriv(limit) failed: %m");
 	dologout(1);
     }
-    if (getppriv(PRIV_EFFECTIVE, privset) == -1) {
-	syslog(LOG_ERR, "getppriv(effective) failed: %m");
+    if (getppriv(euid == 0 ? PRIV_PERMITTED : PRIV_INHERITABLE, pset2) == -1) {
+	syslog(LOG_ERR, "getppriv() failed: %m");
 	dologout(1);
     }
 
+    /* Compute the permitted set after login. */
+    priv_intersect(pset2, pset1);
+
     /*
-     * Set the permitted privilege set to the effective privileges plus
+     * Set the permitted privilege set to the allowable privileges plus
      * those required after init_privs() is called. Keep note of which
-     * effective privileges we already had so we don't turn them off.
+     * effective privileges we already had in uprivs so we don't turn
+     * them off.
      */
-    if (!priv_ismember(privset, PRIV_PROC_SETID)) {
-	got_setid_priv = B_FALSE;
-	(void) priv_addset(privset, PRIV_PROC_SETID);
-    }
-    if (!priv_ismember(privset, PRIV_NET_PRIVADDR)) {
-	got_privaddr_priv = B_FALSE;
-	(void) priv_addset(privset, PRIV_NET_PRIVADDR);
+    priv_emptyset(pset2);
+    (void) priv_addset(pset2, PRIV_PROC_SETID);
+    (void) priv_addset(pset2, PRIV_NET_PRIVADDR);
+    (void) priv_addset(pset2, PRIV_FILE_DAC_READ);
+    (void) priv_addset(pset2, PRIV_FILE_DAC_SEARCH);
+    (void) priv_addset(pset2, PRIV_FILE_CHOWN);
+
+    priv_copyset(pset2, uprivs);
+    priv_intersect(pset1, uprivs);
+
+    /* Now, set the effective privileges. */
+    if (setppriv(PRIV_SET, PRIV_EFFECTIVE, pset1) == -1) {
+	syslog(LOG_ERR,
+	    "unable to set privileges for %s: setppriv(effective): %m",
+	    username);
+	dologout(1);
     }
-    if (!priv_ismember(privset, PRIV_FILE_DAC_READ)) {
-	got_read_priv = B_FALSE;
-	(void) priv_addset(privset, PRIV_FILE_DAC_READ);
-    }
-    if (!priv_ismember(privset, PRIV_FILE_DAC_SEARCH)) {
-	got_search_priv = B_FALSE;
-	(void) priv_addset(privset, PRIV_FILE_DAC_SEARCH);
-    }
-    if (!priv_ismember(privset, PRIV_FILE_CHOWN)) {
-	got_chown_priv = B_FALSE;
-	(void) priv_addset(privset, PRIV_FILE_CHOWN);
-    }
+
 #if defined(SOLARIS_BSM_AUDIT) && !defined(SOLARIS_NO_AUDIT_FTPD_LOGOUT)
     /* needed for audit_ftpd_logout() */
-    (void) priv_addset(privset, PRIV_PROC_AUDIT);
+    (void) priv_addset(pset1, PRIV_PROC_AUDIT);
 #endif
-    if (setppriv(PRIV_SET, PRIV_PERMITTED, privset) == -1) {
+    /* And set the permitted, adding ftpd's required privileges in the mix. */
+    priv_union(pset2, pset1);
+    if (setppriv(PRIV_SET, PRIV_PERMITTED, pset1) == -1) {
 	syslog(LOG_ERR,
 	    "unable to set privileges for %s: setppriv(permitted): %m",
 	    username);
@@ -140,8 +141,8 @@
      * setppriv() has made us privilege aware, so the effective privileges
      * are no longer modified by user ID changes.
      */
-
-    priv_freeset(privset);
+    priv_freeset(pset1);
+    priv_freeset(pset2);
 
     /* set the real, effective and saved group ID's */
     setid_priv_on(0);
@@ -181,7 +182,7 @@
 {
     delay_signaling();
 #ifdef SOLARIS_PRIVS
-    priv_on(PRIV_NET_PRIVADDR, got_privaddr_priv);
+    priv_on(PRIV_NET_PRIVADDR);
 #else
     (void) seteuid(uid);
 #endif
@@ -191,7 +192,7 @@
 void port_priv_off(uid_t uid)
 {
 #ifdef SOLARIS_PRIVS
-    priv_off(PRIV_NET_PRIVADDR, got_privaddr_priv);
+    priv_off(PRIV_NET_PRIVADDR);
 #else
     (void) seteuid(uid);
 #endif
@@ -203,8 +204,8 @@
 {
     delay_signaling();
 #ifdef SOLARIS_PRIVS
-    priv_on(PRIV_FILE_DAC_READ, got_read_priv);
-    priv_on(PRIV_FILE_DAC_SEARCH, got_search_priv);
+    priv_on(PRIV_FILE_DAC_READ);
+    priv_on(PRIV_FILE_DAC_SEARCH);
 #endif
     /* necessary on Solaris for access over NFS */
     (void) seteuid(uid);
@@ -213,8 +214,8 @@
 void access_priv_off(uid_t uid)
 {
 #ifdef SOLARIS_PRIVS
-    priv_off(PRIV_FILE_DAC_READ, got_read_priv);
-    priv_off(PRIV_FILE_DAC_SEARCH, got_search_priv);
+    priv_off(PRIV_FILE_DAC_READ);
+    priv_off(PRIV_FILE_DAC_SEARCH);
 #endif
     (void) seteuid(uid);
     enable_signaling();
@@ -226,7 +227,7 @@
 {
     delay_signaling();
 #ifdef SOLARIS_PRIVS
-    priv_on(PRIV_PROC_SETID, got_setid_priv);
+    priv_on(PRIV_PROC_SETID);
 #else
     (void) seteuid(uid);
 #endif
@@ -236,7 +237,7 @@
 void setid_priv_off(uid_t uid)
 {
 #ifdef SOLARIS_PRIVS
-    priv_off(PRIV_PROC_SETID, got_setid_priv);
+    priv_off(PRIV_PROC_SETID);
 #else
     (void) seteuid(uid);
 #endif
@@ -248,7 +249,7 @@
 {
     delay_signaling();
 #ifdef SOLARIS_PRIVS
-    priv_on(PRIV_FILE_CHOWN, got_chown_priv);
+    priv_on(PRIV_FILE_CHOWN);
 #endif
     /* necessary on Solaris for chown over NFS */
     (void) seteuid(uid);
@@ -257,7 +258,7 @@
 void chown_priv_off(uid_t uid)
 {
 #ifdef SOLARIS_PRIVS
-    priv_off(PRIV_FILE_CHOWN, got_chown_priv);
+    priv_off(PRIV_FILE_CHOWN);
 #endif
     (void) seteuid(uid);
     enable_signaling();

--- a/usr/src/cmd/fdisk/fdisk.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/fdisk/fdisk.c	Fri Jun 05 10:28:40 2009 -0400
@@ -38,7 +38,6 @@
  * operations from a supplied menu or from the command line. Diagnostic
  * options are also available.
  */
- 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -871,7 +870,7 @@
 		if (io_ifdisk) {
 			(void) fprintf(stderr, "\n");
 			(void) fprintf(stderr, "Press Enter to continue.\n");
-			(void) gets(s);
+			(void) fgets(s, sizeof (s), stdin);
 		}
 	}
 
@@ -1000,7 +999,7 @@
 		print_Table();
 		if (io_ifdisk) {
 			(void) fprintf(stderr, "Press Enter to continue.\n");
-			(void) gets(s);
+			(void) fgets(s, sizeof (s), stdin);
 		}
 	}
 
@@ -1971,15 +1970,16 @@
 	for (;;) {
 		(void) printf(Q_LINE);
 		(void) printf("Enter Selection: ");
-		(void) gets(s);
+		(void) fgets(s, sizeof (s), stdin);
 		rm_blanks(s);
-		while (!((s[0] > '0') && (s[0] < '7') && (s[1] == 0))) {
+		while (!((s[0] > '0') && (s[0] < '7') &&
+		    ((s[1] == '\0') || (s[1] == '\n')))) {
 			(void) printf(E_LINE); /* Clear any previous error */
 			(void) printf(
 			    "Enter a one-digit number between 1 and 6.");
 			(void) printf(Q_LINE);
 			(void) printf("Enter Selection: ");
-			(void) gets(s);
+			(void) fgets(s, sizeof (s), stdin);
 			rm_blanks(s);
 		}
 		(void) printf(E_LINE);
@@ -2096,9 +2096,9 @@
 		    "   5=DOS12     6=DOS16       7=DOSEXT     8=DOSBIG\n"
 		    "   9=DOS16LBA  A=x86 Boot    B=Diagnostic C=FAT32\n"
 		    "   D=FAT32LBA  E=DOSEXTLBA   F=EFI        0=Exit? ");
-		(void) gets(s);
+		(void) fgets(s, sizeof (s), stdin);
 		rm_blanks(s);
-		if (s[1] != 0) {
+		if ((s[1] != '\0') && (s[1] != '\n')) {
 			(void) printf(E_LINE);
 			(void) printf("Invalid selection, try again.");
 			continue;
@@ -2305,11 +2305,11 @@
 	(void) printf(
 	    "Specify the percentage of disk to use for this partition\n"
 	    "(or type \"c\" to specify the size in cylinders). ");
-	(void) gets(s);
+	(void) fgets(s, sizeof (s), stdin);
 	rm_blanks(s);
 	if (s[0] != 'c') {	/* Specify size in percentage of disk */
 		i = 0;
-		while (s[i] != '\0') {
+		while ((s[i] != '\0') && (s[i] != '\n')) {
 			if (s[i] < '0' || s[i] > '9') {
 				(void) printf(E_LINE);
 				(void) printf("Invalid percentage value "
@@ -2569,9 +2569,10 @@
 			    "Specify the partition number to boot from"
 			    " (or specify 0 for none): ");
 			}
-		(void) gets(s);
+		(void) fgets(s, sizeof (s), stdin);
 		rm_blanks(s);
-		if ((s[1] != 0) || (s[0] < '0') || (s[0] > '4')) {
+		if (((s[1] != '\0') && (s[1] != '\n')) ||
+		    (s[0] < '0') || (s[0] > '4')) {
 			(void) printf(E_LINE);
 			(void) printf(
 			    "Invalid response, please specify a number"
@@ -2687,14 +2688,15 @@
 DEL1:	(void) printf(Q_LINE);
 	(void) printf("Specify the partition number to delete"
 	    " (or enter 0 to exit): ");
-	(void) gets(s);
+	(void) fgets(s, sizeof (s), stdin);
 	rm_blanks(s);
 	if ((s[0] == '0')) {	/* exit delete command */
 		(void) printf(E_LINE);	/* clear error message */
 		return (1);
 	}
 	/* Accept only a single digit between 1 and 4 */
-	if (s[1] != 0 || (i = atoi(s)) < 1 || i > FD_NUMPART) {
+	if (((s[1] != '\0') && (s[1] != '\n')) ||
+	    (i = atoi(s)) < 1 || i > FD_NUMPART) {
 		(void) printf(E_LINE);
 		(void) printf("Invalid response, retry the operation.\n");
 		goto DEL1;
@@ -2777,9 +2779,11 @@
 {
 int slen, i, j;
 unsigned int cyl;
-	(void) gets(s);
+	(void) fgets(s, sizeof (s), stdin);
 	rm_blanks(s);
 	slen = strlen(s);
+	if (s[slen - 1] == '\n')
+		slen--;
 	j = 1;
 	cyl = 0;
 	for (i = slen - 1; i >= 0; i--) {
@@ -3494,9 +3498,10 @@
 	char	s[80];
 
 	for (;;) {
-		(void) gets(s);
+		(void) fgets(s, sizeof (s), stdin);
 		rm_blanks(s);
-		if ((s[1] != 0) || ((s[0] != 'y') && (s[0] != 'n'))) {
+		if (((s[1] != '\0') && (s[1] != '\n')) ||
+		    ((s[0] != 'y') && (s[0] != 'n'))) {
 			(void) printf(E_LINE);
 			(void) printf("Please answer with \"y\" or \"n\": ");
 			continue;

--- a/usr/src/cmd/filebench/common/eventgen.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/eventgen.c	Fri Jun 05 10:28:40 2009 -0400
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * Portions Copyright 2008 Denis Cheng
@@ -79,6 +79,7 @@
 	hrtime_t last;
 
 	last = gethrtime();
+	filebench_shm->shm_eventgen_enabled = FALSE;
 
 	/* CONSTCOND */
 	while (1) {
@@ -91,6 +92,11 @@
 			continue;
 		} else {
 			rate = avd_get_int(filebench_shm->shm_eventgen_hz);
+			if (rate > 0) {
+				filebench_shm->shm_eventgen_enabled = TRUE;
+			} else {
+				continue;
+			}
 		}
 
 		/* Sleep for 10xperiod */

--- a/usr/src/cmd/filebench/common/filebench.h	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/filebench.h	Fri Jun 05 10:28:40 2009 -0400
@@ -123,7 +123,7 @@
 #define	MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
-#define	FILEBENCH_VERSION	"1.4.7"
+#define	FILEBENCH_VERSION	"1.4.8"
 #define	FILEBENCHDIR	"/usr/benchmarks/filebench"
 #define	FILEBENCH_PROMPT	"filebench> "
 #define	MAX_LINE_LEN	1024

--- a/usr/src/cmd/filebench/common/flowop_library.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/flowop_library.c	Fri Jun 05 10:28:40 2009 -0400
@@ -762,7 +762,7 @@
 flowoplib_eventlimit(threadflow_t *threadflow, flowop_t *flowop)
 {
 	/* Immediately bail if not set/enabled */
-	if (filebench_shm->shm_eventgen_hz == NULL)
+	if (!filebench_shm->shm_eventgen_enabled)
 		return (FILEBENCH_OK);
 
 	if (flowop->fo_initted == 0) {
@@ -772,7 +772,7 @@
 	}
 
 	flowop_beginop(threadflow, flowop);
-	while (filebench_shm->shm_eventgen_hz != NULL) {
+	while (filebench_shm->shm_eventgen_enabled) {
 		(void) ipc_mutex_lock(&filebench_shm->shm_eventgen_lock);
 		if (filebench_shm->shm_eventgen_q > 0) {
 			filebench_shm->shm_eventgen_q--;
@@ -825,7 +825,7 @@
 	uint64_t events;
 
 	/* Immediately bail if not set/enabled */
-	if (filebench_shm->shm_eventgen_hz == NULL)
+	if (!filebench_shm->shm_eventgen_enabled)
 		return (FILEBENCH_OK);
 
 	if (flowop->fo_initted == 0) {
@@ -880,7 +880,7 @@
 	events = iops;
 
 	flowop_beginop(threadflow, flowop);
-	while (filebench_shm->shm_eventgen_hz != NULL) {
+	while (filebench_shm->shm_eventgen_enabled) {
 
 		(void) ipc_mutex_lock(&filebench_shm->shm_eventgen_lock);
 		if (filebench_shm->shm_eventgen_q >= events) {
@@ -913,7 +913,7 @@
 	uint64_t events;
 
 	/* Immediately bail if not set/enabled */
-	if (filebench_shm->shm_eventgen_hz == NULL)
+	if (!filebench_shm->shm_eventgen_enabled)
 		return (FILEBENCH_OK);
 
 	if (flowop->fo_initted == 0) {
@@ -954,7 +954,7 @@
 	events = ops;
 
 	flowop_beginop(threadflow, flowop);
-	while (filebench_shm->shm_eventgen_hz != NULL) {
+	while (filebench_shm->shm_eventgen_enabled) {
 		(void) ipc_mutex_lock(&filebench_shm->shm_eventgen_lock);
 		if (filebench_shm->shm_eventgen_q >= events) {
 			filebench_shm->shm_eventgen_q -= events;
@@ -988,7 +988,7 @@
 	uint64_t events;
 
 	/* Immediately bail if not set/enabled */
-	if (filebench_shm->shm_eventgen_hz == NULL)
+	if (!filebench_shm->shm_eventgen_enabled)
 		return (FILEBENCH_OK);
 
 	if (flowop->fo_initted == 0) {
@@ -1047,7 +1047,7 @@
 	    (u_longlong_t)bytes, (u_longlong_t)events);
 
 	flowop_beginop(threadflow, flowop);
-	while (filebench_shm->shm_eventgen_hz != NULL) {
+	while (filebench_shm->shm_eventgen_enabled) {
 		(void) ipc_mutex_lock(&filebench_shm->shm_eventgen_lock);
 		if (filebench_shm->shm_eventgen_q >= events) {
 			filebench_shm->shm_eventgen_q -= events;

--- a/usr/src/cmd/filebench/common/ipc.h	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/ipc.h	Fri Jun 05 10:28:40 2009 -0400
@@ -152,6 +152,7 @@
 	/*
 	 * Event generator state
 	 */
+	int		shm_eventgen_enabled; /* event gen in operation */
 	avd_t		shm_eventgen_hz;   /* number of events per sec. */
 	uint64_t	shm_eventgen_q;    /* count of unclaimed events */
 	pthread_mutex_t	shm_eventgen_lock; /* lock protecting count */

--- a/usr/src/cmd/filebench/common/misc.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/misc.c	Fri Jun 05 10:28:40 2009 -0400
@@ -335,7 +335,7 @@
 filebench_shutdown(int error) {
 
 	if (error) {
-		filebench_log(LOG_DEBUG_IMPL, "Shutdown on error");
+		filebench_log(LOG_DEBUG_IMPL, "Shutdown on error %d", error);
 		(void) ipc_mutex_lock(&filebench_shm->shm_procflow_lock);
 		if (filebench_shm->shm_f_abort == FILEBENCH_ABORT_FINI) {
 			(void) ipc_mutex_unlock(

--- a/usr/src/cmd/filebench/common/parser_gram.y	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/parser_gram.y	Fri Jun 05 10:28:40 2009 -0400
@@ -119,8 +119,11 @@
 static void parser_fileset_create(cmd_t *);
 
 /* set commands */
-static void parser_set_integer(char *, fbint_t);
-static void parser_set_var(char *, char *);
+static void parser_set_integer(cmd_t *cmd);
+static void parser_set_var(cmd_t *cmd);
+static void parser_set_var_op_int(cmd_t *cmd);
+static void parser_set_int_op_var(cmd_t *cmd);
+static void parser_set_var_op_var(cmd_t *cmd);
 
 /* Shutdown Commands */
 static void parser_proc_shutdown(cmd_t *);
@@ -185,7 +188,7 @@
 %token FSE_DIRECTORY FSE_COMMAND FSE_FILESET FSE_XMLDUMP FSE_RAND FSE_MODE
 %token FSE_MULTI FSE_MULTIDUMP
 %token FSK_SEPLST FSK_OPENLST FSK_CLOSELST FSK_ASSIGN FSK_IN FSK_QUOTE
-%token FSK_DIRSEPLST
+%token FSK_DIRSEPLST FSK_PLUS FSK_MINUS FSK_MULTIPLY FSK_DIVIDE
 %token FSA_SIZE FSA_PREALLOC FSA_PARALLOC FSA_PATH FSA_REUSE
 %token FSA_PROCESS FSA_MEMSIZE FSA_RATE FSA_CACHED FSA_READONLY FSA_TRUSTTREE
 %token FSA_IOSIZE FSA_FILE FSA_WSS FSA_NAME FSA_RANDOM FSA_INSTANCES
@@ -226,6 +229,7 @@
 %type <cmd> thread echo_command usage_command help_command vars_command
 %type <cmd> version_command enable_command multisync_command
 %type <cmd> warmup_command fscheck_command fsflush_command
+%type <cmd> set_integer_command set_other_command
 
 %type <attr> files_attr_op files_attr_ops pt_attr_op pt_attr_ops
 %type <attr> fo_attr_op fo_attr_ops ev_attr_op ev_attr_ops
@@ -242,7 +246,7 @@
 %type <ival> randvar_attr_name FSA_TYPE randtype_name randvar_attr_param
 %type <ival> randsrc_name FSA_RANDSRC randvar_attr_tsp em_attr_name
 %type <ival> FSS_TYPE FSS_SEED FSS_GAMMA FSS_MEAN FSS_MIN FSS_SRC
-%type <ival> fscheck_attr_name FSA_FSTYPE
+%type <ival> fscheck_attr_name FSA_FSTYPE binary_op
 
 %type <rndtb>  probtabentry_list probtabentry
 %type <avd> var_int_val
@@ -790,18 +794,68 @@
 		yydebug = 1;
 };
 
-set_command: FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VAL_INT
+set_command:
+   set_integer_command
+ | set_other_command;
+
+set_integer_command: FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VAL_INT
+{
+	if (($$ = alloc_cmd()) == NULL)
+		YYERROR;
+	$$->cmd_tgt1 = $2;
+	$$->cmd_qty = $4;
+	if (parentscript) {
+		parser_vars($$);
+	}
+	$$->cmd = parser_set_integer;
+}| FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VARIABLE
 {
 	if (($$ = alloc_cmd()) == NULL)
 		YYERROR;
-	var_assign_integer($2, $4);
+	var_assign_var($2, $4);
+	$$->cmd_tgt1 = $2;
+	$$->cmd_tgt2 = $4;
 	if (parentscript) {
-		$$->cmd_tgt1 = $2;
 		parser_vars($$);
 	}
-	$$->cmd = NULL;
+	$$->cmd = parser_set_var;
 }
-| FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VAL_BOOLEAN
+| set_integer_command binary_op FSV_VAL_INT
+{
+	if ($1->cmd == parser_set_integer) {
+		switch ($2) {
+		case FSK_PLUS:
+			var_assign_integer($1->cmd_tgt1, $1->cmd_qty + $3);
+			break;
+		case FSK_MINUS:
+			var_assign_integer($1->cmd_tgt1, $1->cmd_qty - $3);
+			break;
+		case FSK_MULTIPLY:
+			var_assign_integer($1->cmd_tgt1, $1->cmd_qty * $3);
+			break;
+		case FSK_DIVIDE:
+			var_assign_integer($1->cmd_tgt1, $1->cmd_qty / $3);
+			break;
+		}
+		$$->cmd = NULL;
+	} else {
+		$1->cmd_qty = $3;
+		$1->cmd_subtype = $2;
+		$1->cmd = parser_set_var_op_int;
+	}
+}
+| set_integer_command binary_op FSV_VARIABLE
+{
+	$1->cmd_tgt3 = $3;
+	$1->cmd_subtype = $2;
+	if ($1->cmd == parser_set_integer) {
+		$$->cmd = parser_set_int_op_var;
+	} else {
+		$1->cmd = parser_set_var_op_var;
+	}
+};
+
+set_other_command: FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VAL_BOOLEAN
 {
 	if (($$ = alloc_cmd()) == NULL)
 		YYERROR;
@@ -832,16 +886,6 @@
 		parser_vars($$);
 	}
 	$$->cmd = NULL;
-}| FSC_SET FSV_VARIABLE FSK_ASSIGN FSV_VARIABLE
-{
-	if (($$ = alloc_cmd()) == NULL)
-		YYERROR;
-	var_assign_var($2, $4);
-	if (parentscript) {
-		$$->cmd_tgt1 = $2;
-		parser_vars($$);
-	}
-	$$->cmd = NULL;
 } | FSC_SET FSE_MODE FSC_QUIT FSA_TIMEOUT
 {
 	filebench_shm->shm_rmode = FILEBENCH_MODE_TIMEOUT;
@@ -1480,6 +1524,12 @@
 	$$->attr_name = $1;
 };
 
+binary_op:
+   FSK_PLUS {$$ = FSK_PLUS;}
+ | FSK_MINUS {$$ = FSK_MINUS;}
+ | FSK_MULTIPLY {$$ = FSK_MULTIPLY;}
+ | FSK_DIVIDE {$$ = FSK_DIVIDE;};
+
 files_attr_name: attrs_define_file
 |attrs_define_fileset;
 
@@ -3236,9 +3286,9 @@
  * variable, or the appropriate field of a random variable
  */
 static void
-parser_set_integer(char *name, fbint_t integer)
+parser_set_integer(cmd_t *cmd)
 {
-	var_assign_integer(name, integer);
+	var_assign_integer(cmd->cmd_tgt1, cmd->cmd_qty);
 }
 
 /*
@@ -3247,9 +3297,100 @@
  * random variable from another variable
  */
 static void
-parser_set_var(char *dst_name, char *src_name)
+parser_set_var(cmd_t *cmd)
+{
+	var_assign_var(cmd->cmd_tgt1, cmd->cmd_tgt2);
+}
+
+/*
+ * Used by the set command to set up for a binary operation of a
+ * variable from a var, with an integer
+ */
+static void
+parser_set_var_op_int(cmd_t *cmd)
+{
+	printf("parser_set_var_op_int: Called\n");
+	switch (cmd->cmd_subtype) {
+	case FSK_PLUS:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_SUM_IV,
+		    cmd->cmd_tgt2, cmd->cmd_qty);
+		break;
+
+	case FSK_MINUS:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_IV_DIF_INT,
+		    cmd->cmd_tgt2, cmd->cmd_qty);
+		break;
+
+	case FSK_MULTIPLY:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_MUL_IV,
+		    cmd->cmd_tgt2, cmd->cmd_qty);
+		break;
+
+	case FSK_DIVIDE:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_IV_DIV_INT,
+		    cmd->cmd_tgt2, cmd->cmd_qty);
+		break;
+	}
+}
+
+/*
+ * Used by the set command to set up for a binary operation of an
+ * integer with a variable from a var
+ */
+static void
+parser_set_int_op_var(cmd_t *cmd)
 {
-	var_assign_var(dst_name, src_name);
+	switch (cmd->cmd_subtype) {
+	case FSK_PLUS:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_SUM_IV,
+		    cmd->cmd_tgt3, cmd->cmd_qty);
+		break;
+
+	case FSK_MINUS:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_DIF_IV,
+		    cmd->cmd_tgt3, cmd->cmd_qty);
+		break;
+
+	case FSK_MULTIPLY:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_MUL_IV,
+		    cmd->cmd_tgt3, cmd->cmd_qty);
+		break;
+
+	case FSK_DIVIDE:
+		var_assign_op_var_int(cmd->cmd_tgt1, VAR_IND_INT_DIV_IV,
+		    cmd->cmd_tgt3, cmd->cmd_qty);
+		break;
+	}
+}
+
+/*
+ * Used by the set command to set up for a binary operation of two
+ * variables from other vars.
+ */
+static void
+parser_set_var_op_var(cmd_t *cmd)
+{
+	switch (cmd->cmd_subtype) {
+	case FSK_PLUS:
+		var_assign_op_var_var(cmd->cmd_tgt1, VAR_IND_IV_SUM_IV,
+		    cmd->cmd_tgt2, cmd->cmd_tgt3);
+		break;
+
+	case FSK_MINUS:
+		var_assign_op_var_var(cmd->cmd_tgt1, VAR_IND_IV_DIF_IV,
+		    cmd->cmd_tgt2, cmd->cmd_tgt3);
+		break;
+
+	case FSK_MULTIPLY:
+		var_assign_op_var_var(cmd->cmd_tgt1, VAR_IND_IV_MUL_IV,
+		    cmd->cmd_tgt2, cmd->cmd_tgt3);
+		break;
+
+	case FSK_DIVIDE:
+		var_assign_op_var_var(cmd->cmd_tgt1, VAR_IND_IV_DIV_IV,
+		    cmd->cmd_tgt2, cmd->cmd_tgt3);
+		break;
+	}
 }
 
 

--- a/usr/src/cmd/filebench/common/parser_lex.l	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/parser_lex.l	Fri Jun 05 10:28:40 2009 -0400
@@ -220,6 +220,10 @@
 <INITIAL>=			{ return FSK_ASSIGN; }
 <INITIAL>\,			{ return FSK_SEPLST; }
 <INITIAL>in                     { return FSK_IN; }
+<INITIAL>\+                     { return FSK_PLUS; }
+<INITIAL>\-                     { return FSK_MINUS; }
+<INITIAL>\*                     { return FSK_MULTIPLY; }
+<INITIAL>\/                     { return FSK_DIVIDE; }
 
 <INITIAL>[0-9]+	{
                                 errno = 0;

--- a/usr/src/cmd/filebench/common/parsertypes.h	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/parsertypes.h	Fri Jun 05 10:28:40 2009 -0400
@@ -19,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_FB_PARSERTYPES_H
 #define	_FB_PARSERTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "config.h"
 
 #include "filebench.h"
@@ -68,8 +66,8 @@
 	char		*cmd_tgt1;
 	char		*cmd_tgt2;
 	char		*cmd_tgt3;
-	char		*cmd_tgt4;
 	char		*thread_name;
+	int		cmd_subtype;
 	uint64_t	cmd_qty;
 	struct cmd	*cmd_list;
 	struct cmd	*cmd_next;

--- a/usr/src/cmd/filebench/common/vars.c	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/vars.c	Fri Jun 05 10:28:40 2009 -0400
@@ -19,14 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * Portions Copyright 2008 Denis Cheng
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,6 +39,9 @@
 #include "fb_random.h"
 
 static var_t *var_find_dynamic(char *name);
+static boolean_t var_get_bool(var_t *var);
+static fbint_t var_get_int(var_t *var);
+static double var_get_dbl(var_t *var);
 
 /*
  * The filebench variables system has attribute value descriptors (avd_t)
@@ -152,7 +153,6 @@
 fbint_t
 avd_get_int(avd_t avd)
 {
-	var_t *ivp;
 	randdist_t *rndp;
 
 	if (avd == NULL)
@@ -169,21 +169,7 @@
 			return (0);
 
 	case AVD_IND_VAR:
-		if ((ivp = avd->avd_val.varptr) == NULL)
-			return (0);
-
-		if (VAR_HAS_INTEGER(ivp))
-			return (ivp->var_val.integer);
-
-		if (VAR_HAS_RANDDIST(ivp)) {
-			if ((rndp = ivp->var_val.randptr) != NULL)
-				return ((fbint_t)rndp->rnd_get(rndp));
-		}
-
-		filebench_log(LOG_ERROR,
-		    "Attempt to get integer from %s var $%s",
-		    var_get_type_string(ivp), ivp->var_name);
-		return (0);
+		return (var_get_int(avd->avd_val.varptr));
 
 	case AVD_IND_RANDVAR:
 		if ((rndp = avd->avd_val.randptr) == NULL)
@@ -207,7 +193,6 @@
 double
 avd_get_dbl(avd_t avd)
 {
-	var_t *ivp;
 	randdist_t *rndp;
 
 	if (avd == NULL)
@@ -233,22 +218,7 @@
 			return (0.0);
 
 	case AVD_IND_VAR:
-		ivp = avd->avd_val.varptr;
-
-		if (ivp && VAR_HAS_INTEGER(ivp))
-			return ((double)ivp->var_val.integer);
-
-		if (ivp && VAR_HAS_DOUBLE(ivp))
-			return (ivp->var_val.dbl_flt);
-
-		if (ivp && VAR_HAS_RANDDIST(ivp)) {
-			if ((rndp = ivp->var_val.randptr) != NULL)
-				return (rndp->rnd_get(rndp));
-		}
-		filebench_log(LOG_ERROR,
-		    "Attempt to get double float from %s var $%s",
-		    var_get_type_string(ivp), ivp->var_name);
-		return (0.0);
+		return (var_get_dbl(avd->avd_val.varptr));
 
 	case AVD_IND_RANDVAR:
 		if ((rndp = avd->avd_val.randptr) == NULL) {
@@ -270,8 +240,6 @@
 boolean_t
 avd_get_bool(avd_t avd)
 {
-	var_t *ivp;
-
 	if (avd == NULL)
 		return (0);
 
@@ -300,23 +268,7 @@
 		return (FALSE);
 
 	case AVD_IND_VAR:
-		if ((ivp = avd->avd_val.varptr) == NULL)
-			return (0);
-
-		if (VAR_HAS_BOOLEAN(ivp))
-			return (ivp->var_val.boolean);
-
-		if (VAR_HAS_INTEGER(ivp)) {
-			if (ivp->var_val.boolean)
-				return (TRUE);
-			else
-				return (FALSE);
-		}
-
-		filebench_log(LOG_ERROR,
-		    "Attempt to get boolean from %s var $%s",
-		    var_get_type_string(ivp), ivp->var_name);
-		return (FALSE);
+		return (var_get_bool(avd->avd_val.varptr));
 
 	default:
 		filebench_log(LOG_ERROR,
@@ -465,7 +417,11 @@
 
 	case VAR_TYPE_INDVAR_SET:
 		avd->avd_type = AVD_IND_VAR;
-		avd->avd_val.varptr = var->var_val.varptr;
+		if ((var->var_type & VAR_INDVAR_MASK) == VAR_IND_ASSIGN)
+			avd->avd_val.varptr = var->var_varptr1;
+		else
+			avd->avd_val.varptr = var;
+
 		break;
 
 	default:
@@ -666,6 +622,29 @@
 }
 
 /*
+ * Searches for the named var and returns it if found. If not
+ * found it allocates a new variable
+ */
+static var_t *
+var_find_alloc(char *name)
+{
+	var_t *var;
+
+	if (name == NULL) {
+		filebench_log(LOG_ERROR,
+		    "var_find_alloc: Var name not supplied");
+		return (NULL);
+	}
+
+	name += 1;
+
+	if ((var = var_find(name)) == NULL) {
+			var = var_alloc(name);
+	}
+	return (var);
+}
+
+/*
  * Searches for the named var, and, if found, sets its
  * var_val.boolean's value to that of the supplied boolean.
  * If not found, the routine allocates a new var and sets
@@ -678,19 +657,7 @@
 {
 	var_t *var;
 
-	if (name == NULL) {
-		filebench_log(LOG_ERROR,
-		    "var_assign_boolean: Name not supplied");
-		return (0);
-	}
-
-	name += 1;
-
-	if ((var = var_find(name)) == NULL) {
-			var = var_alloc(name);
-	}
-
-	if (var == NULL) {
+	if ((var = var_find_alloc(name)) == NULL) {
 		filebench_log(LOG_ERROR, "Cannot assign variable %s",
 		    name);
 		return (-1);
@@ -723,19 +690,7 @@
 {
 	var_t *var;
 
-	if (name == NULL) {
-		filebench_log(LOG_ERROR,
-		    "var_assign_integer: Name not supplied");
-		return (0);
-	}
-
-	name += 1;
-
-	if ((var = var_find(name)) == NULL) {
-			var = var_alloc(name);
-	}
-
-	if (var == NULL) {
+	if ((var = var_find_alloc(name)) == NULL) {
 		filebench_log(LOG_ERROR, "Cannot assign variable %s",
 		    name);
 		return (-1);
@@ -756,6 +711,201 @@
 }
 
 /*
+ * Add, subtract, multiply or divide two integers based on optype
+ * passed from caller.
+ */
+static fbint_t
+var_binary_integer_op(var_t *var)
+{
+	fbint_t result;
+	fbint_t src1, src2;
+
+	if (var == NULL)
+		return (0);
+
+	switch (var->var_type & VAR_INDBINOP_MASK) {
+	case VAR_IND_BINOP_INT:
+		src2 = var->var_val.integer;
+		break;
+
+	case VAR_IND_BINOP_DBL:
+		src2 = (fbint_t)var->var_val.dbl_flt;
+		break;
+
+	case VAR_IND_BINOP_VAR:
+		if (var->var_val.varptr2 != NULL)
+			src2 = var_get_int(var->var_val.varptr2);
+		else
+			src2 = 0;
+		break;
+	}
+
+	if (var->var_varptr1 != NULL)
+		src1 = var_get_int(var->var_varptr1);
+	else
+		src1 = 0;
+
+	switch (var->var_type & VAR_INDVAR_MASK) {
+	case VAR_IND_VAR_SUM_VC:
+		result = src1 + src2;
+		break;
+
+	case VAR_IND_VAR_DIF_VC:
+		result = src1 - src2;
+		break;
+
+	case VAR_IND_C_DIF_VAR:
+		result = src2 - src1;
+		break;
+
+	case VAR_IND_VAR_MUL_VC:
+		result = src1 * src2;
+		break;
+
+	case VAR_IND_VAR_DIV_VC:
+		result = src1 / src2;
+		break;
+
+	case VAR_IND_C_DIV_VAR:
+		result = src2 / src1;
+		break;
+
+	default:
+		filebench_log(LOG_DEBUG_IMPL,
+		    "var_binary_integer_op: Called with unknown IND_TYPE");
+		result = 0;
+		break;
+	}
+	return (result);
+}
+
+/*
+ * Add, subtract, multiply or divide two double precision floating point
+ * numbers based on optype passed from caller.
+ */
+static double
+var_binary_dbl_flt_op(var_t *var)
+{
+	double result;
+	double src1, src2;
+
+	if (var == NULL)
+		return (0.0);
+
+	switch (var->var_type & VAR_INDBINOP_MASK) {
+	case VAR_IND_BINOP_INT:
+		src2 = (double)var->var_val.integer;
+		break;
+
+	case VAR_IND_BINOP_DBL:
+		src2 = var->var_val.dbl_flt;
+		break;
+
+	case VAR_IND_BINOP_VAR:
+		if (var->var_val.varptr2 != NULL)
+			src2 = var_get_dbl(var->var_val.varptr2);
+		else
+			src2 = 0;
+		break;
+	}
+
+	if (var->var_varptr1 != NULL)
+		src1 = var_get_dbl(var->var_varptr1);
+	else
+		src1 = 0;
+
+	switch (var->var_type & VAR_INDVAR_MASK) {
+	case VAR_IND_VAR_SUM_VC:
+		result = src1 + src2;
+		break;
+
+	case VAR_IND_VAR_DIF_VC:
+		result = src1 - src2;
+		break;
+
+	case VAR_IND_C_DIF_VAR:
+		result = src2 - src1;
+		break;
+
+	case VAR_IND_VAR_MUL_VC:
+		result = src1 * src2;
+		break;
+
+	case VAR_IND_C_DIV_VAR:
+		result = src2 / src1;
+		break;
+
+	case VAR_IND_VAR_DIV_VC:
+		result = src1 / src2;
+		break;
+
+	default:
+		filebench_log(LOG_DEBUG_IMPL,
+		    "var_binary_dbl_flt_op: Called with unknown IND_TYPE");
+		result = 0;
+		break;
+	}
+	return (result);
+}
+
+/*
+ * Perform a binary operation on a variable and an integer
+ */
+int
+var_assign_op_var_int(char *name, int optype, char *src1, fbint_t src2)
+{
+	var_t *var;
+	var_t *var_src1;
+
+	if ((var_src1 = var_find(src1+1)) == NULL)
+		return (FILEBENCH_ERROR);
+
+	if ((var = var_find_alloc(name)) == NULL)
+		return (FILEBENCH_ERROR);
+
+	if ((var->var_type & VAR_TYPE_MASK) == VAR_TYPE_RANDOM) {
+		filebench_log(LOG_ERROR,
+		    "Cannot assign integer to random variable %s", name);
+		return (FILEBENCH_ERROR);
+	}
+
+	VAR_SET_BINOP_INDVAR(var, var_src1, optype);
+
+	var->var_val.integer = src2;
+
+	return (FILEBENCH_OK);
+}
+
+int
+var_assign_op_var_var(char *name, int optype, char *src1, char *src2)
+{
+	var_t *var;
+	var_t *var_src1;
+	var_t *var_src2;
+
+	if ((var_src1 = var_find(src1+1)) == NULL)
+		return (FILEBENCH_ERROR);
+
+	if ((var_src2 = var_find(src2+1)) == NULL)
+		return (FILEBENCH_ERROR);
+
+	if ((var = var_find_alloc(name)) == NULL)
+		return (FILEBENCH_ERROR);
+
+	if ((var->var_type & VAR_TYPE_MASK) == VAR_TYPE_RANDOM) {
+		filebench_log(LOG_ERROR,
+		    "Cannot assign integer to random variable %s", name);
+		return (FILEBENCH_ERROR);
+	}
+
+	VAR_SET_BINOP_INDVAR(var, var_src1, optype);
+
+	var->var_val.varptr2 = var_src2;
+
+	return (FILEBENCH_OK);
+}
+
+/*
  * Find a variable, and set it to random type.
  * If it does not have a random extension, allocate one
  */
@@ -853,27 +1003,12 @@
 	return (avd_alloc_var_ptr(var));
 }
 
-
 /*
- * Searches for the named var, and if found copies the var_val.string,
- * if it exists, a decimal number string representation of
- * var_val.integer, the state of var_val.boolean, or the type of random
- * distribution employed, into a malloc'd bit of memory using fb_stralloc().
- * Returns a pointer to the created string, or NULL on failure.
+ * Converts the contents of a var to a string
  */
-char *
-var_to_string(char *name)
+static char *
+var_get_string(var_t *var)
 {
-	var_t *var;
-	char tmp[128];
-
-	name += 1;
-
-	if ((var = var_find(name)) == NULL)
-		var = var_find_dynamic(name);
-
-	if (var == NULL)
-		return (NULL);
 
 	if ((var->var_type & VAR_TYPE_MASK) == VAR_TYPE_RANDOM) {
 		switch (var->var_val.randptr->rnd_type & RAND_TYPE_MASK) {
@@ -899,15 +1034,142 @@
 	}
 
 	if (VAR_HAS_INTEGER(var)) {
+		char tmp[128];
+
 		(void) snprintf(tmp, sizeof (tmp), "%llu",
 		    (u_longlong_t)var->var_val.integer);
 		return (fb_stralloc(tmp));
 	}
 
+	if (VAR_HAS_INDVAR(var)) {
+		var_t *ivp;
+
+		if ((ivp = var->var_varptr1) != NULL) {
+			return (var_get_string(ivp));
+		}
+	}
+
+	if (VAR_HAS_BINOP(var)) {
+		char tmp[128];
+
+		(void) snprintf(tmp, sizeof (tmp), "%llu",
+		    var_binary_integer_op(var));
+		return (fb_stralloc(tmp));
+	}
+
 	return (fb_stralloc("No default"));
 }
 
 /*
+ * Searches for the named var, and if found copies the var_val.string,
+ * if it exists, a decimal number string representation of
+ * var_val.integer, the state of var_val.boolean, or the type of random
+ * distribution employed, into a malloc'd bit of memory using fb_stralloc().
+ * Returns a pointer to the created string, or NULL on failure.
+ */
+char *
+var_to_string(char *name)
+{
+	var_t *var;
+
+	name += 1;
+
+	if ((var = var_find(name)) == NULL)
+		var = var_find_dynamic(name);
+
+	if (var == NULL)
+		return (NULL);
+
+	return (var_get_string(var));
+}
+
+/*
+ * Returns the boolean from the supplied var_t "var".
+ */
+static boolean_t
+var_get_bool(var_t *var)
+{
+	if (var == NULL)
+		return (0);
+
+	if (VAR_HAS_BOOLEAN(var))
+		return (var->var_val.boolean);
+
+	if (VAR_HAS_INTEGER(var)) {
+		if (var->var_val.integer == 0)
+			return (FALSE);
+		else
+			return (TRUE);
+	}
+
+	filebench_log(LOG_ERROR,
+	    "Attempt to get boolean from %s var $%s",
+	    var_get_type_string(var), var->var_name);
+	return (FALSE);
+}
+
+/*
+ * Returns the fbint_t from the supplied var_t "var".
+ */
+static fbint_t
+var_get_int(var_t *var)
+{
+	randdist_t *rndp;
+
+	if (var == NULL)
+		return (0);
+
+	if (VAR_HAS_INTEGER(var))
+		return (var->var_val.integer);
+
+	if (VAR_HAS_RANDDIST(var)) {
+		if ((rndp = var->var_val.randptr) != NULL)
+			return ((fbint_t)rndp->rnd_get(rndp));
+	}
+
+	if (VAR_HAS_BINOP(var))
+		return (var_binary_integer_op(var));
+
+	filebench_log(LOG_ERROR,
+	    "Attempt to get integer from %s var $%s",
+	    var_get_type_string(var), var->var_name);
+	return (0);
+}
+
+/*
+ * Returns the floating point value of a variable pointed to by the
+ * supplied var_t "var". Intended to get the actual (double) value
+ * supplied by the random variable.
+ */
+static double
+var_get_dbl(var_t *var)
+{
+	randdist_t *rndp;
+
+	if (var == NULL)
+		return (0.0);
+
+	if (VAR_HAS_INTEGER(var))
+		return ((double)var->var_val.integer);
+
+	if (VAR_HAS_DOUBLE(var))
+		return (var->var_val.dbl_flt);
+
+	if (VAR_HAS_RANDDIST(var)) {
+		if ((rndp = var->var_val.randptr) != NULL)
+			return (rndp->rnd_get(rndp));
+	}
+
+	if (VAR_HAS_BINOP(var))
+		return (var_binary_dbl_flt_op(var));
+
+	filebench_log(LOG_ERROR,
+	    "Attempt to get double float from %s var $%s",
+	    var_get_type_string(var), var->var_name);
+	return (0.0);
+}
+
+/*
  * Searches for the named var, and if found returns the value,
  * of var_val.boolean. If the var is not found, or a boolean
  * value has not been set, logs an error and returns 0.
@@ -922,13 +1184,13 @@
 	if ((var = var_find(name)) == NULL)
 		var = var_find_dynamic(name);
 
-	if ((var != NULL) && VAR_HAS_BOOLEAN(var))
-		return (var->var_val.boolean);
+	if (var != NULL)
+		return (var_get_bool(var));
 
 	filebench_log(LOG_ERROR,
 	    "Variable %s referenced before set", name);
 
-	return (0);
+	return (FALSE);
 }
 
 /*
@@ -946,8 +1208,8 @@
 	if ((var = var_find(name)) == NULL)
 		var = var_find_dynamic(name);
 
-	if ((var != NULL) && VAR_HAS_INTEGER(var))
-		return (var->var_val.integer);
+	if (var != NULL)
+		return (var_get_int(var));
 
 	filebench_log(LOG_ERROR,
 	    "Variable %s referenced before set", name);
@@ -956,6 +1218,30 @@
 }
 
 /*
+ * Searches for the named var, and if found returns the value,
+ * of var_val.dbl_flt. If the var is not found, or the
+ * floating value has not been set, logs an error and returns 0.0.
+ */
+double
+var_to_double(char *name)
+{
+	var_t *var;
+
+	name += 1;
+
+	if ((var = var_find(name)) == NULL)
+		var = var_find_dynamic(name);
+
+	if (var != NULL)
+		return (var_get_dbl(var));
+
+	filebench_log(LOG_ERROR,
+	    "Variable %s referenced before set", name);
+
+	return (0.0);
+}
+
+/*
  * Searches for the named random var, and if found, converts the
  * requested parameter into a string or a decimal number string
  * representation, into a malloc'd bit of memory using fb_stralloc().
@@ -1074,7 +1360,7 @@
 	}
 
 	if (VAR_HAS_INDVAR(src_var)) {
-		VAR_SET_INDVAR(dst_var, src_var->var_val.varptr);
+		VAR_SET_INDVAR(dst_var, src_var->var_varptr1);
 		filebench_log(LOG_DEBUG_SCRIPT,
 		    "Assign var %s to var %s", dst_var->var_name,
 		    src_var->var_name);
@@ -1586,7 +1872,7 @@
 	if (VAR_HAS_INDVAR(proto_lvar)) {
 		var_t *uplvp;
 
-		uplvp = (var_t *)proto_lvar->var_val.varptr;
+		uplvp = (var_t *)proto_lvar->var_varptr1;
 
 		/* search for more current uplvar on comp master list */
 		if (mstr_lvars) {
@@ -1596,6 +1882,6 @@
 		}
 
 		if (VAR_HAS_INDVAR(uplvp))
-			VAR_SET_INDVAR(newlvar, uplvp->var_val.varptr);
+			VAR_SET_INDVAR(newlvar, uplvp->var_varptr1);
 	}
 }

--- a/usr/src/cmd/filebench/common/vars.h	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/common/vars.h	Fri Jun 05 10:28:40 2009 -0400
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -90,22 +90,64 @@
 		double		dbl_flt;
 		char		*string;
 		struct randdist *randptr;
-		struct var	*varptr;
+		struct var	*varptr2;
 	} var_val;
+	struct var	*var_varptr1;
 } var_t;
 
-#define	VAR_TYPE_GLOBAL		0x00	/* global variable */
-#define	VAR_TYPE_DYNAMIC	0x01	/* Dynamic variable */
-#define	VAR_TYPE_RANDOM		0x02	/* random variable */
-#define	VAR_TYPE_LOCAL		0x03	/* Local variable */
-#define	VAR_TYPE_MASK		0x0f
-#define	VAR_TYPE_BOOL_SET	0x10	/* var contains a boolean */
-#define	VAR_TYPE_INT_SET	0x20	/* var contains an integer */
-#define	VAR_TYPE_STR_SET	0x30	/* var contains a string */
-#define	VAR_TYPE_DBL_SET	0x40	/* var contains a double */
-#define	VAR_TYPE_RAND_SET	0x50	/* var contains a randdist pointer */
-#define	VAR_TYPE_INDVAR_SET	0x60    /* var points to another local var */
-#define	VAR_TYPE_SET_MASK	0xf0
+/* basic var types */
+#define	VAR_TYPE_GLOBAL		0x0000	/* global variable */
+#define	VAR_TYPE_DYNAMIC	0x1000	/* Dynamic variable */
+#define	VAR_TYPE_RANDOM		0x2000	/* random variable */
+#define	VAR_TYPE_LOCAL		0x3000	/* Local variable */
+#define	VAR_TYPE_MASK		0xf000
+
+/* various var subtypes that a var can be set to */
+#define	VAR_TYPE_BOOL_SET	0x0100	/* var contains a boolean */
+#define	VAR_TYPE_INT_SET	0x0200	/* var contains an integer */
+#define	VAR_TYPE_STR_SET	0x0300	/* var contains a string */
+#define	VAR_TYPE_DBL_SET	0x0400	/* var contains a double */
+#define	VAR_TYPE_RAND_SET	0x0500	/* var contains a randdist pointer */
+#define	VAR_TYPE_INDVAR_SET	0x0700	/* var points to another variable(s) */
+#define	VAR_TYPE_SET_MASK	0x0f00
+
+/* indirection to another variable or variables with binary op */
+#define	VAR_IND_ASSIGN		0x0000	/* just assignment to another var */
+#define	VAR_IND_BINOP_INT	0x0010	/* binary op with an integer */
+#define	VAR_IND_BINOP_DBL	0x0020	/* binary op with a double float */
+#define	VAR_IND_BINOP_VAR	0x0030	/* binary op with another var */
+#define	VAR_INDBINOP_MASK	0x00f0
+
+
+#define	VAR_IND_VAR_SUM_VC	0x0001	/* var sums var | cnst and *varptr1 */
+#define	VAR_IND_VAR_DIF_VC	0x0002	/* var subs var | cnst and *varptr1 */
+#define	VAR_IND_C_DIF_VAR	0x0003	/* var subs *varptr1 and constant */
+#define	VAR_IND_VAR_MUL_VC	0x0005	/* var muls var | cnst and *varptr1 */
+#define	VAR_IND_VAR_DIV_VC	0x0006	/* var divs var | cnst by *varptr1 */
+#define	VAR_IND_C_DIV_VAR	0x0007	/* var divs *varptr1 by constant */
+#define	VAR_INDVAR_MASK		0x000f
+
+/* Binary ops between an integer and a variable */
+#define	VAR_IND_INT_SUM_IV	(VAR_IND_BINOP_INT | VAR_IND_VAR_SUM_VC)
+#define	VAR_IND_IV_DIF_INT	(VAR_IND_BINOP_INT | VAR_IND_VAR_DIF_VC)
+#define	VAR_IND_INT_DIF_IV	(VAR_IND_BINOP_INT | VAR_IND_C_DIF_VAR)
+#define	VAR_IND_INT_MUL_IV	(VAR_IND_BINOP_INT | VAR_IND_VAR_MUL_VC)
+#define	VAR_IND_IV_DIV_INT	(VAR_IND_BINOP_INT | VAR_IND_VAR_DIV_VC)
+#define	VAR_IND_INT_DIV_IV	(VAR_IND_BINOP_INT | VAR_IND_C_DIV_VAR)
+
+/* Binary ops between a double float and a variable */
+#define	VAR_IND_DBL_SUM_IV	(VAR_IND_BINOP_DBL | VAR_IND_VAR_SUM_VC)
+#define	VAR_IND_IV_DIF_DBL	(VAR_IND_BINOP_DBL | VAR_IND_VAR_DIF_VC)
+#define	VAR_IND_DBL_DIF_IV	(VAR_IND_BINOP_DBL | VAR_IND_C_DIF_VAR)
+#define	VAR_IND_DBL_MUL_IV	(VAR_IND_BINOP_DBL | VAR_IND_VAR_MUL_VC)
+#define	VAR_IND_IV_DIV_DBL	(VAR_IND_BINOP_DBL | VAR_IND_VAR_DIV_VC)
+#define	VAR_IND_DBL_DIV_IV	(VAR_IND_BINOP_DBL | VAR_IND_C_DIV_VAR)
+
+/* Binary ops between two variables: varptr2 op varptr1 */
+#define	VAR_IND_IV_SUM_IV	(VAR_IND_BINOP_VAR | VAR_IND_VAR_SUM_VC)
+#define	VAR_IND_IV_DIF_IV	(VAR_IND_BINOP_VAR | VAR_IND_VAR_DIF_VC)
+#define	VAR_IND_IV_MUL_IV	(VAR_IND_BINOP_VAR | VAR_IND_VAR_MUL_VC)
+#define	VAR_IND_IV_DIV_IV	(VAR_IND_BINOP_VAR | VAR_IND_VAR_DIV_VC)
 
 #define	VAR_HAS_BOOLEAN(vp) \
 	(((vp)->var_type & VAR_TYPE_SET_MASK) == VAR_TYPE_BOOL_SET)
@@ -123,7 +165,12 @@
 	(((vp)->var_type & VAR_TYPE_SET_MASK) == VAR_TYPE_RAND_SET)
 
 #define	VAR_HAS_INDVAR(vp) \
-	(((vp)->var_type & VAR_TYPE_SET_MASK) == VAR_TYPE_INDVAR_SET)
+	((((vp)->var_type & VAR_TYPE_SET_MASK) == VAR_TYPE_INDVAR_SET) && \
+	(((vp)->var_type & VAR_INDBINOP_MASK) == VAR_IND_ASSIGN))
+
+#define	VAR_HAS_BINOP(vp) \
+	((((vp)->var_type & VAR_TYPE_SET_MASK) == VAR_TYPE_INDVAR_SET) && \
+	(((vp)->var_type & VAR_INDBINOP_MASK) != VAR_IND_ASSIGN))
 
 #define	VAR_SET_BOOL(vp, val)	\
 	{			\
@@ -165,12 +212,22 @@
 
 #define	VAR_SET_INDVAR(vp, val)	\
 	{			\
-		(vp)->var_val.varptr = (val); \
+		(vp)->var_varptr1 = (val); \
 		(vp)->var_type = \
-		    (((vp)->var_type & (~VAR_TYPE_SET_MASK)) | \
+		    (((vp)->var_type & (~(VAR_TYPE_SET_MASK | \
+		    VAR_INDVAR_MASK))) | \
 		    VAR_TYPE_INDVAR_SET); \
 	}
 
+#define	VAR_SET_BINOP_INDVAR(vp, val, st)	\
+	{			\
+		(vp)->var_varptr1 = (val); \
+		(vp)->var_type = \
+		    (((vp)->var_type & (~(VAR_TYPE_SET_MASK | \
+		    VAR_INDVAR_MASK))) | \
+		    (VAR_TYPE_INDVAR_SET | st)); \
+	}
+
 avd_t avd_bool_alloc(boolean_t bool);
 avd_t avd_int_alloc(fbint_t integer);
 avd_t avd_str_alloc(char *string);
@@ -185,12 +242,15 @@
 int var_assign_double(char *name, double dbl);
 int var_assign_string(char *name, char *string);
 int var_assign_var(char *name, char *string);
+int var_assign_op_var_int(char *name, int optype, char *src1, fbint_t src2);
+int var_assign_op_var_var(char *name, int optype, char *src1, char *src2);
 void var_update_comp_lvars(var_t *newlvar, var_t *proto_comp_vars,
     var_t *mstr_lvars);
 var_t *var_define_randvar(char *name);
 var_t *var_find_randvar(char *name);
 boolean_t var_to_boolean(char *name);
 fbint_t var_to_integer(char *name);
+double var_to_double(char *name);
 var_t *var_lvar_alloc_local(char *name);
 var_t *var_lvar_assign_boolean(char *name, boolean_t);
 var_t *var_lvar_assign_integer(char *name, fbint_t);

--- a/usr/src/cmd/filebench/config/newfeatures.prof	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/config/newfeatures.prof	Fri Jun 05 10:28:40 2009 -0400
@@ -42,6 +42,12 @@
         personality = filemicro_seqwriterandvartab;
 }
 
+CONFIG rate_limit_copy {
+	function = generic;
+	personality = ratelimcopyfiles;
+	eventrate = 20;
+}
+
 CONFIG list_dirs_test {
 	function = generic;
 	personality = listdirs;
@@ -69,7 +75,7 @@
 	numactivevids = 4;
 	numpassivevids = 20;
 	nthreads = 6;
-	srvbwrate = 12;
+	eventrate = 12;
 	repintval = 20;
 	passvidsname = bigfileset;
 	actvidsname = u2fileset;
@@ -82,6 +88,12 @@
 	warmuptime = 120;
 }
 
+CONFIG network_file_system {
+        function = generic;
+        personality = networkfs;
+	warmuptime = 120;
+}
+
 CONFIG composite_flowop_test {
         function = generic;
         personality = compflow_demo;

--- a/usr/src/cmd/filebench/config/videoserver.prof	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/config/videoserver.prof	Fri Jun 05 10:28:40 2009 -0400
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -38,6 +38,6 @@
 	numactivevids = 8;
 	numpassivevids = 40;
 	nthreads = 16;
-	srvbwrate = 32;
+	eventrate = 32;
 	repintval = 60;
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/filebench/workloads/networkfs.f	Fri Jun 05 10:28:40 2009 -0400
@@ -0,0 +1,131 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# $dir - directory for datafiles
+# $eventrate - event generator rate (0 == free run)
+# $nfiles - number of data files
+# $nthreads - number of worker threads
+
+set $dir=/tmp
+set $cached=false
+set $eventrate=10
+set $meandirwidth=20
+set $nthreads=1
+set $nfiles=10000
+set $sync=false
+set $totalfiles=$nfiles * $eventrate
+
+eventgen rate=$eventrate
+
+define randvar name=$wrtiosize, type=tabular, min=1k, round=1k, randtable =
+{{ 0,   1k,    7k},
+ {50,   9k,   15k},
+ {14,  17k,   23k},
+ {14,  33k,   39k},
+ {12,  65k,   71k},
+ {10, 129k,  135k}
+}
+
+define randvar name=$rdiosize, type=tabular, min=8k, round=1k, randtable =
+{{85,   8k,   8k},
+ { 8,  17k,  23k},
+ { 4,  33k,  39k},
+ { 2,  65k,  71k},
+ { 1, 129k, 135k}
+}
+
+define randvar name=$filesize, type=tabular, min=1k, round=1k, randtable =
+{{33,   1k,    1k},
+ {21,   1k,    3k},
+ {13,   3k,    5k},
+ {10,   5k,   11k},
+ {08,  11k,   21k},
+ {05,  21k,   43k},
+ {04,  43k,   85k},
+ {03,  85k,  171k},
+ {02, 171k,  341k},
+ {01, 341k, 1707k}
+}
+
+define randvar name=$fileidx, type=gamma, min=0, gamma=100
+
+define fileset name=bigfileset,path=$dir,size=$filesize,entries=$totalfiles,dirwidth=$meandirwidth,prealloc=60,cached=$cached
+
+define flowop name=rmw, $filesetrmw
+{
+  flowop openfile name=openfile1,filesetname=$filesetrmw,indexed=$fileidx,fd=1
+  flowop readwholefile name=readfile1,iosize=$rdiosize,fd=1
+  flowop createfile name=newfile2,filesetname=$filesetrmw,indexed=$fileidx,fd=2
+  flowop writewholefile name=writefile2,fd=2,iosize=$wrtiosize,srcfd=1
+  flowop closefile name=closefile1,fd=1
+  flowop closefile name=closefile2,fd=2
+  flowop deletefile name=deletefile1,fd=1
+}
+
+define flowop name=launch, $filesetlch
+{
+  flowop openfile name=openfile3,filesetname=$filesetlch,indexed=$fileidx,fd=3
+  flowop readwholefile name=readfile3,iosize=$rdiosize,fd=3
+  flowop openfile name=openfile4,filesetname=$filesetlch,indexed=$fileidx,fd=4
+  flowop readwholefile name=readfile4,iosize=$rdiosize,fd=4
+  flowop closefile name=closefile3,fd=3
+  flowop openfile name=openfile5,filesetname=$filesetlch,indexed=$fileidx,fd=5
+  flowop readwholefile name=readfile5,iosize=$rdiosize,fd=5
+  flowop closefile name=closefile4,fd=4
+  flowop closefile name=closefile5,fd=5
+}
+
+define flowop name=appnd, $filesetapd
+{
+  flowop openfile name=openfile6,filesetname=$filesetapd,indexed=$fileidx,fd=6
+  flowop appendfilerand name=appendfilerand6,iosize=$wrtiosize,fd=6
+  flowop closefile name=closefile6,fd=6
+}
+
+define process name=netclient,instances=1
+{
+  thread name=fileuser,memsize=10m,instances=$nthreads
+  {
+    flowop launch name=launch1, iters=1, $filesetlch=bigfileset
+    flowop rmw name=rmw1, iters=6, $filesetrmw=bigfileset
+    flowop appnd name=appnd1, iters=3, $filesetapd=bigfileset
+    flowop statfile name=statfile1,filesetname=bigfileset,indexed=$fileidx
+    flowop eventlimit name=ratecontrol
+  }
+}
+
+echo  "NetworkFileServer Version 1.0 personality successfully loaded"
+usage "Usage: set \$dir=<dir>            defaults to $dir"
+usage "       set \$cached=<bool>        defaults to $cached"
+usage "       set \$eventrate=<value>    defaults to $eventrate"
+usage "       set \$wrtiosize.type=<type>   defaults to $wrtiosize.type"
+usage "       set \$wrtiosize.randsrc=<src> defaults to $wrtiosize.randsrc"
+usage "       set \$rdiosize.type=<type>   defaults to $rdiosize.type"
+usage "       set \$rdiosize.randsrc=<src> defaults to $rdiosize.randsrc"
+usage "       set \$filesize.type=<type>   defaults to $filesize.type"
+usage "       set \$filesize.randsrc=<src> defaults to $filesize.randsrc"
+usage "       set \$nfiles=<value>       defaults to $nfiles"
+usage "       set \$nthreads=<value>     defaults to $nthreads"
+usage "       set \$sync=<bool>          defaults to $sync"
+usage " "
+usage "       run runtime (e.g. run 60)"

--- a/usr/src/cmd/filebench/workloads/oltp.f	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/workloads/oltp.f	Fri Jun 05 10:28:40 2009 -0400
@@ -19,17 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-
+# $dir - directory for datafiles
+# $eventrate - event generator rate (0 == free run)
 # $iosize - iosize for database block access
-# $dir - directory for datafiles
 # $nshadows - number of shadow processes
 # $ndbwriters - number of database writers
-#
+# $nfiles - number of data files
+# $nlogfiles - number of log files
+
 set $dir=/tmp
+set $eventrate=0
 set $runtime=30
 set $iosize=2k
 set $nshadows=200
@@ -44,6 +46,8 @@
 set $nlogfiles=1
 set $directio=0
 
+eventgen rate = $eventrate
+
 # Define a datafile and logfile
 define fileset name=datafiles,path=$dir,size=$filesize,filesizegamma=0,entries=$nfiles,dirwidth=1024,prealloc=100,cached=$cached,reuse
 define fileset name=logfile,path=$dir,size=$logfilesize,filesizegamma=0,entries=$nlogfiles,dirwidth=1024,prealloc=100,cached=$cached,reuse
@@ -86,8 +90,10 @@
   }
 }
 
-echo "OLTP Version 2.2 personality successfully loaded"
-usage "Usage: set \$dir=<dir>"
+echo "OLTP Version 2.3 personality successfully loaded"
+usage "Usage: set \$dir=<dir>         defaults to $dir"
+usage " "
+usage "       set \$eventrate=<value> defaults to $eventrate"
 usage " "
 usage "       set \$filesize=<size>   defaults to $filesize, n.b. there are ten files of this size"
 usage " "

--- a/usr/src/cmd/filebench/workloads/randomfileaccess.f	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/workloads/randomfileaccess.f	Fri Jun 05 10:28:40 2009 -0400
@@ -18,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# 
+# Exercises the indexed attribute of the fileset_pick() function. 
 # 
 
 set $dir=/tmp
 set $cached=false
 set $meandirwidth=20
 set $nthreads=5
-set $nfiles=100000
+set $nfiles=10000
 set $sync=false
 
 define randvar name=$wrtiosize, min=512, round=512, type=gamma, mean=16k
@@ -53,7 +53,7 @@
 
 define randvar name=$fileidx, type=gamma, min=0, gamma=100
 
-define fileset name=bigfileset,path=$dir,size=$filesize,entries=$nfiles,dirwidth=$meandirwidth,prealloc=60,cached=$cached
+define fileset name=bigfileset,path=$dir,size=$filesize,entries=$nfiles,dirwidth=$meandirwidth,prealloc=100,cached=$cached
 
 define process name=netclient,instances=1
 {
@@ -67,16 +67,11 @@
     flowop readwholefile name=readfile1,iosize=$rdiosize,fd=2
     flowop readwholefile name=readfile2,iosize=$rdiosize,fd=3
     flowop closefile name=closefile2,fd=2
-    flowop createfile name=newfile1,filesetname=bigfileset,indexed=$fileidx,fd=1
-    flowop writewholefile name=writefile1,iosize=$wrtiosize,srcfd=1,fd=1
     flowop closefile name=closefile3,fd=3
-    flowop deletefile name=deletefile1,filesetname=bigfileset,fd=2
-    flowop statfile name=statfile1,filesetname=bigfileset,fd=1
-    flowop closefile name=closefile4,fd=1
   }
 }
 
-echo  "NetworkServer Version 1.0 personality successfully loaded"
+echo  "NetworkServer Version 1.1 personality successfully loaded"
 usage "Usage: set \$dir=<dir>            defaults to $dir"
 usage "       set \$cached=<bool>        defaults to $cached"
 usage "       set \$wrtiosize.type=<type>   defaults to $wrtiosize.type"

--- a/usr/src/cmd/filebench/workloads/randomread.f	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/workloads/randomread.f	Fri Jun 05 10:28:40 2009 -0400
@@ -19,18 +19,25 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# $dir - directory for datafiles
+# $eventrate - event generator rate (0 == free run)
+# $filesize - size of data file
+# $iosize - size of each read
+# $nthreads - number of worker threads
 
 set $dir=/tmp
-set $nthreads=1
+set $eventrate=0
+set $filesize=1m
 set $iosize=8k
-set $filesize=1m
+set $nthreads=1
 set $workingset=0
 set $directio=0
 
+eventgen rate=$eventrate
+
 define file name=largefile1,path=$dir,size=$filesize,prealloc,reuse,paralloc
 
 define process name=rand-read,instances=1
@@ -42,8 +49,9 @@
   }
 }
 
-echo "Random Read Version 2.0 IO personality successfully loaded"
-usage "Usage: set \$dir=<dir>"
+echo "Random Read Version 2.1 IO personality successfully loaded"
+usage "Usage: set \$dir=<dir>         defaults to $dir"
+usage "       set \$eventrate=<value> defaults to $eventrate"
 usage "       set \$filesize=<size>   defaults to $filesize"
 usage "       set \$iosize=<value>    defaults to $iosize"
 usage "       set \$nthreads=<value>  defaults to $nthreads"

--- a/usr/src/cmd/filebench/workloads/randomrw.f	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/workloads/randomrw.f	Fri Jun 05 10:28:40 2009 -0400
@@ -19,18 +19,25 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# $dir - directory for datafiles
+# $eventrate - event generator rate (0 == free run)
+# $filesize - size of data file
+# $iosize - size of each I/O request
+# $nthreads - number of worker threads
 
 set $dir=/tmp
-set $nthreads=1
+set $eventrate=0
+set $filesize=1m
 set $iosize=8k
-set $filesize=1m
+set $nthreads=1
 set $workingset=0
 set $directio=0
 
+eventgen rate=$eventrate
+
 define file name=largefile1,path=$dir,size=$filesize,prealloc,reuse,paralloc
 
 define process name=rand-rw,instances=1
@@ -38,17 +45,18 @@
   thread name=rand-r-thread,memsize=5m,instances=$nthreads
   {
     flowop read name=rand-read1,filename=largefile1,iosize=$iosize,random,workingset=$workingset,directio=$directio
-    flowop eventlimit name=rand-rate
+    flowop eventlimit name=rand-rdrate
   }
   thread name=rand-w-thread,memsize=5m,instances=$nthreads
   {
     flowop write name=rand-write1,filename=largefile1,iosize=$iosize,random,workingset=$workingset,directio=$directio
-    flowop eventlimit name=rand-rate
+    flowop eventlimit name=rand-wtrate
   }
 }
 
-echo "Random RW Version 2.0 IO personality successfully loaded"
-usage "Usage: set \$dir=<dir>"
+echo "Random RW Version 2.1 IO personality successfully loaded"
+usage "Usage: set \$dir=<dir>         defaults to $dir"
+usage "       set \$eventrate=<value> defaults to $eventrate"
 usage "       set \$filesize=<size>   defaults to $filesize"
 usage "       set \$iosize=<value>    defaults to $iosize"
 usage "       set \$nthreads=<value>  defaults to $nthreads"

--- a/usr/src/cmd/filebench/workloads/randomwrite.f	Fri Jun 05 10:27:16 2009 -0400
+++ b/usr/src/cmd/filebench/workloads/randomwrite.f	Fri Jun 05 10:28:40 2009 -0400
@@ -19,18 +19,25 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# $dir - directory for datafiles
+# $eventrate - event generator rate (0 == free run)
+# $filesize - size of data file
+# $iosize - size of each I/O request
+# $nthreads - number of worker threads
 
 set $dir=/tmp
-set $nthreads=1
+set $eventrate=0
+set $filesize=1m
 set $iosize=8k
-set $filesize=1m
+set $nthreads=1
 set $workingset=0
 set $directio=0
 
+eventgen rate=$eventrate
+
 define file name=largefile1,path=$dir,size=$filesize,prealloc,reuse,paralloc
 
 define process name=rand-write,instances=1
@@ -42,8 +49,9 @@
   }
 }
 
-echo "Random Write Version 2.0 IO personality successfully loaded"
-usage "Usage: set \$dir=<dir>"
+echo "Random Write Version 2.1 IO personality successfully loaded"
+usage "Usage: set \$dir=<dir>         defaults to $dir"
+usage "       set \$eventrate=<value> defaults to $eventrate"
 usage "       set \$filesize=<size>   defaults to $filesize"
 usage "       set \$iosize=<value>    defaults to $iosize"
 usage "       set \$nthreads=<value>  defaults to $nthreads"