upgrade to iozone 3.83

This commit is contained in:
brad 2002-02-26 01:52:02 +00:00
parent f9c7cf0105
commit f68a0a14aa
3 changed files with 6 additions and 124 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2002/01/06 05:31:48 brad Exp $
# $OpenBSD: Makefile,v 1.34 2002/02/26 01:52:02 brad Exp $
# Uses pthreads
COMMENT= "performance test of sequential file I/O"
DISTNAME= iozone3_71
PKGNAME= iozone-3.71
DISTNAME= iozone3_83
PKGNAME= iozone-3.83
CATEGORIES= benchmarks
NEED_VERSION= 1.500
MASTER_SITES= http://www.iozone.org/src/current/

View File

@ -1,3 +1,3 @@
MD5 (iozone3_71.tar) = e742239b107f97b438af65e728345fcd
RMD160 (iozone3_71.tar) = 9418052da6d4d9caab172b677f50bfffabded5e7
SHA1 (iozone3_71.tar) = 42db1b1d1c710e4832d9c715695f242cf8700dac
MD5 (iozone3_83.tar) = 44bf2b4a7f1700ae2c87eabe6103afd8
RMD160 (iozone3_83.tar) = 9004cc2d3c4bbad02de0a0fbab7f405e07f96945
SHA1 (iozone3_83.tar) = e011c64396f08a0ff4d0d2948f6e72d7250d48ad

View File

@ -1,118 +0,0 @@
$OpenBSD: patch-iozone_c,v 1.4 2002/01/06 05:31:48 brad Exp $
--- iozone.c.orig Tue Nov 27 10:14:40 2001
+++ iozone.c Sun Jan 6 00:22:53 2002
@@ -64,7 +64,10 @@ extern int errno;
#endif
-#if defined (__LP64__) || defined(OSF_64)
+#if defined(__LP64__) || defined(__arch64__) || defined(__alpha__)
+#define MODE "\tCompiled for 64 bit mode."
+#define _64BIT_ARCH_
+#elif defined(OSF_64)
#define MODE "\tCompiled for 64 bit mode."
#else
#define MODE "\tCompiled for 32 bit mode."
@@ -294,11 +297,7 @@ typedef long long off64_t;
#define AMAP_FILE (0)
#endif
-#ifdef SCO_Unixware_gcc
-#define MAP_FILE (0)
-#endif
-
-#ifdef solaris
+#if defined (solaris) || defined(SCO_Unixware_gcc)
#define MAP_FILE (0)
#endif
@@ -808,7 +807,7 @@ char **argv;
exit(1);
}
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
buffer = (char *) ((long long )(buffer + cache_size ) &
~(cache_size-1));
#else
@@ -1072,7 +1071,7 @@ char **argv;
perror("Memory allocation failed:");
exit(9);
}
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
pbuffer = (char *)
(((unsigned long long)pbuffer + cache_size )
& ~(cache_size-1));
@@ -2151,7 +2150,7 @@ void throughput_test()
if(!haveshm)
{
shmaddr=(struct child_stats *)alloc_mem((long long)SHMSIZE);
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
if((long long)shmaddr==(long long)-1)
#else
if((long )shmaddr==(long)-1)
@@ -2245,7 +2244,7 @@ void throughput_test()
printf("Parent starting slot %lld\n",xx);
#endif
if( childids[xx] == 0 ){
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
thread_write_test((void *)xx);
#else
thread_write_test((void *)(long)xx);
@@ -2279,7 +2278,7 @@ void throughput_test()
~(cache_size-1));
}
-#ifdef __LP64__
+#ifdef _64BIT_ARCH__
childids[xx] = mythread_create(thread_write_test,(void*)xx);
#else
childids[xx] = mythread_create(thread_write_test,(void*)(long)xx);
@@ -2462,7 +2461,7 @@ waitout:
exit(28);
}
if(childids[xx] == 0){
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
thread_rwrite_test((void *)xx);
#else
thread_rwrite_test((void *)((long)xx));
@@ -2474,7 +2473,7 @@ waitout:
else
{
for(xx = 0; xx< num_child ; xx++){ /* Create the children */
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
childids[xx] = mythread_create( thread_rwrite_test,xx);
#else
childids[xx] = mythread_create( thread_rwrite_test,(void *)(long)xx);
@@ -2653,7 +2652,7 @@ next0:
exit(30);
}
if(childids[xx]==0){
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
thread_read_test((void *)xx);
#else
thread_read_test((void *)((long)xx));
@@ -2665,7 +2664,7 @@ next0:
else
{
for(xx = 0; xx< num_child ; xx++){ /* Create the children */
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
childids[xx] = mythread_create( thread_read_test,xx);
#else
childids[xx] = mythread_create( thread_read_test,(void *)(long)xx);
@@ -2834,7 +2833,7 @@ jumpend:
exit(32);
}
if(childids[xx]==0){
-#ifdef __LP64__
+#ifdef _64BIT_ARCH_
thread_rread_test((void *)xx);
#else
thread_rread_test((void *)((long)xx));