[csw-devel] SF.net SVN: gar:[17455] csw/mgar/pkg/iozone/trunk

aironskin at users.sourceforge.net aironskin at users.sourceforge.net
Mon Mar 19 12:10:16 CET 2012


Revision: 17455
          http://gar.svn.sourceforge.net/gar/?rev=17455&view=rev
Author:   aironskin
Date:     2012-03-19 11:10:16 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
iozone/trunk: Updated build recipe

Modified Paths:
--------------
    csw/mgar/pkg/iozone/trunk/Makefile
    csw/mgar/pkg/iozone/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec
    csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff
    csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h

Modified: csw/mgar/pkg/iozone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iozone/trunk/Makefile	2012-03-19 09:28:36 UTC (rev 17454)
+++ csw/mgar/pkg/iozone/trunk/Makefile	2012-03-19 11:10:16 UTC (rev 17455)
@@ -1,58 +1,58 @@
 NAME = iozone
-VERSION = 3.291
+VERSION = 3.398
 DISTVERSION = $(shell echo $(VERSION) | sed -e 's/\./_/g')
-GARTYPE = v1
+GARTYPE = v2
 CATEGORIES = apps
 
-DESCRIPTION = IO benchmarking tool
+DESCRIPTION = I/O benchmarking tool
 define BLURB
   IOzone is a filesystem benchmark tool. The benchmark
   generates and measures a variety of file operations.
-  Iozone has been ported to many machines and runs under
-  many operating systems.
+  The benchmark tests file I/O performance for the
+  following operations: Read, write, re-read, re-write,
+  read backwards, read strided, fread, fwrite, random
+  read, pread ,mmap, aio_read, aio_write
 endef
 
 VENDOR_URL    = http://www.iozone.org/
 MASTER_SITES  = http://www.iozone.org/src/current/
-MASTER_SITES += http://www.iozone.org/docs/
+#MASTER_SITES += http://www.iozone.org/docs/
 UFILES_REGEX  = $(NAME)(\d+(?:\.\d+)*).tar
 DISTFILES     = $(NAME)$(DISTVERSION).tar
-DISTFILES    += vx_ioctl.h
-DISTFILES    += $(call admfiles,CSWiozone)
+#DISTFILES    += vx_ioctl.h
+#DISTFILES    += $(call admfiles,CSWiozone)
 
 DISTNAME      = $(NAME)$(DISTVERSION)
 
-PATCHFILES = patch-vx_ioctl.diff
+#PATCHFILES = patch-vx_ioctl.diff
 
-DOCS = IOzone_msword_98.pdf
+DOCS  = IOzone_msword_98.pdf
+DOCS += IOzone_msword_98.doc
 DOCS += Iozone_ps.gz
-DOCS += IOzone_msword_98.doc
 DOCS += Run_rules.doc
 
-WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current
-DOCSRC = $(WORKDIR)$(DISTNAME)/docs
+WORKSRC = $(WORKDIR)$(DISTNAME)/src/current
+DOCSRC  = $(WORKDIR)$(DISTNAME)/docs
 
-# Make sure the VxFS header is in place
-EXTRA_INC = $(WORKSRC)/include/sys/fs
-post-extract:
-	@mkdir -p $(WORKSRC)/include/sys/fs
-	@cp $(WORKDIR)/vx_ioctl.h $(WORKSRC)
-	@$(MAKECOOKIE)
+# Make sure the VxFS header is in place (for Solaris8-64-VXFS)
+#EXTRA_INC = $(WORKSRC)/include/sys/fs
+#post-extract:
+#	@mkdir -p $(WORKSRC)/include/sys/fs
+#	@cp $(WORKDIR)/vx_ioctl.h $(WORKSRC)
+#	@$(MAKECOOKIE)
 
-# We don't have this modern autoconfig-doodle-crap
 CONFIGURE_SCRIPTS =
 TEST_SCRIPTS =
 
-BUILD_ARGS = Solaris8-64-VXFS
+BUILD_ARGS = Solaris10
 BUILD_SCRIPTS = $(WORKSRC)/makefile
 
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk
 
-# The install part from the Makefile is completely unrelocatable :-(
 install-custom:
 	@echo " ==> Installing $(NAME)"
-	@ginstall -d $(DESTDIR)$(bindir)
-	@ginstall -d $(DESTDIR)$(mandir)/man6
+	@ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone
+	@ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/iozone/trunk/checksums
===================================================================
--- csw/mgar/pkg/iozone/trunk/checksums	2012-03-19 09:28:36 UTC (rev 17454)
+++ csw/mgar/pkg/iozone/trunk/checksums	2012-03-19 11:10:16 UTC (rev 17455)
@@ -1,4 +1 @@
-fceb0146e50e714a6c4b3618489e4880  download/iozone3_291.tar
-5c485e1e0f464c4c47b05140f383b4b2  download/vx_ioctl.h
-84aa96a0593883e2e6a38504be8a0aec  download/CSWiozone.gspec
-bbf1f15160145b829dbc00b8c8c7b60e  download/patch-vx_ioctl.diff
+ac6e7534c77602a1c886f3bb8679ad2a  iozone3_398.tar

Deleted: csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec	2012-03-19 09:28:36 UTC (rev 17454)
+++ csw/mgar/pkg/iozone/trunk/files/CSWiozone.gspec	2012-03-19 11:10:16 UTC (rev 17455)
@@ -1,4 +0,0 @@
-%var            bitname iozone
-%var            pkgname CSWiozone
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE

Deleted: csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff	2012-03-19 09:28:36 UTC (rev 17454)
+++ csw/mgar/pkg/iozone/trunk/files/patch-vx_ioctl.diff	2012-03-19 11:10:16 UTC (rev 17455)
@@ -1,24 +0,0 @@
-diff -Naur  tmp/iozone3_291/src/current/iozone.c work/root-blastwavepkg.d/iozone3_291/src/current/iozone.c
---- current/iozone.c	2008-03-03 16:38:17.000000000 +0100
-+++ current/iozone.c	2008-04-23 11:20:00.862783000 +0200
-@@ -338,7 +338,7 @@
- #endif
- 
- #ifdef VXFS
--#include <sys/fs/vx_ioctl.h>
-+#include "vx_ioctl.h"
- #endif
- 
- #ifdef unix
-diff -Naur tmp/iozone3_291/src/current/libasync.c work/root-blastwavepkg.d/iozone3_291/src/current/libasync.c
---- current/libasync.c	2008-03-03 16:38:17.000000000 +0100
-+++ current/libasync.c	2008-04-23 11:20:09.562273000 +0200
-@@ -106,7 +106,7 @@
- #include <malloc.h>
- #endif
- #ifdef VXFS
--#include <sys/fs/vx_ioctl.h>
-+#include "vx_ioctl.h"
- #endif
- 
- #if defined(OSFV5) || defined(linux)

Deleted: csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h	2012-03-19 09:28:36 UTC (rev 17454)
+++ csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h	2012-03-19 11:10:16 UTC (rev 17455)
@@ -1,135 +0,0 @@
-/* @(#)src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h	3.15 10/05/00 14:53:28 -  */
-/* #ident "@(#)vxfs:src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h	3.15" */
-
-/*
- * Copyright (c) 2000 VERITAS Software Corporation.  ALL RIGHTS RESERVED.
- * UNPUBLISHED -- RIGHTS RESERVED UNDER THE COPYRIGHT
- * LAWS OF THE UNITED STATES.  USE OF A COPYRIGHT NOTICE
- * IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION
- * OR DISCLOSURE.
- *
- * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND
- * TRADE SECRETS OF VERITAS SOFTWARE.  USE, DISCLOSURE,
- * OR REPRODUCTION IS PROHIBITED WITHOUT THE PRIOR
- * EXPRESS WRITTEN PERMISSION OF VERITAS SOFTWARE.
- *
- *		RESTRICTED RIGHTS LEGEND
- * USE, DUPLICATION, OR DISCLOSURE BY THE GOVERNMENT IS
- * SUBJECT TO RESTRICTIONS AS SET FORTH IN SUBPARAGRAPH
- * (C) (1) (ii) OF THE RIGHTS IN TECHNICAL DATA AND
- * COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013.
- *		VERITAS SOFTWARE
- * 1600 PLYMOUTH STREET, MOUNTAIN VIEW, CA 94043
- */
-
-#ifndef	_FS_VXFS_VX_IOCTL_H
-#define	_FS_VXFS_VX_IOCTL_H
-
-#include <sys/types.h>
-
-#define VX_IOCTL		(('V' << 24) | ('X' << 16) | ('F' << 8))
-
-/*
- * User group ioctls
- */
-
-#define	VX_SETCACHE	(VX_IOCTL | 1)		/* set cache advice */
-#define	VX_GETCACHE	(VX_IOCTL | 2)		/* get cache advice */
-#define	VX_GETFSOPT	(VX_IOCTL | 5)		/* get cache advice */
-
-#if _FILE_OFFSET_BITS==64
-#define	VX_SETEXT	(VX_IOCTL | 39)
-#define	VX_GETEXT	(VX_IOCTL | 40)
-#else
-#define	VX_SETEXT	(VX_IOCTL | 3)
-#define	VX_GETEXT	(VX_IOCTL | 4)
-#endif /*_FILE_OFFSET_BITS==64*/
-
-struct vx_ext {
-	off_t	ext_size;		/* extent size in fs blocks */
-	off_t	reserve;		/* space reservation in fs blocks */
-	int	a_flags;		/* allocation flags */
-};
-
-#ifdef _LP64
-#define VX_FREEZE_ALL	(VX_IOCTL | 6)
-#else
-#define VX_FREEZE_ALL	(VX_IOCTL | 41)
-#endif /*_LP64*/
-
-/*
- * The VX_FREEZE_ALL ioctl uses the following structure
- */
-
-struct vx_freezeall {
-	int	num;		/* number of fd pointed to */
-	int	timeout;	/* timeout value for the freeze all */
-	int	*fds;		/* buffer for file descriptor list */
-};
-
-/*
- * Values for freeze and thaw ioctls.  These must match the volume manager
- * VOL_FREEZE and VOL_THAW ioctl values.
- *
- * These are in the user group as opposed to the admin group because we need
- * to maintain backward binary compatibility with VxVM.
- */
-
-#ifndef	VOLIOC
-#define	VOLIOC	(('V' << 24) | ('O' << 16) | ('L' << 8))
-#endif	/* VOLIOC */
-
-#define	VX_FREEZE	(VOLIOC | 100)	/* freeze the file system */
-#define	VX_THAW		(VOLIOC | 101)	/* unfreeze the file system */
-
-/*
- * values for a_flags in vx_ext
- */
-
-#define	VX_AFLAGS	0x3f	/* valid flags for a_flags */
-#define	VX_NOEXTEND	0x01	/* file is not to be extended */
-#define	VX_TRIM		0x02	/* trim reservation to i_size on close */
-#define	VX_CONTIGUOUS	0x04	/* file must be contiguously allocated */
-#define	VX_ALIGN	0x08	/* extents allocated on extent boundaries */
-#define	VX_NORESERVE	0x10	/* don't change i_reserve */
-#define	VX_CHGSIZE	0x20	/* change i_size to match reservation */
-
-/*
- * vx_setcache flags
- */
-
-#define	VX_ADVFLAGS		0x0003f	/* valid advisory flags */
-#define	VX_RANDOM		0x00001	/* file is accessed randomly */
-#define	VX_SEQ			0x00002	/* file is accessed sequentially */
-#define	VX_DIRECT		0x00004	/* perform direct (un-buffered) i/o */
-#define	VX_NOREUSE		0x00008	/* do not cache file data */
-#define	VX_DSYNC		0x00010	/* synchronous data i/o (not mtime) */
-#define	VX_UNBUFFERED		0x00020	/* perform non-sync direct i/o */
-
-/*
- * Flags for VX_GETFSOPT
- */
-
-#define	VX_FSO_NOLOG		0x0000001 /* mounted with VX_MS_NOLOG */
-#define	VX_FSO_BLKCLEAR		0x0000002 /* mounted with VX_MS_BLKCLEAR */
-#define	VX_FSO_NODATAINLOG	0x0000004 /* mounted with VX_MS_NODATAINLOG */
-#define	VX_FSO_SNAPSHOT		0x0000008 /* is a snapshot */
-#define	VX_FSO_SNAPPED		0x0000010 /* is being snapped */
-#define	VX_FSO_VJFS		0x0000020 /* the kernel is VJFS */
-#define	VX_FSO_DELAYLOG		0x0000040 /* mounted with VX_MS_DELAYLOG */
-#define	VX_FSO_TMPLOG		0x0000080 /* mounted with VX_MS_TMPLOG */
-#define	VX_FSO_CACHE_DIRECT	0x0000100 /* mounted with VX_MS_CACHE_DIRECT */
-#define	VX_FSO_CACHE_DSYNC	0x0000200 /* mounted with VX_MS_CACHE_DSYNC */
-#define	VX_FSO_CACHE_CLOSESYNC	0x0000400 /* mnt'd with VX_MS_CACHE_CLOSESYNC */
-#define	VX_FSO_OSYNC_DIRECT	0x0001000 /* mounted with VX_MS_OSYNC_DIRECT */
-#define	VX_FSO_OSYNC_DSYNC	0x0002000 /* mounted with VX_MS_OSYNC_DSYNC */
-#define	VX_FSO_OSYNC_CLOSESYNC	0x0004000 /* mnt'd with VX_MS_OSYNC_CLOSESYNC */
-#define	VX_FSO_FILESET		0x0010000 /* mounted as a file set */
-#define	VX_FSO_CACHE_TMPCACHE	0x0020000 /* mnt'd with VX_MS_CACHE_TMPCACHE */
-#define	VX_FSO_OSYNC_DELAY	0x0040000 /* mounted with VX_MS_OSYNC_DELAY */
-#define	VX_FSO_CACHE_UNBUFFERED	0x0080000 /* mnt'd w/ VX_MS_CACHE_UNBUFFERED */
-#define	VX_FSO_OSYNC_UNBUFFERED	0x0100000 /* mounted with VX_MS_UNBUFFERED */
-#define	VX_FSO_QIO_ON		0x0200000 /* mounted with VX_MS_QIO_ON */
-#define	VX_FSO_NOATIME		0x0400000 /* mounted with VX_MS_NOATIME */
-
-#endif /* _FS_VXFS_VX_IOCTL_H */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list