Attachment 172630 Details for Bug 211152 – svn-diff_benchmark_iozone_update_3.444

[patch] svn-diff_benchmark_iozone_update_3.444

svn-diff_benchmarks__iozone_3.444 (text/plain), 26.65 KB, created by Walter Schwarzenfeld on 2016-07-18 08:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2016-07-18 08:37:59 UTC

Size: 26.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 418690)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	iozone
>-DISTVERSION=	3_434
>+DISTVERSION=	3_444
> CATEGORIES=	benchmarks
> MASTER_SITES=	http://www.iozone.org/src/current/
> DISTNAME=	${PORTNAME}${DISTVERSION}
>@@ -12,7 +12,7 @@
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/src/current
> 
>-USES=		tar
>+USES=		tar:tgz
> MAKEFILE=	makefile
> MAKE_ARGS=	${MAKE_ENV}
> ALL_TARGET=	freebsd
>Index: distinfo
>===================================================================
>--- distinfo	(revision 418690)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1466168535
>-SHA256 (iozone3_434.tar) = 2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a
>-SIZE (iozone3_434.tar) = 1843200
>+TIMESTAMP = 1468829143
>+SHA256 (iozone3_444.tgz) = 715f14910e9cb2adda46500e343474a3a8bf9dbd688dfdd4e432af55d838c2bd
>+SIZE (iozone3_444.tgz) = 823479
>Index: files/patch-iozone.c
>===================================================================
>--- files/patch-iozone.c	(revision 418690)
>+++ files/patch-iozone.c	(working copy)
>@@ -1,154 +1,457 @@
>-Fix warnings from modern compilers -- formats, use of 0 instead of NULL.
>-Also remove redundant casts and fix printf-formatting.
>-
>-	-mi
>---- iozone.c	2015-10-20 14:12:13.000000000 +0000
>+--- iozone.c.orig	2016-07-17 01:34:04 UTC
> +++ iozone.c
>-@@ -8679,5 +8679,5 @@
>- 			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)
>-@@ -14765,5 +14765,5 @@
>- 		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)
>-@@ -15318,5 +15318,5 @@
>- 		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);
>-@@ -15878,5 +15878,5 @@
>- 		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)
>-@@ -18745,11 +18745,5 @@
>- 	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;
>+@@ -351,6 +351,10 @@ typedef long long off64_t;
>+ typedef off_t off64_t;
>+ #endif
>  
>-@@ -18770,6 +18764,6 @@
>- 	if(debug1 )
>++#if defined(__FreeBSD__)
>++#define __off64_t_defined
>++typedef off_t off64_t;
>++#endif
>+ 
>+ #ifndef solaris
>+ #ifndef off64_t
>+@@ -360,6 +364,7 @@ typedef off_t off64_t;
>+ #ifndef SCO_Unixware_gcc
>+ #ifndef UWIN
>+ #ifndef __DragonFly__
>++#ifndef __FreeBSD__
>+ typedef long long off64_t;
>+ #endif
>+ #endif
>+@@ -369,6 +374,7 @@ typedef long long off64_t;
>+ #endif
>+ #endif
>+ #endif
>++#endif
>+ 
>+ #ifdef __AIX__
>+ #include <fcntl.h>
>+@@ -1918,7 +1924,7 @@ char **argv;
>+ #ifdef NO_PRINT_LLD
>+ 			sscanf(optarg,"%ld",&kilobytes64);
>+ #else
>+-			sscanf(optarg,"%lld",&kilobytes64);
>++			sscanf(optarg,"%lld",&kilobytes64);
>+ #endif
>+ 			if(optarg[strlen(optarg)-1]=='k' ||
>+ 				optarg[strlen(optarg)-1]=='K'){
>+@@ -1942,7 +1948,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 %lld kB\n",(long long)kilobytes64);
>+ #endif
>+ 			sflag++;
>+ 			break;
>+@@ -2316,7 +2322,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 %lld kilobytes.\n",(long long)minimum_file_size);
>+ #endif
>+ 			break;
>+ 		case 'g':	/* Set maximum file size for auto mode */
>+@@ -2339,7 +2345,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 %lld kilobytes.\n",(long long)maximum_file_size);
>+ #endif
>+ 			break;
>+ 		case 'z':	/* Set no cross over */
>+@@ -2447,7 +2453,7 @@ char **argv;
>+ 					#ifdef NO_PRINT_LLD
>+ 						sscanf(subarg,"%ld",&burst_size_kb_64);
>+ 					#else
>+-						sscanf(subarg,"%lld",&burst_size_kb_64);
>++						sscanf(subarg,"%lld",&burst_size_kb_64);
>+ 					#endif
>+ 					if(subarg[strlen(subarg)-1]=='k' ||
>+ 						subarg[strlen(subarg)-1]=='K'){
>+@@ -3109,7 +3115,7 @@ char **argv;
>+ 		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",
>+-		burst_size_kb_64, burst_sleep_duration_msec);
>++		(long long)burst_size_kb_64, burst_sleep_duration_msec);
>+ #endif
>+ 	if(!rflag)
>+ 		reclen=(long long)4096;
>+@@ -3345,7 +3351,7 @@ long long reclength;
>+ 		if(!silent) printf("%8ld",reclen/1024);
>+ 	}
>+ #else
>+-	if(!silent) printf("%16lld",kilobytes64);
>++	if(!silent) printf("%16lld",(long long)kilobytes64);
>+ 	if(r_traj_flag || w_traj_flag)
>  	{
>--		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);
>+ 		if(!silent) printf("%8lld",(long long )0);
>+@@ -3403,7 +3409,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 %lld %lld ", (long long)kilobytes64,  goodrecl);
>+ 	    	printf("\t(i.e. record size = %lld bytes)\n",  goodrecl);
>+ #endif
>+ 	   }
>+@@ -3544,7 +3550,7 @@ void auto_test()
>+                                 min_rec_size,min_file_size);
>+ #else
>+             printf("Error: record length %lld is greater than filesize %lld kB\n ",
>+-                                min_rec_size,min_file_size);
>++                                min_rec_size,(long long)min_file_size);
>+ #endif
>+                 exit(23);
>+         }
>+@@ -3739,7 +3745,7 @@ throughput_test()
>+ 		port,kilobytes64);
>+ #else
>+ 	if(!silent) printf("\tEach %s writes a %lld kByte file in telemetry controlled records\n",
>+-		port,kilobytes64);
>++		port,(long long)kilobytes64);
>+ #endif
>  	}
>- 	return((long long)meme);
>-@@ -22167,5 +22161,5 @@
>- 			fflush(newstdout);
>+ 	else
>+@@ -3749,7 +3755,7 @@ throughput_test()
>+ 		port,kilobytes64,reclen/1024);
>+ #else
>+ 	if(!silent) printf("\tEach %s writes a %lld kByte file in %lld kByte records\n",
>+-		port,kilobytes64,reclen/1024);
>++		port,(long long)kilobytes64,reclen/1024);
>+ #endif
>+ 	}
>+ 
>+@@ -7182,8 +7188,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 %lld \n",(long long)file_position);
>++	printf("Record # %lld Record size %lld kb \n",(long long)recnum,recsize/1024);
>+ 	printf("where %px loop %lld\n",where,(long long)i);
>+ #endif
>+ 		   return(1);
>+@@ -7226,9 +7232,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 %lld %lld %lld \n",(long long)i,j,k);
>++	printf("Error in file: Position %lld \n",(long long)file_position);
>++	printf("Record # %lld Record size %lld kb \n",(long long)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 +7841,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.1lld %10.0f %10.1lld\n",((long long)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.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
>+ #endif
>+ 			}
>+ 			w_traj_ops_completed++;
>+@@ -8331,7 +8337,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 %llu %llx\n", (long long)i,
>+ 					(unsigned long long)buffer);
>+ #endif
>+ #else
>+@@ -8749,7 +8755,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 %lld %llx\n", (long long)i,
>+ 					(unsigned long long)nbuff);
>+ #endif
>+ #else
>+@@ -8798,9 +8804,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.1lld %10.0f %10.1lld\n",((long long)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.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
>+ #endif
>+ 			}
>+ 			r_traj_ops_completed++;
>+@@ -9227,7 +9233,7 @@ long long *data1, *data2;
>+ 					 offset64); 
>+ #else
>+ 				 printf("\nError reading block at %lld\n",
>+-					 offset64); 
>++					 (long long)offset64); 
>+ #endif
>+ 				 perror("read");
>+ 				 exit(70);
>+@@ -9351,7 +9357,7 @@ long long *data1, *data2;
>+ 							offset64); 
>+ #else
>+ 						printf("\nError writing block at %lld\n",
>+-							offset64); 
>++							(long long)offset64); 
>+ #endif
>+ 						if(wval==-1)
>+ 							perror("write");
>+@@ -9667,7 +9673,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 %lld\n", (long long)i); 
>+ #endif
>+ 					perror("read");
>+ 					exit(79);
>+@@ -10272,8 +10278,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 %lld, fd= %d Filename %s Read returned %lld\n", (long long)i, fd,filename,uu);
>++		    		printf("\nSeeked to %lld Reclen = %lld\n", (long long)savepos64,reclen);
>+ #endif
>+ 				perror("read");
>+ 		    		exit(88);
>+@@ -11799,7 +11805,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%lld%c",'"',(long long)rec_size/1024,'"');
>+ #endif
>+ 	}
>+ 	if(!silent) printf("\n");
>+@@ -11817,7 +11823,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%lld%c  ",'"',(long long)current_file_size,'"');
>+ #endif
>+ 	for(i=0;i<=max_y;i++){
>+ 		if(report_array[0][i] != current_file_size){
>+@@ -11832,7 +11838,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%lld%c  ",'"',(long long)current_file_size,'"');
>+ #endif
>  		}
>--		thread_write_test((long)0);
>-+		thread_write_test(NULL);
>- 		break;
>- #ifdef HAVE_PREAD
>-@@ -22176,5 +22170,5 @@
>- 			fflush(newstdout);
>+ 		if(bif_flag)
>+@@ -11840,7 +11846,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(" %lld ",(long long)report_array[who][i]);
>+ #endif
>+ 	}
>+ 	if(bif_flag)
>+@@ -12029,7 +12035,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%lld%c",'"',(long long)rec_size/1024,'"');
>+ #endif
>+ 	}
>+ 	if(!silent) printf("\n");
>+@@ -12047,7 +12053,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%lld%c  ",'"',(long long)current_file_size,'"');
>+ #endif
>+ 	for (i = 0; i <= max_y; i++) {
>+ 		if (report_array[0][i] != current_file_size) {
>+@@ -12062,7 +12068,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%lld%c  ",'"',(long long)current_file_size,'"');
>+ #endif
>  		}
>--		thread_pwrite_test((long)0);
>-+		thread_pwrite_test(NULL);
>- 		break;
>+ 		if (bif_flag)
>+@@ -13061,7 +13067,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>  #endif
>-@@ -22185,5 +22179,5 @@
>- 			fflush(newstdout);
>  		}
>--		thread_rwrite_test((long)0);
>-+		thread_rwrite_test(NULL);
>- 		break;
>- 	case THREAD_READ_TEST : 
>-@@ -22193,5 +22187,5 @@
>- 			fflush(newstdout);
>+ 		w_traj_ops_completed++;
>+@@ -13715,7 +13721,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>  		}
>--		thread_read_test((long)0);
>-+		thread_read_test(NULL);
>- 		break;
>- #ifdef HAVE_PREAD
>-@@ -22202,5 +22196,5 @@
>- 			fflush(newstdout);
>+ 		w_traj_ops_completed++;
>+@@ -14325,7 +14331,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>  		}
>--		thread_pread_test((long)0);
>-+		thread_pread_test(NULL);
>- 		break;
>+ 		if(rlocking)
>+@@ -14840,7 +14846,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 %lld, fd= %d\n", (long long)i,
>+ 					 fd);
>  #endif
>-@@ -22211,5 +22205,5 @@
>- 			fflush(newstdout);
>+ 				perror("read");
>+@@ -14914,7 +14920,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 
>+@@ -15375,7 +15381,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 %lld, fd= %d\n", (long long)i,
>+ 					 fd);
>+ #endif
>+ 				perror("pread");
>+@@ -15449,7 +15455,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 
>+@@ -15953,7 +15959,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 %lld, fd= %d\n", (long long)i,
>+ 					 fd);
>+ #endif
>+ 				perror("read");
>+@@ -16027,7 +16033,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 
>+@@ -16503,7 +16509,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 %lld\n", (long long)i); 
>+ #endif
>+ 				perror("read");
>+ 				if (!no_unlink)
>+@@ -16585,7 +16591,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 	}
>+@@ -17013,7 +17019,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 %lld, fd= %d\n", (long long)i, fd);
>+ #endif
>+ 				perror("read");
>+ 				if (!no_unlink)
>+@@ -17130,7 +17136,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 	}
>+@@ -17737,7 +17743,7 @@ thread_ranread_test(x)
>+ 					 offset); 
>+ #else
>+ 				printf("\nError reading block at %lld\n",
>+-					 offset); 
>++					 (long long)offset); 
>+ #endif
>+ 				perror("ranread");
>+ 				if (!no_unlink)
>+@@ -17814,7 +17820,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>+                 }
>+ 	}
>+@@ -18492,7 +18498,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>  		}
>--		thread_rread_test((long)0);
>-+		thread_rread_test(NULL);
>- 		break;
>- 	case THREAD_STRIDE_TEST : 
>-@@ -22219,5 +22213,5 @@
>- 			fflush(newstdout);
>+ 		w_traj_ops_completed++;
>+@@ -25030,7 +25036,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>  		}
>--		thread_stride_read_test((long)0);
>-+		thread_stride_read_test(NULL);
>- 		break;
>- 	case THREAD_RANDOM_READ_TEST : 
>-@@ -22227,5 +22221,5 @@
>- 			fflush(newstdout);
>+                 w_traj_ops_completed++;
>+@@ -25489,7 +25495,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.1lld %10.0f %10.1lld\n",(long long)(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
>+ #endif
>  		}
>--		thread_ranread_test((long)0);
>-+		thread_ranread_test(NULL);
>- 		break;
>- 	case THREAD_RANDOM_WRITE_TEST : 
>-@@ -22235,5 +22229,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_ranwrite_test((long)0);
>-+		thread_ranwrite_test(NULL);
>- 		break;
>- 	case THREAD_REVERSE_READ_TEST : 
>-@@ -22243,5 +22237,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_reverse_read_test((long)0);
>-+		thread_reverse_read_test(NULL);
>- 		break;
>- 	case THREAD_RANDOM_MIX_TEST : 
>-@@ -22251,5 +22245,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_mix_test((long)0);
>-+		thread_mix_test(NULL);
>- 		break;
>- 	case THREAD_FWRITE_TEST : 
>-@@ -22259,5 +22253,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_fwrite_test((long)0);
>-+		thread_fwrite_test(NULL);
>- 		break;
>- 	case THREAD_FREAD_TEST : 
>-@@ -22267,5 +22261,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_fread_test((long)0);
>-+		thread_fread_test(NULL);
>- 		break;
>- 	case THREAD_CLEANUP_TEST : 
>-@@ -22275,5 +22269,5 @@
>- 			fflush(newstdout);
>- 		}
>--		thread_cleanup_test((long)0);
>-+		thread_cleanup_test(NULL);
>- 		break;
>- 	};
>+                 w_traj_ops_completed++;
>Index: files/patch-pit_server.c
>===================================================================
>--- files/patch-pit_server.c	(revision 418690)
>+++ files/patch-pit_server.c	(working copy)
>@@ -6,37 +6,3 @@
> -	exit;
>     }
>     /*
>-@@ -311,6 +310,6 @@
>-                   "   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,
>-@@ -621,6 +620,6 @@
>-                         "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,
>-@@ -729,5 +728,5 @@
>-                ssize_t rBytes = count;
>-                fprintf( stderr,
>--                        "%s: UDP datagram received (%ld bytes).\n",
>-+                        "%s: UDP datagram received (%zd bytes).\n",
>-                         pgmName,
>-                         count );
>-@@ -746,6 +745,6 @@
>-                         "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,

Actions: View | Diff

Attachments on bug 211152: 172588 | 172593 | 172598 | 172600 | 172627 | 172630 | 172682 | 172683 | 172736