<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4df157f98dfa41a05271802f0068aa725220ecc0">https://github.com/macports/macports-ports/commit/4df157f98dfa41a05271802f0068aa725220ecc0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4df157f98df iozone: update to 3.506
</span>4df157f98df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4df157f98dfa41a05271802f0068aa725220ecc0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu May 11 00:20:35 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> iozone: update to 3.506
</span>---
benchmarks/iozone/Portfile | 12 +-
benchmarks/iozone/files/iozone.c.patch | 377 +++++++++++++++++++++++++++++++++
2 files changed, 382 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/iozone/Portfile b/benchmarks/iozone/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 112ee1cf500..7de206d01a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/iozone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/iozone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name iozone
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.494
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.506
</span> categories benchmarks
license Restrictive/Distributable GPL-2+
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,15 +19,13 @@ homepage http://www.iozone.org/
</span>
master_sites ${homepage}src/current/
distname ${name}[string map {. _} ${version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 31affc0ca940a5e407f61ad495370715134b30a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a36d43831e2829dbc9dc3d5a5a7eb1ca733c9ecc8cbb634022a52928e9b78662
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4bae4ff8081c30636c038dc3a1d264b09ca8ff92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_tar yes
</span> worksrcdir ${distname}/src/current
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete {*}[glob ${worksrcpath}/*.o]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles iozone.c.patch
</span>
use_configure no
build.target macosx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/iozone/files/iozone.c.patch b/benchmarks/iozone/files/iozone.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4ec1f940911
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/iozone/files/iozone.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,377 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- iozone.c.orig 2023-05-01 13:29:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ iozone.c 2023-05-11 00:14:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,28 +105,13 @@ extern int h_errno; /* imported for errors */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syscall(__NR_sched_setaffinity, (pid_t)pid, (size_t)size, (void *)cpuset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(HAVE_ANSIC_C) && defined(linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_ANSIC_C) && (defined(linux) || defined(IOZ_macosx))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_PROTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "proto.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int atoi();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int close();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int unlink();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int main();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int wait();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int fsync();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void srand48();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-long lrand48();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void create_list();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void init_by_array64(unsigned long long *, unsigned long long );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long long genrand64_int64(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,7 +336,7 @@ THISVERSION,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(linux) || defined(IOZ_macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,6 +382,8 @@ typedef long long off64_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void create_list(long long *list_off, long long reclen, off64_t numrecs64);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __AIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1022,8 +1009,8 @@ void auto_test(); /* perform automatic test series *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*int pit_gettimeofday( struct timeval *, struct timezone *, char *, char *);*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int openSckt( const char *, const char *, unsigned int );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void pit( int, struct timeval *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void auto_test(); /* perform automatic test series */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static double time_so_far(); /* time since start of program */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void auto_test(void); /* perform automatic test series */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static double time_so_far(void); /* time since start of program */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void update_burst_sleep(int, long long, double *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef NO_THREADS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void count_burst(double* burst_acc_time_sec, long long stream_id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1039,9 +1026,7 @@ void auto_test(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sighandler_t signal_handler(void); /* clean up if user interrupts us */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void auto_test(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void throughput_test(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static double time_so_far(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void fetchit(char *,long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long long verify_buffer(volatile char *,long long, off64_t, long long, unsigned long long, char );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void purgeit(char *,long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1271,42 +1256,28 @@ ssize_t pread64();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t pwrite64();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t pread64();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *getenv();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *inet_ntoa();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int system();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t async_write();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void async_release();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int async_read();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int async_read_no_copy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t async_write_no_copy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void end_async();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void async_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int async_read();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int async_read_no_copy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t async_write();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t async_write_no_copy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void async_release();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void do_float();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int create_xls();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void close_xls();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void do_label();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct cache;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int async_read(struct cache *, long long , char *, off64_t, long long, long long, off64_t, long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size_t async_write(struct cache *,long long, char *, long long, off64_t, long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void async_release(struct cache *gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int async_read_no_copy(struct cache *, long long, char **, off64_t, long long, long long, off64_t, long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void end_async(struct cache *mygc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void async_init(struct cache **,int, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void do_float(int,double,int,int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int create_xls(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void close_xls(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void do_label(int,char *,int,int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int mylockf(int, int, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int mylockr(int,int, int, off64_t, off64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int rand(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void srand(unsigned int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int get_client_info(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void exit(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void find_remote_shell(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void find_external_mon(char *,char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void start_monitor(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void stop_monitor(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void takeoff_cache();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void del_cache();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct cache_ent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void takeoff_cache(struct cache *, struct cache_ent *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void del_cache(struct cache *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void fill_area(long long *, long long *, long long);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void fill_buffer(char *,long long ,long long ,char, long long );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void store_value(off64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1345,7 +1316,6 @@ void init_file_sizes();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void traj_vers(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void r_traj_size(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long long w_traj_size(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void init_file_sizes();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ off64_t get_next_file_size(off64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void add_file_size(off64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void init_file_sizes( off64_t, off64_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1832,9 +1802,6 @@ void stop_child_send();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Sort of... Full prototypes break non-ansi C compilers. No protos is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * a bit sloppy, so the compromise is this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void stop_child_send();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void stop_child_send();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void child_send();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void compressible_rand_16_int(int *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void new_touch_dedup(char *, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1847,9 +1814,13 @@ main(argc,argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int negatives, positives;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main(argc,argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_ANSIC_C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main(int argc, char **argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main(argc,argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long long fileindx,i,tval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9153,6 +9124,7 @@ long long *data1,*data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9160,6 +9132,7 @@ long long *data1,*data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffer1=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(hist_summary)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9634,6 +9607,7 @@ long long *data1, *data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9641,6 +9615,7 @@ long long *data1, *data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(rlocking)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock_offset=I_LSEEK(fd,0,SEEK_CUR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10097,6 +10072,7 @@ long long *data1,*data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10104,6 +10080,7 @@ long long *data1,*data2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(rlocking)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mylockr((int) fd, (int) 0, (int)1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10701,8 +10678,10 @@ printf("Read_Stride\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ async_init(&gc,fd,direct_flag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10749,6 +10728,7 @@ printf("Read_Stride\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10756,6 +10736,7 @@ printf("Read_Stride\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This is a bit tricky. The goal is to read with a stride through
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the file. The problem is that you need to touch all of the file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15485,6 +15466,7 @@ thread_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15492,6 +15474,7 @@ thread_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read_so_far+=reclen/1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_bytes_completed+=reclen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_ops_completed++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16050,6 +16033,7 @@ thread_pread_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16057,6 +16041,7 @@ thread_pread_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read_so_far+=reclen/1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_bytes_completed+=reclen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_ops_completed++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16665,6 +16650,7 @@ thread_rread_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16672,6 +16658,7 @@ thread_rread_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ re_read_so_far+=reclen/1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_bytes_completed+=reclen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r_traj_ops_completed++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17244,6 +17231,7 @@ thread_reverse_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock_offset, reclen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ current_position+=reclen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17251,6 +17239,7 @@ thread_reverse_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t_offset = (off64_t)reclen*2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(h_flag || k_flag || mmapflag))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17778,6 +17767,7 @@ thread_stride_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17785,6 +17775,7 @@ thread_stride_read_test(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(current_position + (stride * reclen) >= (numrecs64 * reclen)-reclen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ current_position=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18528,6 +18519,7 @@ void *x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(async_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(no_copy_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18535,6 +18527,7 @@ void *x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end_async(gc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gc=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ranread_so_far+=reclen/1024;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(*stop_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20081,37 +20074,37 @@ async_read()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef ASYNC_IO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_read()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_read(struct cache *a, long long b, char *c, off64_t d, long long e, long long f, off64_t g, long long h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(169);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_write_no_copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_write_no_copy(struct cache *gc,long long fd,char *buffer,long long size,long long offset,long long depth,char *free_addr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(170);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_write()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_write(struct cache *a,long long b, char *c, long long d, off64_t e, long long f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(171);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_init(struct cache **a, int b, int c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(172);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_read_no_copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_read_no_copy(struct cache *a, long long b, char **c, off64_t d, long long e, long long f, off64_t g, long long h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(172);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-async_release()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++async_release(struct cache *gc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Your system does not support async I/O\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(173);
</span></pre><pre style='margin:0'>
</pre>