iozone: update to 3.508

This commit is contained in:
Joshua Root
2025-08-27 16:09:14 +10:00
parent ac3b2ba4c7
commit 239fe525c3
2 changed files with 74 additions and 89 deletions
+3 -3
View File
@@ -3,7 +3,7 @@
PortSystem 1.0
name iozone
version 3.506
version 3.508
categories benchmarks
license Restrictive/Distributable GPL-2+
maintainers {jmr @jmroot} openmaintainer
@@ -19,8 +19,8 @@ homepage http://www.iozone.org/
master_sites ${homepage}src/current/
distname ${name}[string map {. _} ${version}]
checksums rmd160 4bae4ff8081c30636c038dc3a1d264b09ca8ff92 \
sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7
checksums rmd160 3ef2d7f6c974363e3d3a47f09a83bb5ca487420f \
sha256 ee55af310a65ec97e1db214aebd75ee87f458b529cea3da37081a63974e8ace3
use_tar yes
worksrcdir ${distname}/src/current
+71 -86
View File
@@ -1,5 +1,5 @@
--- iozone.c.orig 2023-05-01 13:29:49
+++ iozone.c 2023-05-11 00:14:15
--- iozone.c.orig 2025-08-22 14:04:11
+++ iozone.c 2025-08-27 15:51:15
@@ -105,28 +105,13 @@ extern int h_errno; /* imported for errors */
syscall(__NR_sched_setaffinity, (pid_t)pid, (size_t)size, (void *)cpuset)
#endif
@@ -13,24 +13,24 @@
-#ifdef HAVE_PROTO
-#include "proto.h"
-#else
-int atoi();
-int close();
-int unlink();
-int main();
-int atoi(const char *);
-int close(int);
-int unlink(const char *);
-int * main(int, char **);
-#if !defined(linux)
-int wait();
-#endif
-int fsync();
-void srand48();
-long lrand48();
-int fsync(int);
-void srand48(long int);
-long lrand48(void);
-void create_list();
void init_by_array64(unsigned long long *, unsigned long long );
unsigned long long genrand64_int64(void);
-#endif
#include <fcntl.h>
@@ -351,7 +336,7 @@ THISVERSION,
#ifdef ASYNC_IO
#include <aio.h>
@@ -392,7 +377,7 @@ THISVERSION,
#include <string.h>
#endif
@@ -39,16 +39,16 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -397,6 +382,8 @@ typedef long long off64_t;
@@ -439,6 +424,8 @@ typedef long long off64_t;
#endif
#endif
#endif
+
+void create_list(long long *list_off, long long reclen, off64_t numrecs64);
+void create_list(long long *list_off, long long reclen, off64_t numrecs64);
+
#ifdef __AIX__
#include <fcntl.h>
@@ -1022,8 +1009,8 @@ void auto_test(); /* perform automatic test series *
#endif
@@ -1063,8 +1050,8 @@ static void pit( int, struct timeval *);
/*int pit_gettimeofday( struct timeval *, struct timezone *, char *, char *);*/
static int openSckt( const char *, const char *, unsigned int );
static void pit( int, struct timeval *);
@@ -59,7 +59,7 @@
static void update_burst_sleep(int, long long, double *);
#ifndef NO_THREADS
static void count_burst(double* burst_acc_time_sec, long long stream_id);
@@ -1039,9 +1026,7 @@ void auto_test(void);
@@ -1080,9 +1067,7 @@ sighandler_t signal_handler(void); /* clean up if user
#else
sighandler_t signal_handler(void); /* clean up if user interrupts us */
#endif
@@ -69,46 +69,38 @@
void fetchit(char *,long long);
long long verify_buffer(volatile char *,long long, off64_t, long long, unsigned long long, char );
void purgeit(char *,long long);
@@ -1271,42 +1256,28 @@ ssize_t pread64();
ssize_t pwrite64();
ssize_t pread64();
@@ -1315,13 +1300,8 @@ ssize_t pread64(int, void *, size_t, off_t);
ssize_t pread64(int, void *, size_t, off_t);
/*ssize_t pread64(); */
#endif
-#if !defined(linux)
-char *getenv();
-char *inet_ntoa();
-int system();
-#endif
-#ifdef ASYNC_IO
-size_t async_write();
-void async_release();
-int async_read();
-int async_read_no_copy();
-size_t async_write_no_copy();
-void end_async();
-void async_init();
+struct cache;
void async_init(struct cache **,int, int);
int async_read_no_copy(struct cache *, long long, char **, off64_t, long long, long long, off64_t, long long);
void async_release(struct cache *gc);
@@ -1329,31 +1309,20 @@ size_t async_write_no_copy(struct cache *,long long ,c
int async_read(struct cache *, long long , char *, off64_t, long long, long long, off64_t, long long);
size_t async_write(struct cache *,long long, char *, long long, off64_t, long long);
size_t async_write_no_copy(struct cache *,long long ,char *,long long,long long,long long,char *);
-#else
-long long *gc=0;
-void async_init(long long **,int,int);
-int async_read();
-int async_read_no_copy();
-size_t async_write();
-size_t async_write_no_copy();
-void async_release();
-#endif
-void do_float();
-int create_xls();
-void close_xls();
-void do_label();
+struct cache;
+int async_read(struct cache *, long long , char *, off64_t, long long, long long, off64_t, long long);
+size_t async_write(struct cache *,long long, char *, long long, off64_t, long long);
+void async_release(struct cache *gc);
+int async_read_no_copy(struct cache *, long long, char **, off64_t, long long, long long, off64_t, long long);
+size_t async_write_no_copy(struct cache *gc,long long fd,char *buffer,long long size,long long offset,long long depth,char *free_addr);
+void end_async(struct cache *mygc);
+void async_init(struct cache **,int, int);
+void do_float(int,double,int,int);
+int create_xls(char *);
+void close_xls(int);
+void do_label(int,char *,int,int);
void do_float(int, double, int, int);
int create_xls(char *);
void close_xls(int);
void do_label(int, char *, int, int );
int mylockf(int, int, int);
int mylockr(int,int, int, off64_t, off64_t);
-int rand(void);
@@ -127,40 +119,33 @@
void fill_area(long long *, long long *, long long);
void fill_buffer(char *,long long ,long long ,char, long long );
void store_value(off64_t);
@@ -1345,7 +1316,6 @@ void init_file_sizes();
void traj_vers(void);
void r_traj_size(void);
long long w_traj_size(void);
@@ -1452,7 +1421,6 @@ long long get_traj();
void *(thread_join)();
void disrupt();
long long get_traj();
-void init_file_sizes();
off64_t get_next_file_size(off64_t);
void add_file_size(off64_t);
void init_file_sizes( off64_t, off64_t);
@@ -1832,9 +1802,6 @@ void stop_child_send();
off64_t get_next_file_size();
void add_file_size();
void init_record_sizes();
@@ -1879,8 +1847,6 @@ long long rest_val;
* Sort of... Full prototypes break non-ansi C compilers. No protos is
* a bit sloppy, so the compromise is this.
*/
-void stop_child_send();
-void stop_child_send();
-void child_send();
void child_send(char *, struct master_command *, int );
void compressible_rand_16_int(int *);
void new_touch_dedup(char *, int);
@@ -1847,9 +1814,13 @@ main(argc,argv)
@@ -1893,7 +1859,7 @@ int negatives, positives;
/****************************************************************/
int negatives, positives;
int
-main(argc,argv)
+#ifdef HAVE_ANSIC_C
+main(int argc, char **argv)
+#else
+main(argc,argv)
int argc;
char **argv;
+#endif
-int * main(int argc,char **argv)
+int main(int argc,char **argv)
{
long long fileindx,i,tval;
@@ -9153,6 +9124,7 @@ long long *data1,*data2;
@@ -9196,6 +9162,7 @@ long long *data1,*data2;
}
}
}
@@ -168,7 +153,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -9160,6 +9132,7 @@ long long *data1,*data2;
@@ -9203,6 +9170,7 @@ long long *data1,*data2;
end_async(gc);
gc=0;
}
@@ -176,7 +161,7 @@
buffer1=0;
if(hist_summary)
{
@@ -9634,6 +9607,7 @@ long long *data1, *data2;
@@ -9677,6 +9645,7 @@ long long *data1, *data2;
}
}
}
@@ -184,7 +169,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -9641,6 +9615,7 @@ long long *data1, *data2;
@@ -9684,6 +9653,7 @@ long long *data1, *data2;
end_async(gc);
gc=0;
}
@@ -192,7 +177,7 @@
if(rlocking)
{
lock_offset=I_LSEEK(fd,0,SEEK_CUR);
@@ -10097,6 +10072,7 @@ long long *data1,*data2;
@@ -10140,6 +10110,7 @@ long long *data1,*data2;
}
}
}
@@ -200,7 +185,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -10104,6 +10080,7 @@ long long *data1,*data2;
@@ -10147,6 +10118,7 @@ long long *data1,*data2;
end_async(gc);
gc=0;
}
@@ -208,7 +193,7 @@
if(rlocking)
{
mylockr((int) fd, (int) 0, (int)1,
@@ -10701,8 +10678,10 @@ printf("Read_Stride\n");
@@ -10744,8 +10716,10 @@ printf("Read_Stride\n");
}
else
{
@@ -219,7 +204,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -10749,6 +10728,7 @@ printf("Read_Stride\n");
@@ -10792,6 +10766,7 @@ printf("Read_Stride\n");
}
}
}
@@ -227,7 +212,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -10756,6 +10736,7 @@ printf("Read_Stride\n");
@@ -10799,6 +10774,7 @@ printf("Read_Stride\n");
end_async(gc);
gc=0;
}
@@ -235,7 +220,7 @@
/* This is a bit tricky. The goal is to read with a stride through
the file. The problem is that you need to touch all of the file
@@ -15485,6 +15466,7 @@ thread_read_test(x)
@@ -15528,6 +15504,7 @@ thread_read_test(x)
}
}
}
@@ -243,7 +228,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -15492,6 +15474,7 @@ thread_read_test(x)
@@ -15535,6 +15512,7 @@ thread_read_test(x)
end_async(gc);
gc=0;
}
@@ -251,7 +236,7 @@
read_so_far+=reclen/1024;
r_traj_bytes_completed+=reclen;
r_traj_ops_completed++;
@@ -16050,6 +16033,7 @@ thread_pread_test(x)
@@ -16093,6 +16071,7 @@ thread_pread_test(x)
}
}
}
@@ -259,7 +244,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -16057,6 +16041,7 @@ thread_pread_test(x)
@@ -16100,6 +16079,7 @@ thread_pread_test(x)
end_async(gc);
gc=0;
}
@@ -267,7 +252,7 @@
read_so_far+=reclen/1024;
r_traj_bytes_completed+=reclen;
r_traj_ops_completed++;
@@ -16665,6 +16650,7 @@ thread_rread_test(x)
@@ -16708,6 +16688,7 @@ thread_rread_test(x)
}
}
}
@@ -275,7 +260,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -16672,6 +16658,7 @@ thread_rread_test(x)
@@ -16715,6 +16696,7 @@ thread_rread_test(x)
end_async(gc);
gc=0;
}
@@ -283,7 +268,7 @@
re_read_so_far+=reclen/1024;
r_traj_bytes_completed+=reclen;
r_traj_ops_completed++;
@@ -17244,6 +17231,7 @@ thread_reverse_read_test(x)
@@ -17287,6 +17269,7 @@ thread_reverse_read_test(x)
lock_offset, reclen);
}
current_position+=reclen;
@@ -291,7 +276,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -17251,6 +17239,7 @@ thread_reverse_read_test(x)
@@ -17294,6 +17277,7 @@ thread_reverse_read_test(x)
end_async(gc);
gc=0;
}
@@ -299,7 +284,7 @@
t_offset = (off64_t)reclen*2;
if (!(h_flag || k_flag || mmapflag))
{
@@ -17778,6 +17767,7 @@ thread_stride_read_test(x)
@@ -17821,6 +17805,7 @@ thread_stride_read_test(x)
}
}
}
@@ -307,7 +292,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -17785,6 +17775,7 @@ thread_stride_read_test(x)
@@ -17828,6 +17813,7 @@ thread_stride_read_test(x)
end_async(gc);
gc=0;
}
@@ -315,7 +300,7 @@
if(current_position + (stride * reclen) >= (numrecs64 * reclen)-reclen)
{
current_position=0;
@@ -18528,6 +18519,7 @@ void *x;
@@ -18571,6 +18557,7 @@ void *x;
}
}
}
@@ -323,7 +308,7 @@
if(async_flag)
{
if(no_copy_flag)
@@ -18535,6 +18527,7 @@ void *x;
@@ -18578,6 +18565,7 @@ void *x;
end_async(gc);
gc=0;
}
@@ -331,7 +316,7 @@
ranread_so_far+=reclen/1024;
if(*stop_flag)
{
@@ -20081,37 +20074,37 @@ async_read()
@@ -20124,37 +20112,37 @@ int
#ifndef ASYNC_IO
int