[csw-devel] SF.net SVN: gar:[17491] csw/mgar/pkg/iozone/trunk
aironskin at users.sourceforge.net
aironskin at users.sourceforge.net
Wed Mar 21 15:01:46 CET 2012
Revision: 17491
http://gar.svn.sourceforge.net/gar/?rev=17491&view=rev
Author: aironskin
Date: 2012-03-21 14:01:46 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
iozone/trunk: Updated build recipe. Works on Sol10, not on Sol9 yet.
Modified Paths:
--------------
csw/mgar/pkg/iozone/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff
csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.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-21 13:42:33 UTC (rev 17490)
+++ csw/mgar/pkg/iozone/trunk/Makefile 2012-03-21 14:01:46 UTC (rev 17491)
@@ -14,25 +14,33 @@
read, pread ,mmap, aio_read, aio_write
endef
-MASTER_SITES += http://www.iozone.org/src/current/
-DISTNAME = $(NAME)$(DISTVERSION)
-DISTFILES += $(DISTNAME).tar
-#PATCHFILES = patch-vx_ioctl.diff
+VENDOR_URL = http://www.iozone.org/
+MASTER_SITES = http://www.iozone.org/src/current/
-VENDOR_URL = http://www.iozone.org/
+DISTNAME = $(NAME)$(DISTVERSION)
+WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current
+DOCSRC = $(WORKDIR)$(DISTNAME)/docs
-DOCS = IOzone_msword_98.pdf
-DOCS += IOzone_msword_98.doc
-DOCS += Iozone_ps.gz
-DOCS += Run_rules.doc
+DISTFILES = $(DISTNAME).tar
+DISTFILES += vx_ioctl.h
-WORKSRC = $(WORKDIR)$(DISTNAME)/src/current
-DOCSRC = $(WORKDIR)$(DISTNAME)/docs
+PATCHFILES = patch_makefile.diff
+PATCHFILES += patch_manfile.diff
+PATCHFILES += patch_vxioctl.diff
+DOCS = IOzone_msword_98.pdf
+DOCS += IOzone_msword_98.doc
+DOCS += Iozone_ps.gz
+DOCS += Run_rules.doc
+
+post-extract-modulated:
+ cp $(FILEDIR)/vx_ioctl.h $(WORKSRC)/
+ @$(MAKECOOKIE)
+
CONFIGURE_SCRIPTS =
TEST_SCRIPTS =
-BUILD_ARGS = Solaris10
+BUILD_ARGS = Solaris8-64-VXFS
BUILD_SCRIPTS = $(WORKSRC)/makefile
INSTALL_SCRIPTS = custom
@@ -42,5 +50,9 @@
install-custom:
@echo " ==> Installing $(NAME)"
ginstall -D $(WORKSRC)/iozone $(DESTDIR)$(bindir)/iozone
- ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man6/iozone.1
+ ginstall -D $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man8/iozone.8
+ ginstall -D $(DOCSRC)/IOzone_msword_98.pdf $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.pdf
+ ginstall $(DOCSRC)/IOzone_msword_98.doc $(DESTDIR)$(docdir)/iozone/IOzone_msword_98.doc
+ ginstall $(DOCSRC)/Iozone_ps.gz $(DESTDIR)$(docdir)/iozone/Iozone_ps.gz
+ ginstall $(DOCSRC)/Run_rules.doc $(DESTDIR)$(docdir)/iozone/Run_rules.doc
@$(MAKECOOKIE)
Added: csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff (rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-03-21 14:01:46 UTC (rev 17491)
@@ -0,0 +1,51 @@
+From 0cdc6ee9569d94b7c720f0b9210e3ce08e73f484 Mon Sep 17 00:00:00 2001
+From: Stefan Schnyder <aironskin at opencsw.org>
+Date: Wed, 21 Mar 2012 12:30:26 +0100
+Subject: [PATCH] Replaced deprecated option (generic64) and removed include
+
+---
+ src/current/makefile | 16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/src/current/makefile b/src/current/makefile
+index eb1fbec..70bb6b3 100644
+--- a/src/current/makefile
++++ b/src/current/makefile
+@@ -443,10 +443,9 @@ Solaris8-64: iozone_solaris8-64.o libasync.o libbif.o
+ # Solaris 64 bit build with threads, largefiles, async I/O, and Vxfs
+ #
+ Solaris8-64-VXFS: iozone_solaris8-64-VXFS.o libasync.o libbif.o
+- $(CC) $(LDFLAGS) -fast -xtarget=generic64 -v -I/opt/VRTSvxfs/include/
+- iozone_solaris8-64-VXFS.o libasync.o libbif.o \
+- -lthread -lpthread -lposix4 -lnsl -laio \
+- -lsocket -o iozone
++ $(CC) $(LDFLAGS) -fast -m64 -v iozone_solaris8-64-VXFS.o \
++ libasync.o libbif.o -lthread -lpthread -lposix4 -lnsl \
++ -laio -lsocket -o iozone
+
+ #
+ # Windows build requires Cygwin development environment. You
+@@ -1196,17 +1195,14 @@ iozone_solaris8-64-VXFS.o: iozone.c libasync.c libbif.c
+ @echo ""
+ @echo "Building iozone for Solaris8-64-VXFS"
+ @echo ""
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -DNAME='"Solaris8-64"' -Dsolaris -DHAVE_PREAD \
+ $(CFLAGS) iozone.c -o iozone_solaris8-64-VXFS.o
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -Dsolaris -DHAVE_PREAD $(CFLAGS) libasync.c -o libasync.o
+- $(CC) -fast -xtarget=generic64 -v -c -I/opt/VRTSvxfs/include/ -Dunix \
+- -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
++ $(CC) -fast -m64 -v -c -Dunix -DVXFS -DHAVE_ANSIC_C -DASYNC_IO \
+ -D__LP64__ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -Dsolaris -DHAVE_PREAD $(CFLAGS) libbif.c -o libbif.o
+
+--
+1.7.9
+
Added: csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff (rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/patch_manfile.diff 2012-03-21 14:01:46 UTC (rev 17491)
@@ -0,0 +1,22 @@
+From 6fd37055f0e15d77b18e9ff64f248e86ee793ecb Mon Sep 17 00:00:00 2001
+From: Stefan Schnyder <aironskin at opencsw.org>
+Date: Wed, 21 Mar 2012 11:29:04 +0100
+Subject: [PATCH] Move from man1 to man8
+
+---
+ docs/iozone.1 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/docs/iozone.1 b/docs/iozone.1
+index 170b9d3..f7ccacd 100644
+--- a/docs/iozone.1
++++ b/docs/iozone.1
+@@ -1,4 +1,4 @@
+-.TH IOZONE 1
++.TH IOZONE 8
+ .SH NAME
+ Iozone \- Filesystem Benchmark
+ .SH SYNOPSIS
+--
+1.7.9
+
Added: csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff (rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/patch_vxioctl.diff 2012-03-21 14:01:46 UTC (rev 17491)
@@ -0,0 +1,40 @@
+From 07945d661f107a4f7fd4b9dd06207ffa43a3e99d Mon Sep 17 00:00:00 2001
+From: Stefan Schnyder <aironskin at opencsw.org>
+Date: Wed, 21 Mar 2012 12:37:43 +0100
+Subject: [PATCH] Use vx_ioctl.h in BUILDSRC instead of
+ /opt/VRTSvxfs/include/sys/fs/
+
+---
+ src/current/iozone.c | 2 +-
+ src/current/libasync.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/current/iozone.c b/src/current/iozone.c
+index 38f9da8..de96dcb 100644
+--- a/src/current/iozone.c
++++ b/src/current/iozone.c
+@@ -369,7 +369,7 @@ typedef long long off64_t;
+ #endif
+
+ #ifdef VXFS
+-#include <sys/fs/vx_ioctl.h>
++#include "vx_ioctl.h"
+ #endif
+
+ #ifdef unix
+diff --git a/src/current/libasync.c b/src/current/libasync.c
+index adb14a6..01b5a85 100644
+--- a/src/current/libasync.c
++++ b/src/current/libasync.c
+@@ -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)
+--
+1.7.9
+
Added: csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h
===================================================================
--- csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h (rev 0)
+++ csw/mgar/pkg/iozone/trunk/files/vx_ioctl.h 2012-03-21 14:01:46 UTC (rev 17491)
@@ -0,0 +1,147 @@
+/* $Id: vx_ioctl.h,v 4.11 2007/06/11 02:00:26 adey Exp $ */
+/* #ident "@(#)vxfs:$RCSfile: vx_ioctl.h,v $ $Revision: 4.11 $" */
+
+/*
+ * $Copyright: Copyright (c) 2009 Symantec Corporation.
+ * All rights reserved.
+ *
+ * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND TRADE SECRETS OF
+ * SYMANTEC CORPORATION. USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED
+ * WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SYMANTEC CORPORATION.
+ *
+ * The Licensed Software and Documentation are deemed to be commercial
+ * computer software as defined in FAR 12.212 and subject to restricted
+ * rights as defined in FAR Section 52.227-19 "Commercial Computer
+ * Software - Restricted Rights" and DFARS 227.7202, "Rights in
+ * Commercial Computer Software or Commercial Computer Software
+ * Documentation", as applicable, and any successor regulations. Any use,
+ * modification, reproduction release, performance, display or disclosure
+ * of the Licensed Software and Documentation by the U.S. Government
+ * shall be solely in accordance with the terms of this Agreement. $
+ */
+
+#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*/
+
+#ifdef __LP64__
+#define VX_NATTR_IOCTL (VX_IOCTL | 9)
+#else
+#define VX_NATTR_IOCTL (VX_IOCTL | 44)
+#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 0x7f /* 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 */
+#define VX_GROWFILE 0x40 /* same is CHGSIZE, but for non-root users */
+
+/*
+ * vx_setcache flags
+ */
+
+#define VX_ADVFLAGS 0x000ff /* 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 */
+#define VX_ERA 0x00040 /* enable enhanced read ahead */
+#define VX_CONCURRENT 0x00080 /* enable concurrent 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 */
+#define VX_FSO_NOMTIME 0x0800000 /* mounted with VX_MS_NOMTIME */
+#define VX_FSO_CDS_ADAPTIVE 0x1000000 /* mounted with VX_MS_CDS_ADAPTIVE */
+#define VX_FSO_CDS_MANDATORY 0x2000000 /* mounted with VX_MS_CDS_MANDATORY */
+#define VX_FSO_TRANFLUSH 0x4000000 /* mounted with VX_MS_TRANFLUSH */
+#define VX_FSO_MNTLOCK 0x8000000 /* mounted with VX_MS_MNTLOCK */
+
+#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