Index: head/benchmarks/iozone/files/patch-pit__server.c =================================================================== --- head/benchmarks/iozone/files/patch-pit__server.c (revision 419221) +++ head/benchmarks/iozone/files/patch-pit__server.c (nonexistent) @@ -1,52 +0,0 @@ ---- pit_server.c.orig 2015-10-20 14:12:13 UTC -+++ pit_server.c -@@ -170,7 +170,6 @@ int main( int argc, - if(need < 1) - { - USAGE; -- exit; - } - /* - ** Open both a TCP and UDP socket, for both IPv4 & IPv6, on which to receive -@@ -310,8 +309,8 @@ static int openSckt( const char *service - " ai_family = %d (PF_INET = %d, PF_INET6 = %d)\n" - " ai_socktype = %d (SOCK_STREAM = %d, SOCK_DGRAM = %d)\n" - " ai_protocol = %d (IPPROTO_TCP = %d, IPPROTO_UDP = %d)\n" -- " ai_addrlen = %d (sockaddr_in = %lu, " -- "sockaddr_in6 = %lu)\n", -+ " ai_addrlen = %d (sockaddr_in = %zu, " -+ "sockaddr_in6 = %zu)\n", - ai->ai_flags, - ai->ai_family, - PF_INET, -@@ -620,8 +619,8 @@ static void pit( int tSckt[ ], - fprintf( stderr, - "Sockaddr info for new TCP client:\n" - " sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n" -- " addr len = %d (sockaddr_in = %lu, " -- "sockaddr_in6 = %lu)\n", -+ " addr len = %d (sockaddr_in = %zu, " -+ "sockaddr_in6 = %zu)\n", - sadr->sa_family, - AF_INET, - AF_INET6, -@@ -728,7 +727,7 @@ static void pit( int tSckt[ ], - { - ssize_t rBytes = count; - fprintf( stderr, -- "%s: UDP datagram received (%ld bytes).\n", -+ "%s: UDP datagram received (%zd bytes).\n", - pgmName, - count ); - while ( count > 0 ) -@@ -745,8 +744,8 @@ static void pit( int tSckt[ ], - fprintf( stderr, - "Remote client's sockaddr info:\n" - " sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n" -- " addr len = %d (sockaddr_in = %lu, " -- "sockaddr_in6 = %lu)\n", -+ " addr len = %d (sockaddr_in = %zu, " -+ "sockaddr_in6 = %zu)\n", - sadr->sa_family, - AF_INET, - AF_INET6, Property changes on: head/benchmarks/iozone/files/patch-pit__server.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iozone/files/patch-iozone.c =================================================================== --- head/benchmarks/iozone/files/patch-iozone.c (revision 419221) +++ head/benchmarks/iozone/files/patch-iozone.c (nonexistent) @@ -1,636 +0,0 @@ ---- iozone.c.orig 2015-10-20 14:12:13 UTC -+++ iozone.c -@@ -360,7 +360,7 @@ typedef off_t off64_t; - #ifndef SCO_Unixware_gcc - #ifndef UWIN - #ifndef __DragonFly__ --typedef long long off64_t; -+typedef int64_t off64_t; - #endif - #endif - #endif -@@ -1918,7 +1918,7 @@ char **argv; - #ifdef NO_PRINT_LLD - sscanf(optarg,"%ld",&kilobytes64); - #else -- sscanf(optarg,"%lld",&kilobytes64); -+ sscanf(optarg,"%ld",&kilobytes64); - #endif - if(optarg[strlen(optarg)-1]=='k' || - optarg[strlen(optarg)-1]=='K'){ -@@ -1942,7 +1942,7 @@ char **argv; - #ifdef NO_PRINT_LLD - sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64); - #else -- sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",kilobytes64); -+ sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64); - #endif - sflag++; - break; -@@ -2316,7 +2316,7 @@ char **argv; - #ifdef NO_PRINT_LLD - sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size); - #else -- sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",minimum_file_size); -+ sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size); - #endif - break; - case 'g': /* Set maximum file size for auto mode */ -@@ -2339,7 +2339,7 @@ char **argv; - #ifdef NO_PRINT_LLD - sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size); - #else -- sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",maximum_file_size); -+ sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size); - #endif - break; - case 'z': /* Set no cross over */ -@@ -2447,7 +2447,7 @@ char **argv; - #ifdef NO_PRINT_LLD - sscanf(subarg,"%ld",&burst_size_kb_64); - #else -- sscanf(subarg,"%lld",&burst_size_kb_64); -+ sscanf(subarg,"%ld",&burst_size_kb_64); - #endif - if(subarg[strlen(subarg)-1]=='k' || - subarg[strlen(subarg)-1]=='K'){ -@@ -3108,7 +3108,7 @@ char **argv; - printf("\tBurst size set to %ld Kbytes.\n\tBurst sleep duration set to %ld msec\n", - burst_size_kb_64, burst_sleep_duration_msec); - #else -- printf("\tBurst size set to %lld Kbytes.\n\tBurst sleep duration set to %lld msec\n", -+ printf("\tBurst size set to %ld Kbytes.\n\tBurst sleep duration set to %lld msec\n", - burst_size_kb_64, burst_sleep_duration_msec); - #endif - if(!rflag) -@@ -3345,7 +3345,7 @@ long long reclength; - if(!silent) printf("%8ld",reclen/1024); - } - #else -- if(!silent) printf("%16lld",kilobytes64); -+ if(!silent) printf("%16ld",kilobytes64); - if(r_traj_flag || w_traj_flag) - { - if(!silent) printf("%8lld",(long long )0); -@@ -3403,7 +3403,7 @@ long long reclength; - printf("\n\tiozone %ld %ld ", kilobytes64, goodrecl); - printf("\t(i.e. record size = %ld bytes)\n", goodrecl); - #else -- printf("\n\tiozone %lld %lld ", kilobytes64, goodrecl); -+ printf("\n\tiozone %ld %lld ", kilobytes64, goodrecl); - printf("\t(i.e. record size = %lld bytes)\n", goodrecl); - #endif - } -@@ -3543,7 +3543,7 @@ void auto_test() - printf("Error: record length %ld is greater than filesize %ld kB\n ", - min_rec_size,min_file_size); - #else -- printf("Error: record length %lld is greater than filesize %lld kB\n ", -+ printf("Error: record length %lld is greater than filesize %ld kB\n ", - min_rec_size,min_file_size); - #endif - exit(23); -@@ -3738,7 +3738,7 @@ throughput_test() - if(!silent) printf("\tEach %s writes a %ld kByte file in telemetry controlled records\n", - port,kilobytes64); - #else -- if(!silent) printf("\tEach %s writes a %lld kByte file in telemetry controlled records\n", -+ if(!silent) printf("\tEach %s writes a %ld kByte file in telemetry controlled records\n", - port,kilobytes64); - #endif - } -@@ -3748,7 +3748,7 @@ throughput_test() - if(!silent) printf("\tEach %s writes a %ld kByte file in %ld kbyte records\n", - port,kilobytes64,reclen/1024); - #else -- if(!silent) printf("\tEach %s writes a %lld kByte file in %lld kByte records\n", -+ if(!silent) printf("\tEach %s writes a %ld kByte file in %lld kByte records\n", - port,kilobytes64,reclen/1024); - #endif - } -@@ -7182,8 +7182,8 @@ char sverify; - printf("where %8.8lx loop %ld\n",where,i); - #else - printf("Error in file: Found ?%llx? Expecting ?%llx? addr %lx\n",*where, (long long)((pattern_buf<<32)|pattern_buf),((long)where)); -- printf("Error in file: Position %lld \n",file_position); -- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024); -+ printf("Error in file: Position %ld \n",file_position); -+ printf("Record # %ld Record size %lld kb \n",recnum,recsize/1024); - printf("where %px loop %lld\n",where,(long long)i); - #endif - return(1); -@@ -7226,9 +7226,9 @@ char sverify; - printf("Error in file: Position %ld \n",file_position); - printf("Record # %ld Record size %ld kb \n",recnum,recsize/1024); - #else -- printf("Error in file: Position %lld %lld %lld \n",i,j,k); -- printf("Error in file: Position %lld \n",file_position); -- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024); -+ printf("Error in file: Position %ld %lld %lld \n",i,j,k); -+ printf("Error in file: Position %ld \n",file_position); -+ printf("Record # %ld Record size %lld kb \n",recnum,recsize/1024); - #endif - printf("Found pattern: Char >>%c<< Expecting >>%c<<\n", *where2,*pattern_ptr); - printf("Found pattern: Hex >>%x<< Expecting >>%x<<\n", *where2,*pattern_ptr); -@@ -7835,9 +7835,9 @@ long long *data2; - else - fprintf(rwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen); - #else -- fprintf(wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen); -+ fprintf(wqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen); - else -- fprintf(rwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen); -+ fprintf(rwqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; -@@ -8331,7 +8331,7 @@ long long *data1,*data2; - printf("\nError freading block %lu %lx\n", i, - (unsigned long long)buffer); - #else -- printf("\nError freading block %llu %llx\n", i, -+ printf("\nError freading block %ld %llx\n", i, - (unsigned long long)buffer); - #endif - #else -@@ -8678,7 +8678,7 @@ long long *data1,*data2; - } - if(r_traj_flag) - { -- traj_offset=get_traj(r_traj_fd, (long long *)&traj_size,(float *)&compute_time, (long)0); -+ traj_offset=get_traj(r_traj_fd, &traj_size, &compute_time, 0); - reclen=traj_size; - #if defined(Windows) - if(unbuffered) -@@ -8749,7 +8749,7 @@ long long *data1,*data2; - printf("\nError reading block %ld %lx\n", i, - (unsigned long long)nbuff); - #else -- printf("\nError reading block %lld %llx\n", i, -+ printf("\nError reading block %ld %llx\n", i, - (unsigned long long)nbuff); - #endif - #else -@@ -8798,9 +8798,9 @@ long long *data1,*data2; - else - fprintf(rrqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen); - #else -- fprintf(rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen); -+ fprintf(rqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen); - else -- fprintf(rrqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen); -+ fprintf(rrqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen); - #endif - } - r_traj_ops_completed++; -@@ -9226,7 +9226,7 @@ long long *data1, *data2; - printf("\nError reading block at %ld\n", - offset64); - #else -- printf("\nError reading block at %lld\n", -+ printf("\nError reading block at %ld\n", - offset64); - #endif - perror("read"); -@@ -9350,7 +9350,7 @@ long long *data1, *data2; - printf("\nError writing block at %ld\n", - offset64); - #else -- printf("\nError writing block at %lld\n", -+ printf("\nError writing block at %ld\n", - offset64); - #endif - if(wval==-1) -@@ -9667,7 +9667,7 @@ long long *data1,*data2; - #ifdef NO_PRINT_LLD - printf("\nError reading block %ld\n", i); - #else -- printf("\nError reading block %lld\n", i); -+ printf("\nError reading block %ld\n", i); - #endif - perror("read"); - exit(79); -@@ -10272,8 +10272,8 @@ long long *data1, *data2; - printf("\nError reading block %ld, fd= %d Filename %s Read returned %ld\n", i, fd,filename,uu); - printf("\nSeeked to %ld Reclen = %ld\n", savepos64,reclen); - #else -- printf("\nError reading block %lld, fd= %d Filename %s Read returned %lld\n", i, fd,filename,uu); -- printf("\nSeeked to %lld Reclen = %lld\n", savepos64,reclen); -+ printf("\nError reading block %ld, fd= %d Filename %s Read returned %lld\n", i, fd,filename,uu); -+ printf("\nSeeked to %ld Reclen = %lld\n", savepos64,reclen); - #endif - perror("read"); - exit(88); -@@ -11799,7 +11799,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"'); - #else -- if(!silent) printf(" %c%lld%c",'"',rec_size/1024,'"'); -+ if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"'); - #endif - } - if(!silent) printf("\n"); -@@ -11817,7 +11817,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #else -- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"'); -+ if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #endif - for(i=0;i<=max_y;i++){ - if(report_array[0][i] != current_file_size){ -@@ -11832,7 +11832,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #else -- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"'); -+ if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #endif - } - if(bif_flag) -@@ -11840,7 +11840,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf(" %ld ",report_array[who][i]); - #else -- if(!silent) printf(" %lld ",report_array[who][i]); -+ if(!silent) printf(" %ld ",report_array[who][i]); - #endif - } - if(bif_flag) -@@ -12029,7 +12029,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"'); - #else -- if(!silent) printf(" %c%lld%c",'"',rec_size/1024,'"'); -+ if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"'); - #endif - } - if(!silent) printf("\n"); -@@ -12047,7 +12047,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #else -- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"'); -+ if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #endif - for (i = 0; i <= max_y; i++) { - if (report_array[0][i] != current_file_size) { -@@ -12062,7 +12062,7 @@ long long who; - #ifdef NO_PRINT_LLD - if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #else -- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"'); -+ if(!silent) printf("%c%ld%c ",'"',current_file_size,'"'); - #endif - } - if (bif_flag) -@@ -13061,7 +13061,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_wqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; -@@ -13715,7 +13715,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_wqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; -@@ -14325,7 +14325,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_rwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_rwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_rwqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - if(rlocking) -@@ -14764,7 +14764,7 @@ thread_read_test(x) - } - if(r_traj_flag) - { -- traj_offset=get_traj(r_traj_fd, (long long *)&traj_size,(float *)&delay,(long)0); -+ traj_offset=get_traj(r_traj_fd, &traj_size, &delay, 0); - reclen=traj_size; - #if defined(Windows) - if(unbuffered) -@@ -14840,7 +14840,7 @@ thread_read_test(x) - printf("\nError reading block %ld, fd= %d\n", i, - fd); - #else -- printf("\nError reading block %lld, fd= %d\n", i, -+ printf("\nError reading block %ld, fd= %d\n", i, - fd); - #endif - perror("read"); -@@ -14914,7 +14914,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_rqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_rqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - -@@ -15317,7 +15317,7 @@ thread_pread_test(x) - } - if(r_traj_flag) - { -- traj_offset=get_traj(r_traj_fd, (long long *)&traj_size,(float *)&delay,(long)0); -+ traj_offset=get_traj(r_traj_fd, &traj_size, &delay, 0); - reclen=traj_size; - I_LSEEK(fd,traj_offset,SEEK_SET); - } -@@ -15375,7 +15375,7 @@ thread_pread_test(x) - printf("\nError preading block %ld, fd= %d\n", i, - fd); - #else -- printf("\nError preading block %lld, fd= %d\n", i, -+ printf("\nError preading block %ld, fd= %d\n", i, - fd); - #endif - perror("pread"); -@@ -15449,7 +15449,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_rqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_rqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - -@@ -15877,7 +15877,7 @@ thread_rread_test(x) - } - if(r_traj_flag) - { -- traj_offset=get_traj(r_traj_fd, (long long *)&traj_size,(float *)&delay,(long)0); -+ traj_offset=get_traj(r_traj_fd, &traj_size, &delay, 0); - reclen=traj_size; - #if defined(Windows) - if(unbuffered) -@@ -15953,7 +15953,7 @@ thread_rread_test(x) - printf("\nError writing block %ld, fd= %d\n", i, - fd); - #else -- printf("\nError writing block %lld, fd= %d\n", i, -+ printf("\nError writing block %ld, fd= %d\n", i, - fd); - #endif - perror("read"); -@@ -16027,7 +16027,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_rrqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_rrqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_rrqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - -@@ -16503,7 +16503,7 @@ thread_reverse_read_test(x) - #ifdef NO_PRINT_LLD - printf("\nError reading block %ld\n", i); - #else -- printf("\nError reading block %lld\n", i); -+ printf("\nError reading block %ld\n", i); - #endif - perror("read"); - if (!no_unlink) -@@ -16585,7 +16585,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_revqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_revqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_revqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - } -@@ -17013,7 +17013,7 @@ thread_stride_read_test(x) - #ifdef NO_PRINT_LLD - printf("\nError reading block %ld, fd= %d\n", i, fd); - #else -- printf("\nError reading block %lld, fd= %d\n", i, fd); -+ printf("\nError reading block %ld, fd= %d\n", i, fd); - #endif - perror("read"); - if (!no_unlink) -@@ -17130,7 +17130,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_strqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_strqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_strqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - } -@@ -17736,7 +17736,7 @@ thread_ranread_test(x) - printf("\nError reading block at %ld\n", - offset); - #else -- printf("\nError reading block at %lld\n", -+ printf("\nError reading block at %ld\n", - offset); - #endif - perror("ranread"); -@@ -17814,7 +17814,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_randrfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_randrfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_randrfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - } -@@ -18492,7 +18492,7 @@ printf("Desired rate %g Actual rate %g - #ifdef NO_PRINT_LLD - fprintf(thread_randwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_randwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_randwqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; -@@ -18744,13 +18744,7 @@ void *x; - pthread_attr_t attr; - int xx; - int *yy; --#ifdef _64BIT_ARCH_ -- long long meme; -- meme = (long long)x; --#else -- long meme; -- meme = (long)x; --#endif -+ intptr_t meme = (intptr_t)x; - yy=(int *)x; - - -@@ -18769,8 +18763,8 @@ void *x; - printf("Thread create failed. Returned %d Errno = %d\n",xx,errno); - if(debug1 ) - { -- printf("\nthread created has an id of %lx\n",ts); -- printf("meme %ld\n",meme); -+ printf("\nthread created has an id of %p\n", ts); -+ printf("meme %lld\n", (long long)meme); - } - return((long long)meme); - } -@@ -22166,7 +22160,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_write_test\n",(int)chid); - fflush(newstdout); - } -- thread_write_test((long)0); -+ thread_write_test(NULL); - break; - #ifdef HAVE_PREAD - case THREAD_PWRITE_TEST : -@@ -22175,7 +22169,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_pwrite_test\n",(int)chid); - fflush(newstdout); - } -- thread_pwrite_test((long)0); -+ thread_pwrite_test(NULL); - break; - #endif - case THREAD_REWRITE_TEST : -@@ -22184,7 +22178,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_rewrite_test\n",(int)chid); - fflush(newstdout); - } -- thread_rwrite_test((long)0); -+ thread_rwrite_test(NULL); - break; - case THREAD_READ_TEST : - if(cdebug>=1) -@@ -22192,7 +22186,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_read_test\n",(int)chid); - fflush(newstdout); - } -- thread_read_test((long)0); -+ thread_read_test(NULL); - break; - #ifdef HAVE_PREAD - case THREAD_PREAD_TEST : -@@ -22201,7 +22195,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_read_test\n",(int)chid); - fflush(newstdout); - } -- thread_pread_test((long)0); -+ thread_pread_test(NULL); - break; - #endif - case THREAD_REREAD_TEST : -@@ -22210,7 +22204,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_reread_test\n",(int)chid); - fflush(newstdout); - } -- thread_rread_test((long)0); -+ thread_rread_test(NULL); - break; - case THREAD_STRIDE_TEST : - if(cdebug>=1) -@@ -22218,7 +22212,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_stride_read_test\n",(int)chid); - fflush(newstdout); - } -- thread_stride_read_test((long)0); -+ thread_stride_read_test(NULL); - break; - case THREAD_RANDOM_READ_TEST : - if(cdebug>=1) -@@ -22226,7 +22220,7 @@ become_client() - fprintf(newstdout,"Child %d running random read test\n",(int)chid); - fflush(newstdout); - } -- thread_ranread_test((long)0); -+ thread_ranread_test(NULL); - break; - case THREAD_RANDOM_WRITE_TEST : - if(cdebug>=1) -@@ -22234,7 +22228,7 @@ become_client() - fprintf(newstdout,"Child %d running random write test\n",(int)chid); - fflush(newstdout); - } -- thread_ranwrite_test((long)0); -+ thread_ranwrite_test(NULL); - break; - case THREAD_REVERSE_READ_TEST : - if(cdebug>=1) -@@ -22242,7 +22236,7 @@ become_client() - fprintf(newstdout,"Child %d running reverse read test\n",(int)chid); - fflush(newstdout); - } -- thread_reverse_read_test((long)0); -+ thread_reverse_read_test(NULL); - break; - case THREAD_RANDOM_MIX_TEST : - if(cdebug>=1) -@@ -22250,7 +22244,7 @@ become_client() - fprintf(newstdout,"Child %d running mixed workload test\n",(int)chid); - fflush(newstdout); - } -- thread_mix_test((long)0); -+ thread_mix_test(NULL); - break; - case THREAD_FWRITE_TEST : - if(cdebug>=1) -@@ -22258,7 +22252,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_fwrite_test\n",(int)chid); - fflush(newstdout); - } -- thread_fwrite_test((long)0); -+ thread_fwrite_test(NULL); - break; - case THREAD_FREAD_TEST : - if(cdebug>=1) -@@ -22266,7 +22260,7 @@ become_client() - fprintf(newstdout,"Child %d running thread_fread_test\n",(int)chid); - fflush(newstdout); - } -- thread_fread_test((long)0); -+ thread_fread_test(NULL); - break; - case THREAD_CLEANUP_TEST : - if(cdebug>=1) -@@ -22274,7 +22268,7 @@ become_client() - fprintf(newstdout,"Child %d running cleanup\n",(int)chid); - fflush(newstdout); - } -- thread_cleanup_test((long)0); -+ thread_cleanup_test(NULL); - break; - }; - if(cdebug>=1) -@@ -23009,7 +23003,7 @@ char *shell; - #ifdef _HPUX_SOURCE - strcpy(shell,"remsh"); - #else -- strcpy(shell,"rsh"); -+ strcpy(shell,"ssh"); - #endif - return; - } -@@ -25030,7 +25024,7 @@ void * thread_fwrite_test( x) - #ifdef NO_PRINT_LLD - fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_wqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; -@@ -25489,7 +25483,7 @@ void * thread_fread_test( x) - #ifdef NO_PRINT_LLD - fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #else -- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); -+ fprintf(thread_wqfd,"%10.1ld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen); - #endif - } - w_traj_ops_completed++; Property changes on: head/benchmarks/iozone/files/patch-iozone.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iozone/files/patch-libasync.c =================================================================== --- head/benchmarks/iozone/files/patch-libasync.c (revision 419221) +++ head/benchmarks/iozone/files/patch-libasync.c (nonexistent) @@ -1,1013 +0,0 @@ ---- libasync.c.orig 2015-10-20 14:12:13 UTC -+++ libasync.c -@@ -96,6 +96,15 @@ - - #include - #include -+ -+#if defined(_LARGEFILE64_SOURCE) && !defined(__LP64__) -+# define aio_error aio_error64 -+# define aio_return aio_return64 -+# define aio_read aio_read64 -+# define aio_cancel aio_cancel64 -+# define aio_write aio_write64 -+#endif -+ - #if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) || defined(__NetBSD__) - #else - #include -@@ -132,11 +141,15 @@ - #include /* For the BSD string functions */ - #endif - --void mbcopy(char *source, char *dest, size_t len); -+static void mbcopy(const char *source, char *dest, size_t len); - - - #if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && !defined(__off64_t_defined) && !defined(SCO_Unixware_gcc) -+# if defined(bsd4_4) -+typedef off_t off64_t; -+# else - typedef long long off64_t; -+# endif - #endif - #if defined(OSFV5) - #include -@@ -150,15 +163,16 @@ extern int one; - * cache, pointed to by async_init(gc) will be of - * this structure type. - */ --char version[] = "Libasync Version $Revision: 3.25 $"; -+static const char version[] = "Libasync Version $Revision: 3.25 $"; - struct cache_ent { -- struct aiocb myaiocb; /* For use in small file mode */ - #ifdef _LARGEFILE64_SOURCE - #if defined(__CrayX1__) -- aiocb64_t myaiocb64; /* For use in large file mode */ -+ aiocb64_t myaiocb; /* For use in large file mode */ - #else -- struct aiocb64 myaiocb64; /* For use in large file mode */ --#endif -+ struct aiocb64 myaiocb; /* For use in large file mode */ -+#endif -+#else -+ struct aiocb myaiocb; - #endif - long long fd; /* File descriptor */ - long long size; /* Size of the transfer */ -@@ -191,8 +205,8 @@ struct cache { - - long long max_depth; - extern int errno; --struct cache_ent *alloc_cache(); --struct cache_ent *incache(); -+static struct cache_ent *alloc_cache(); -+static struct cache_ent *incache(); - void async_init(); - void end_async(); - int async_suspend(); -@@ -274,7 +288,7 @@ async_suspend(struct cache_ent *ce) - #ifdef __LP64__ - const struct aiocb * const cblist[1] = {&ce->myaiocb}; - #else -- const struct aiocb64 * const cblist[1] = {&ce->myaiocb64}; -+ const struct aiocb64 * const cblist[1] = {&ce->myaiocb}; - #endif - #else - const struct aiocb * const cblist[1] = {&ce->myaiocb}; -@@ -347,89 +361,28 @@ long long depth; - */ - if((ce=(struct cache_ent *)incache(gc,fd,offset,size))) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#else -- while((ret=aio_error64(&ce->myaiocb64))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#endif --#else - while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) - { - async_suspend(ce); - } --#endif - if(ret) - { -- printf("aio_error 1: ret %d %d\n",ret,errno); -+ printf("aio_error 1: ret %zd %d\n",ret,errno); - } --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - retval=aio_return(&ce->myaiocb); --#else --#if defined(__CrayX1__) -- retval=aio_return64((aiocb64_t *)&ce->myaiocb64); --#else -- retval=aio_return64((struct aiocb64 *)&ce->myaiocb64); --#endif -- --#endif --#else -- retval=aio_return(&ce->myaiocb); --#endif - if(retval > 0) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- mbcopy((char *)ce->myaiocb.aio_buf,(char *)ubuffer,(size_t)retval); --#else -- mbcopy((char *)ce->myaiocb64.aio_buf,(char *)ubuffer,(size_t)retval); --#endif --#else - mbcopy((char *)ce->myaiocb.aio_buf,(char *)ubuffer,(size_t)retval); --#endif - } --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- if(retval < ce->myaiocb.aio_nbytes) --#else -- if(retval < ce->myaiocb64.aio_nbytes) --#endif --#else - if(retval < ce->myaiocb.aio_nbytes) --#endif - { -- printf("aio_return error1: ret %d %d\n",retval,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("aio_return error1: fd %d offset %ld buffer %lx size %d Opcode %d\n", -- ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -- (long)(ce->myaiocb.aio_buf), -- ce->myaiocb.aio_nbytes, -- ce->myaiocb.aio_lio_opcode --#else -- printf("aio_return error1: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_offset, -- (long)(ce->myaiocb64.aio_buf), -- ce->myaiocb64.aio_nbytes, -- ce->myaiocb64.aio_lio_opcode --#endif --#else -- printf("aio_return error1: fd %d offset %d buffer %lx size %d Opcode %d\n", -+ printf("aio_return error1: ret %zd %d\n",retval,errno); -+ printf("aio_return error1: fd %d offset %lld buffer %p size %zd Opcode %d\n", - ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -- (long)(ce->myaiocb.aio_buf), -+ (long long)ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_buf, - ce->myaiocb.aio_nbytes, - ce->myaiocb.aio_lio_opcode --#endif - ); - } - ce->direct=0; -@@ -443,21 +396,13 @@ long long depth; - del_read++; - first_ce=alloc_cache(gc,fd,offset,size,(long long)LIO_READ); - again: --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- ret=aio_read(&first_ce->myaiocb); --#else -- ret=aio_read64(&first_ce->myaiocb64); --#endif --#else - ret=aio_read(&first_ce->myaiocb); --#endif - if(ret!=0) - { - if(errno==EAGAIN) - goto again; - else -- printf("error returned from aio_read(). Ret %d errno %d\n",ret,errno); -+ printf("error returned from aio_read(). Ret %zd errno %d\n",ret,errno); - } - } - if(stride==0) /* User does not want read-ahead */ -@@ -482,15 +427,7 @@ again: - if((ce=incache(gc,fd,r_offset,a_size))) - continue; - ce=alloc_cache(gc,fd,r_offset,a_size,(long long)LIO_READ); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- ret=aio_read(&ce->myaiocb); --#else -- ret=aio_read64(&ce->myaiocb64); --#endif --#else - ret=aio_read(&ce->myaiocb); --#endif - if(ret!=0) - { - takeoff_cache(gc,ce); -@@ -500,83 +437,27 @@ again: - out: - if(del_read) /* Wait for the first read to complete */ - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - while((ret=aio_error(&first_ce->myaiocb))== EINPROGRESS) - { - async_suspend(first_ce); - } --#else -- while((ret=aio_error64(&first_ce->myaiocb64))== EINPROGRESS) -- { -- async_suspend(first_ce); -- } --#endif --#else -- while((ret=aio_error(&first_ce->myaiocb))== EINPROGRESS) -- { -- async_suspend(first_ce); -- } --#endif - if(ret) -- printf("aio_error 2: ret %d %d\n",ret,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- retval=aio_return(&first_ce->myaiocb); --#else -- retval=aio_return64(&first_ce->myaiocb64); --#endif --#else -+ printf("aio_error 2: ret %zd %d\n",ret,errno); - retval=aio_return(&first_ce->myaiocb); --#endif --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- if(retval < first_ce->myaiocb.aio_nbytes) --#else -- if(retval < first_ce->myaiocb64.aio_nbytes) --#endif --#else - if(retval < first_ce->myaiocb.aio_nbytes) --#endif - { -- printf("aio_return error2: ret %d %d\n",retval,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("aio_return error2: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- first_ce->myaiocb.aio_fildes, -- first_ce->myaiocb.aio_offset, -- (long)(first_ce->myaiocb.aio_buf), -- first_ce->myaiocb.aio_nbytes, -- first_ce->myaiocb.aio_lio_opcode --#else -- printf("aio_return error2: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- first_ce->myaiocb64.aio_fildes, -- first_ce->myaiocb64.aio_offset, -- (long)(first_ce->myaiocb64.aio_buf), -- first_ce->myaiocb64.aio_nbytes, -- first_ce->myaiocb64.aio_lio_opcode --#endif --#else -- printf("aio_return error2: fd %d offset %d buffer %lx size %d Opcode %d\n", -+ printf("aio_return error2: ret %zd %d\n",retval,errno); -+ printf("aio_return error2: fd %d offset %lld buffer %p size %zd Opcode %d\n", - first_ce->myaiocb.aio_fildes, -- first_ce->myaiocb.aio_offset, -- (long)(first_ce->myaiocb.aio_buf), -+ (long long)first_ce->myaiocb.aio_offset, -+ first_ce->myaiocb.aio_buf, - first_ce->myaiocb.aio_nbytes, - first_ce->myaiocb.aio_lio_opcode --#endif - ); - } - if(retval > 0) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - mbcopy((char *)first_ce->myaiocb.aio_buf,(char *)ubuffer,(size_t)retval); --#else -- mbcopy((char *)first_ce->myaiocb64.aio_buf,(char *)ubuffer,(size_t)retval); --#endif --#else -- mbcopy((char *)first_ce->myaiocb.aio_buf,(char *)ubuffer,(size_t)retval); --#endif - } - first_ce->direct=0; - takeoff_cache(gc,first_ce); -@@ -601,7 +482,7 @@ long long fd,size,op; - off64_t offset; - { - struct cache_ent *ce; -- long temp; -+ intptr_t temp; - ce=(struct cache_ent *)malloc((size_t)sizeof(struct cache_ent)); - if(ce == (struct cache_ent *)0) - { -@@ -609,56 +490,22 @@ off64_t offset; - exit(175); - } - bzero(ce,sizeof(struct cache_ent)); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - ce->myaiocb.aio_fildes=(int)fd; - ce->myaiocb.aio_offset=(off64_t)offset; -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -- temp = (temp+page_size) & ~(page_size-1); -- ce->myaiocb.aio_buf=(volatile void *)temp; -- if(ce->myaiocb.aio_buf == 0) --#else -- ce->myaiocb64.aio_fildes=(int)fd; -- ce->myaiocb64.aio_offset=(off64_t)offset; -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -- temp = (temp+page_size) & ~(page_size-1); -- ce->myaiocb64.aio_buf=(volatile void *)temp; -- if(ce->myaiocb64.aio_buf == 0) --#endif --#else -- ce->myaiocb.aio_fildes=(int)fd; -- ce->myaiocb.aio_offset=(off_t)offset; -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -+ ce->real_address = malloc((size_t)(size+page_size)); -+ temp = (intptr_t)ce->real_address; - temp = (temp+page_size) & ~(page_size-1); - ce->myaiocb.aio_buf=(volatile void *)temp; -- if(ce->myaiocb.aio_buf == 0) --#endif -+ if(ce->myaiocb.aio_buf == NULL) - { - printf("Malloc failed\n"); - exit(176); - } - /*bzero(ce->myaiocb.aio_buf,(size_t)size);*/ --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - ce->myaiocb.aio_reqprio=0; - ce->myaiocb.aio_nbytes=(size_t)size; - ce->myaiocb.aio_sigevent.sigev_notify=SIGEV_NONE; - ce->myaiocb.aio_lio_opcode=(int)op; --#else -- ce->myaiocb64.aio_reqprio=0; -- ce->myaiocb64.aio_nbytes=(size_t)size; -- ce->myaiocb64.aio_sigevent.sigev_notify=SIGEV_NONE; -- ce->myaiocb64.aio_lio_opcode=(int)op; --#endif --#else -- ce->myaiocb.aio_reqprio=0; -- ce->myaiocb.aio_nbytes=(size_t)size; -- ce->myaiocb.aio_sigevent.sigev_notify=SIGEV_NONE; -- ce->myaiocb.aio_lio_opcode=(int)op; --#endif - ce->fd=(int)fd; - ce->forward=0; - ce->back=gc->tail; -@@ -687,8 +534,6 @@ off64_t offset; - return(0); - } - move=gc->head; --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - while(move) - { - if((move->fd == fd) && (move->myaiocb.aio_offset==(off64_t)offset) && -@@ -698,28 +543,6 @@ off64_t offset; - } - move=move->forward; - } --#else -- while(move) -- { -- if((move->fd == fd) && (move->myaiocb64.aio_offset==(off64_t)offset) && -- ((size_t)size==move->myaiocb64.aio_nbytes)) -- { -- return(move); -- } -- move=move->forward; -- } --#endif --#else -- while(move) -- { -- if((move->fd == fd) && (move->myaiocb.aio_offset==(off_t)offset) && -- ((size_t)size==move->myaiocb.aio_nbytes)) -- { -- return(move); -- } -- move=move->forward; -- } --#endif - return(0); - } - -@@ -804,26 +627,10 @@ struct cache *gc; - ce=gc->head; - if(ce==0) - return; --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - while((ret = aio_cancel(0,&ce->myaiocb))==AIO_NOTCANCELED) --#else -- while((ret = aio_cancel64(0,&ce->myaiocb64))==AIO_NOTCANCELED) --#endif --#else -- while((ret = aio_cancel(0,&ce->myaiocb))==AIO_NOTCANCELED) --#endif - ; - --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - ret = aio_return(&ce->myaiocb); --#else -- ret = aio_return64(&ce->myaiocb64); --#endif --#else -- ret = aio_return(&ce->myaiocb); --#endif - ce->direct=0; - takeoff_cache(gc,ce); /* remove from cache */ - } -@@ -864,100 +671,29 @@ long long depth; - */ - if((ce=(struct cache_ent *)incache(gc,fd,offset,size))) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#else -- while((ret=aio_error64(&ce->myaiocb64))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#endif --#else - while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) - { - async_suspend(ce); - } --#endif - if(ret) -- printf("aio_error 3: ret %d %d\n",ret,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- if(ce->oldbuf != ce->myaiocb.aio_buf || -- ce->oldfd != ce->myaiocb.aio_fildes || -- ce->oldsize != ce->myaiocb.aio_nbytes) --#else -- if(ce->oldbuf != ce->myaiocb64.aio_buf || -- ce->oldfd != ce->myaiocb64.aio_fildes || -- ce->oldsize != ce->myaiocb64.aio_nbytes) --#endif --#else -- if(ce->oldbuf != ce->myaiocb.aio_buf || -- ce->oldfd != ce->myaiocb.aio_fildes || -- ce->oldsize != ce->myaiocb.aio_nbytes) --#endif -+ printf("aio_error 3: ret %zd %d\n",ret,errno); - printf("It changed in flight\n"); - --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- retval=aio_return(&ce->myaiocb); --#else -- retval=aio_return64(&ce->myaiocb64); --#endif --#else - retval=aio_return(&ce->myaiocb); --#endif - if(retval > 0) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- *ubuffer=(char *)ce->myaiocb.aio_buf; --#else -- *ubuffer=(char *)ce->myaiocb64.aio_buf; --#endif --#else -- *ubuffer=(char *)ce->myaiocb.aio_buf; --#endif -+ *ubuffer= (char *)ce->myaiocb.aio_buf; - }else -- *ubuffer=0; --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- if(retval < ce->myaiocb.aio_nbytes) --#else -- if(retval < ce->myaiocb64.aio_nbytes) --#endif --#else -+ *ubuffer= NULL; - if(retval < ce->myaiocb.aio_nbytes) --#endif - { -- printf("aio_return error4: ret %d %d\n",retval,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("aio_return error4: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -- (long)(ce->myaiocb.aio_buf), -- ce->myaiocb.aio_nbytes, -- ce->myaiocb.aio_lio_opcode --#else -- printf("aio_return error4: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_offset, -- (long)(ce->myaiocb64.aio_buf), -- ce->myaiocb64.aio_nbytes, -- ce->myaiocb64.aio_lio_opcode --#endif --#else -- printf("aio_return error4: fd %d offset %d buffer %lx size %d Opcode %d\n", -+ printf("aio_return error4: ret %zd %d\n",retval,errno); -+ printf("aio_return error4: fd %d offset %lld buffer %p size %zd Opcode %d\n", - ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -- (long)(ce->myaiocb.aio_buf), -+ (long long)ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_buf, - ce->myaiocb.aio_nbytes, - ce->myaiocb.aio_lio_opcode --#endif - ); - } - ce->direct=1; -@@ -973,30 +709,16 @@ long long depth; - first_ce=alloc_cache(gc,fd,offset,size,(long long)LIO_READ); /* allocate buffer */ - /*printf("allocated buffer/read %x offset %d\n",first_ce->myaiocb.aio_buf,offset);*/ - again: --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- first_ce->oldbuf=first_ce->myaiocb.aio_buf; -- first_ce->oldfd=first_ce->myaiocb.aio_fildes; -- first_ce->oldsize=first_ce->myaiocb.aio_nbytes; -- ret=aio_read(&first_ce->myaiocb); --#else -- first_ce->oldbuf=first_ce->myaiocb64.aio_buf; -- first_ce->oldfd=first_ce->myaiocb64.aio_fildes; -- first_ce->oldsize=first_ce->myaiocb64.aio_nbytes; -- ret=aio_read64(&first_ce->myaiocb64); --#endif --#else - first_ce->oldbuf=first_ce->myaiocb.aio_buf; - first_ce->oldfd=first_ce->myaiocb.aio_fildes; - first_ce->oldsize=first_ce->myaiocb.aio_nbytes; - ret=aio_read(&first_ce->myaiocb); --#endif - if(ret!=0) - { - if(errno==EAGAIN) - goto again; - else -- printf("error returned from aio_read(). Ret %d errno %d\n",ret,errno); -+ printf("error returned from aio_read(). Ret %zd errno %d\n",ret,errno); - } - } - if(stride==0) /* User does not want read-ahead */ -@@ -1021,24 +743,10 @@ again: - if((ce=incache(gc,fd,r_offset,a_size))) - continue; - ce=alloc_cache(gc,fd,r_offset,a_size,(long long)LIO_READ); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - ce->oldbuf=ce->myaiocb.aio_buf; - ce->oldfd=ce->myaiocb.aio_fildes; - ce->oldsize=ce->myaiocb.aio_nbytes; - ret=aio_read(&ce->myaiocb); --#else -- ce->oldbuf=ce->myaiocb64.aio_buf; -- ce->oldfd=ce->myaiocb64.aio_fildes; -- ce->oldsize=ce->myaiocb64.aio_nbytes; -- ret=aio_read64(&ce->myaiocb64); --#endif --#else -- ce->oldbuf=ce->myaiocb.aio_buf; -- ce->oldfd=ce->myaiocb.aio_fildes; -- ce->oldsize=ce->myaiocb.aio_nbytes; -- ret=aio_read(&ce->myaiocb); --#endif - if(ret!=0) - { - takeoff_cache(gc,ce); -@@ -1048,97 +756,33 @@ again: - out: - if(del_read) /* Wait for the first read to complete */ - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - while((ret=aio_error(&first_ce->myaiocb))== EINPROGRESS) - { - async_suspend(first_ce); - } --#else -- while((ret=aio_error64(&first_ce->myaiocb64))== EINPROGRESS) -- { -- async_suspend(first_ce); -- } --#endif --#else -- while((ret=aio_error(&first_ce->myaiocb))== EINPROGRESS) -- { -- async_suspend(first_ce); -- } --#endif - if(ret) -- printf("aio_error 4: ret %d %d\n",ret,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- if(first_ce->oldbuf != first_ce->myaiocb.aio_buf || -- first_ce->oldfd != first_ce->myaiocb.aio_fildes || -- first_ce->oldsize != first_ce->myaiocb.aio_nbytes) -- printf("It changed in flight2\n"); -- retval=aio_return(&first_ce->myaiocb); --#else -- if(first_ce->oldbuf != first_ce->myaiocb64.aio_buf || -- first_ce->oldfd != first_ce->myaiocb64.aio_fildes || -- first_ce->oldsize != first_ce->myaiocb64.aio_nbytes) -- printf("It changed in flight2\n"); -- retval=aio_return64(&first_ce->myaiocb64); --#endif --#else -+ printf("aio_error 4: ret %zd %d\n",ret,errno); - if(first_ce->oldbuf != first_ce->myaiocb.aio_buf || - first_ce->oldfd != first_ce->myaiocb.aio_fildes || - first_ce->oldsize != first_ce->myaiocb.aio_nbytes) - printf("It changed in flight2\n"); - retval=aio_return(&first_ce->myaiocb); --#endif --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - if(retval < first_ce->myaiocb.aio_nbytes) --#else -- if(retval < first_ce->myaiocb64.aio_nbytes) --#endif --#else -- if(retval < first_ce->myaiocb.aio_nbytes) --#endif - { -- printf("aio_return error5: ret %d %d\n",retval,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("aio_return error5: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- first_ce->myaiocb.aio_fildes, -- first_ce->myaiocb.aio_offset, -- (long)(first_ce->myaiocb.aio_buf), -- first_ce->myaiocb.aio_nbytes, -- first_ce->myaiocb.aio_lio_opcode --#else -- printf("aio_return error5: fd %d offset %lld buffer %lx size %d Opcode %d\n", -- first_ce->myaiocb64.aio_fildes, -- first_ce->myaiocb64.aio_offset, -- (long)(first_ce->myaiocb64.aio_buf), -- first_ce->myaiocb64.aio_nbytes, -- first_ce->myaiocb64.aio_lio_opcode --#endif --#else -- printf("aio_return error5: fd %d offset %ld buffer %lx size %d Opcode %d\n", -+ printf("aio_return error5: ret %zd %d\n",retval,errno); -+ printf("aio_return error5: fd %d offset %lld buffer %p size %zd Opcode %d\n", - first_ce->myaiocb.aio_fildes, -- first_ce->myaiocb.aio_offset, -- (long)(first_ce->myaiocb.aio_buf), -+ (long long)first_ce->myaiocb.aio_offset, -+ first_ce->myaiocb.aio_buf, - first_ce->myaiocb.aio_nbytes, - first_ce->myaiocb.aio_lio_opcode --#endif - ); - } - if(retval > 0) - { --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- *ubuffer=(char *)first_ce->myaiocb.aio_buf; --#else -- *ubuffer=(char *)first_ce->myaiocb64.aio_buf; --#endif --#else -- *ubuffer=(char *)first_ce->myaiocb.aio_buf; --#endif -+ *ubuffer= (char *)first_ce->myaiocb.aio_buf; - }else -- *ubuffer=(char *)0; -+ *ubuffer= NULL; - first_ce->direct=1; /* do not delete the buffer */ - takeoff_cache(gc,first_ce); - putoninuse(gc,first_ce); -@@ -1217,32 +861,16 @@ long long depth; - size_t ret; - ce=allocate_write_buffer(gc,fd,offset,size,(long long)LIO_WRITE,depth,0LL,(char *)0,(char *)0); - ce->direct=0; /* not direct. Lib supplies buffer and must free it */ --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- mbcopy(buffer,(char *)(ce->myaiocb.aio_buf),(size_t)size); --#else -- mbcopy(buffer,(char *)(ce->myaiocb64.aio_buf),(size_t)size); --#endif --#else - mbcopy(buffer,(char *)(ce->myaiocb.aio_buf),(size_t)size); --#endif - async_put_on_write_queue(gc,ce); - /* -- printf("asw: fd %d offset %lld, size %d\n",ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); -+ printf("asw: fd %d offset %lld, size %zd\n",ce->myaiocb.aio_fildes, -+ ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_nbytes); - */ - - again: --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- ret=aio_write(&ce->myaiocb); --#else -- ret=aio_write64(&ce->myaiocb64); --#endif --#else - ret=aio_write(&ce->myaiocb); --#endif - if(ret==-1) - { - if(errno==EAGAIN) -@@ -1258,13 +886,13 @@ again: - } - else - { -- printf("Error in aio_write: ret %d errno %d count %lld\n",ret,errno,gc->w_count); -+ printf("Error in aio_write: ret %zd errno %d count %lld\n",ret,errno,gc->w_count); - /* -- printf("aio_write_no_copy: fd %d buffer %x offset %lld size %d\n", -- ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_buf, -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); -+ printf("aio_write_no_copy: fd %d buffer %x offset %lld size %zd\n", -+ ce->myaiocb.aio_fildes, -+ ce->myaiocb.aio_buf, -+ ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_nbytes); - */ - exit(177); - } -@@ -1288,7 +916,7 @@ long long direct; - char *buffer,*free_addr; - { - struct cache_ent *ce; -- long temp; -+ intptr_t temp; - if(fd==0LL) - { - printf("Setting up write buffer insane\n"); -@@ -1303,46 +931,12 @@ char *buffer,*free_addr; - exit(179); - } - bzero(ce,sizeof(struct cache_ent)); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- ce->myaiocb.aio_fildes=(int)fd; -- ce->myaiocb.aio_offset=(off64_t)offset; -- if(!direct) -- { -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -- temp = (temp+page_size) & ~(page_size-1); -- ce->myaiocb.aio_buf=(volatile void *)temp; -- }else -- { -- ce->myaiocb.aio_buf=(volatile void *)buffer; -- ce->real_address=(char *)free_addr; -- } -- if(ce->myaiocb.aio_buf == 0) --#else -- ce->myaiocb64.aio_fildes=(int)fd; -- ce->myaiocb64.aio_offset=(off64_t)offset; -- if(!direct) -- { -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -- temp = (temp+page_size) & ~(page_size-1); -- ce->myaiocb64.aio_buf=(volatile void *)temp; -- } -- else -- { -- ce->myaiocb64.aio_buf=(volatile void *)buffer; -- ce->real_address=(char *)free_addr; -- } -- if(ce->myaiocb64.aio_buf == 0) --#endif --#else - ce->myaiocb.aio_fildes=(int)fd; - ce->myaiocb.aio_offset=(off_t)offset; - if(!direct) - { -- ce->real_address = (char *)malloc((size_t)(size+page_size)); -- temp=(long)ce->real_address; -+ ce->real_address = malloc((size_t)(size+page_size)); -+ temp = (intptr_t)ce->real_address; - temp = (temp+page_size) & ~(page_size-1); - ce->myaiocb.aio_buf=(volatile void *)temp; - } -@@ -1352,29 +946,14 @@ char *buffer,*free_addr; - ce->real_address=(char *)free_addr; - } - if(ce->myaiocb.aio_buf == 0) --#endif - { - printf("Malloc failed 2\n"); - exit(180); - } --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - ce->myaiocb.aio_reqprio=0; - ce->myaiocb.aio_nbytes=(size_t)size; - ce->myaiocb.aio_sigevent.sigev_notify=SIGEV_NONE; - ce->myaiocb.aio_lio_opcode=(int)op; --#else -- ce->myaiocb64.aio_reqprio=0; -- ce->myaiocb64.aio_nbytes=(size_t)size; -- ce->myaiocb64.aio_sigevent.sigev_notify=SIGEV_NONE; -- ce->myaiocb64.aio_lio_opcode=(int)op; --#endif --#else -- ce->myaiocb.aio_reqprio=0; -- ce->myaiocb.aio_nbytes=(size_t)size; -- ce->myaiocb.aio_sigevent.sigev_notify=SIGEV_NONE; -- ce->myaiocb.aio_lio_opcode=(int)op; --#endif - ce->fd=(int)fd; - return(ce); - } -@@ -1408,7 +987,7 @@ struct cache *gc; - { - while(gc->w_head) - { -- /*printf("async_write_finish: Waiting for buffer %x to finish\n",gc->w_head->myaiocb64.aio_buf);*/ -+ /*printf("async_write_finish: Waiting for buffer %x to finish\n",gc->w_head->myaiocb.aio_buf);*/ - async_wait_for_write(gc); - } - } -@@ -1422,7 +1001,8 @@ async_wait_for_write(gc) - struct cache *gc; - { - struct cache_ent *ce; -- size_t ret,retval; -+ size_t ret; -+ int retval; - if(gc->w_head==0) - return; - ce=gc->w_head; -@@ -1431,69 +1011,28 @@ struct cache *gc; - ce->forward=0; - if(ce==gc->w_tail) - gc->w_tail=0; -- /*printf("Wait for buffer %x offset %lld size %d to finish\n", -- ce->myaiocb64.aio_buf, -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); -+ /*printf("Wait for buffer %x offset %lld size %zd to finish\n", -+ ce->myaiocb.aio_buf, -+ ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_nbytes); - printf("write count %lld \n",gc->w_count); - */ --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ - while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) - { - async_suspend(ce); - } --#else -- while((ret=aio_error64(&ce->myaiocb64))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#endif --#else -- while((ret=aio_error(&ce->myaiocb))== EINPROGRESS) -- { -- async_suspend(ce); -- } --#endif - if(ret) - { -- printf("aio_error 5: ret %d %d\n",ret,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("fd %d offset %lld size %d\n", -- ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -- ce->myaiocb.aio_nbytes); --#else -- printf("fd %d offset %lld size %d\n", -- ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); --#endif --#else -- printf("fd %d offset %lld size %d\n", -+ printf("aio_error 5: ret %zd %d\n",ret,errno); -+ printf("fd %d offset %lld size %zd\n", - ce->myaiocb.aio_fildes, -- ce->myaiocb.aio_offset, -+ (long long)ce->myaiocb.aio_offset, - ce->myaiocb.aio_nbytes); --#endif - exit(181); - } - --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- retval=aio_return(&ce->myaiocb); --#else --#if defined(__CrayX1__) -- retval=aio_return64((aiocb64_t *)&ce->myaiocb64); --#else -- retval=aio_return64((struct aiocb64 *)&ce->myaiocb64); --#endif -- --#endif --#else - retval=aio_return(&ce->myaiocb); --#endif -- if((int)retval < 0) -+ if(retval < 0) - { - printf("aio_return error: %d\n",errno); - } -@@ -1533,21 +1072,13 @@ char *free_addr; - ce->direct=0; /* have library de-allocate the buffer */ - async_put_on_write_queue(gc,ce); - /* -- printf("awnc: fd %d offset %lld, size %d\n",ce->myaiocb64.aio_fildes, -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); -+ printf("awnc: fd %d offset %lld, size %zd\n",ce->myaiocb.aio_fildes, -+ ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_nbytes); - */ - - again: --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- ret=aio_write(&ce->myaiocb); --#else -- ret=aio_write64(&ce->myaiocb64); --#endif --#else - ret=aio_write(&ce->myaiocb); --#endif - if(ret==-1) - { - if(errno==EAGAIN) -@@ -1563,28 +1094,12 @@ again: - } - else - { -- printf("Error in aio_write: ret %d errno %d\n",ret,errno); --#ifdef _LARGEFILE64_SOURCE --#ifdef __LP64__ -- printf("aio_write_no_copy: fd %d buffer %lx offset %lld size %d\n", -- ce->myaiocb.aio_fildes, -- (long)(ce->myaiocb.aio_buf), -- ce->myaiocb.aio_offset, -- ce->myaiocb.aio_nbytes); --#else -- printf("aio_write_no_copy: fd %d buffer %lx offset %lld size %d\n", -- ce->myaiocb64.aio_fildes, -- (long)(ce->myaiocb64.aio_buf), -- ce->myaiocb64.aio_offset, -- ce->myaiocb64.aio_nbytes); --#endif --#else -- printf("aio_write_no_copy: fd %d buffer %lx offset %ld size %d\n", -+ printf("Error in aio_write: ret %zd errno %d\n",ret,errno); -+ printf("aio_write_no_copy: fd %d buffer %p offset %lld size %zd\n", - ce->myaiocb.aio_fildes, -- (long)(ce->myaiocb.aio_buf), -- ce->myaiocb.aio_offset, -+ ce->myaiocb.aio_buf, -+ (long long)ce->myaiocb.aio_offset, - ce->myaiocb.aio_nbytes); --#endif - exit(182); - } - } -@@ -1595,7 +1110,8 @@ again: - } - - void mbcopy(source, dest, len) --char *source,*dest; -+const char *source; -+char *dest; - size_t len; - { - int i; Property changes on: head/benchmarks/iozone/files/patch-libasync.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iozone/Makefile =================================================================== --- head/benchmarks/iozone/Makefile (revision 419221) +++ head/benchmarks/iozone/Makefile (revision 419222) @@ -1,42 +1,41 @@ # Created by: jmz # $FreeBSD$ PORTNAME= iozone -DISTVERSION= 3_434 -PORTREVISION= 1 +DISTVERSION= 3_457 CATEGORIES= benchmarks MASTER_SITES= http://www.iozone.org/src/current/ DISTNAME= ${PORTNAME}${DISTVERSION} MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Performance Test of Sequential File I/O WRKSRC= ${WRKDIR}/${DISTNAME}/src/current USES= tar MAKEFILE= makefile MAKE_ARGS= ${MAKE_ENV} ALL_TARGET= freebsd MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/iozone man/man1/iozone.1.gz OPTIONS_DEFINE= SSH THREADS OPTIONS_DEFAULT=SSH THREADS SSH_DESC= Use ssh in distributed measurement THREADS_DESC= Enable threading (uses pthreads) THREADS_LDFLAGS= -lpthread THREADS_CFLAGS_OFF= -DNO_THREADS post-patch-SSH-on: @${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \ ${WRKSRC}/iozone.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/benchmarks/iozone/distinfo =================================================================== --- head/benchmarks/iozone/distinfo (revision 419221) +++ head/benchmarks/iozone/distinfo (revision 419222) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466168535 -SHA256 (iozone3_434.tar) = 2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a -SIZE (iozone3_434.tar) = 1843200 +TIMESTAMP = 1469716729 +SHA256 (iozone3_457.tar) = 93e1a86d4c45d61795d7f13a331419a8c654d5240d0e764954f4b2a48d83e3f5 +SIZE (iozone3_457.tar) = 1843200