Attachment #172600 for bug #211152

View | Details | Raw Unified | Return to bug 211152 | Differences between
Collapse All | Expand All




--- iozone.c.orig	2016-07-17 01:34:04 UTC
+++ iozone.c
@@ -351,6 +351,10 @@ typedef long long off64_t;
 typedef off_t off64_t;
 #endif
 
+#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",(long long *)&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",(long long *)&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)
 	{
 		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
 	}
 	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
 		}
 		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
 		}
 		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
 		}
 		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
 		}
 		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
 		}
 		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
 				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
 		}
 		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
 		}
                 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
 		}
                 w_traj_ops_completed++;

Return to bug 211152

Line 0 Link Here

(-)files/patch-iozone_2.c (+457 lines)
		1	--- iozone.c.orig 2016-07-17 01:34:04 UTC
		2	+++ iozone.c
		3	@@ -351,6 +351,10 @@ typedef long long off64_t;
		4	typedef off_t off64_t;
		5	#endif
		6
		7	+#if defined(__FreeBSD__)
		8	+#define __off64_t_defined
		9	+typedef off_t off64_t;
		10	+#endif
		11
		12	#ifndef solaris
		13	#ifndef off64_t
		14	@@ -360,6 +364,7 @@ typedef off_t off64_t;
		15	#ifndef SCO_Unixware_gcc
		16	#ifndef UWIN
		17	#ifndef __DragonFly__
		18	+#ifndef __FreeBSD__
		19	typedef long long off64_t;
		20	#endif
		21	#endif
		22	@@ -369,6 +374,7 @@ typedef long long off64_t;
		23	#endif
		24	#endif
		25	#endif
		26	+#endif
		27
		28	#ifdef __AIX__
		29	#include <fcntl.h>
		30	@@ -1918,7 +1924,7 @@ char **argv;
		31	#ifdef NO_PRINT_LLD
		32	sscanf(optarg,"%ld",&kilobytes64);
		33	#else
		34	- sscanf(optarg,"%lld",&kilobytes64);
		35	+ sscanf(optarg,"%lld",(long long *)&kilobytes64);
		36	#endif
		37	if(optarg[strlen(optarg)-1]=='k' \|\|
		38	optarg[strlen(optarg)-1]=='K'){
		39	@@ -1942,7 +1948,7 @@ char **argv;
		40	#ifdef NO_PRINT_LLD
		41	sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64);
		42	#else
		43	- sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",kilobytes64);
		44	+ sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",(long long)kilobytes64);
		45	#endif
		46	sflag++;
		47	break;
		48	@@ -2316,7 +2322,7 @@ char **argv;
		49	#ifdef NO_PRINT_LLD
		50	sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size);
		51	#else
		52	- sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",minimum_file_size);
		53	+ sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",(long long)minimum_file_size);
		54	#endif
		55	break;
		56	case 'g': /* Set maximum file size for auto mode */
		57	@@ -2339,7 +2345,7 @@ char **argv;
		58	#ifdef NO_PRINT_LLD
		59	sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size);
		60	#else
		61	- sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",maximum_file_size);
		62	+ sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",(long long)maximum_file_size);
		63	#endif
		64	break;
65	case 'z': /* Set no cross over */
66	@@ -2447,7 +2453,7 @@ char **argv;
67	#ifdef NO_PRINT_LLD
68	sscanf(subarg,"%ld",&burst_size_kb_64);
69	#else
70	- sscanf(subarg,"%lld",&burst_size_kb_64);
71	+ sscanf(subarg,"%lld",(long long *)&burst_size_kb_64);
72	#endif
73	if(subarg[strlen(subarg)-1]=='k' \|\|
74	subarg[strlen(subarg)-1]=='K'){
75	@@ -3109,7 +3115,7 @@ char **argv;
76	burst_size_kb_64, burst_sleep_duration_msec);
77	#else
78	printf("\tBurst size set to %lld Kbytes.\n\tBurst sleep duration set to %lld msec\n",
79	- burst_size_kb_64, burst_sleep_duration_msec);
80	+ (long long)burst_size_kb_64, burst_sleep_duration_msec);
81	#endif
82	if(!rflag)
83	reclen=(long long)4096;
84	@@ -3345,7 +3351,7 @@ long long reclength;
85	if(!silent) printf("%8ld",reclen/1024);
86	}
87	#else
88	- if(!silent) printf("%16lld",kilobytes64);
89	+ if(!silent) printf("%16lld",(long long)kilobytes64);
90	if(r_traj_flag \|\| w_traj_flag)
91	{
92	if(!silent) printf("%8lld",(long long )0);
93	@@ -3403,7 +3409,7 @@ long long reclength;
94	printf("\n\tiozone %ld %ld ", kilobytes64, goodrecl);
95	printf("\t(i.e. record size = %ld bytes)\n", goodrecl);
96	#else
97	- printf("\n\tiozone %lld %lld ", kilobytes64, goodrecl);
98	+ printf("\n\tiozone %lld %lld ", (long long)kilobytes64, goodrecl);
99	printf("\t(i.e. record size = %lld bytes)\n", goodrecl);
100	#endif
101	}
102	@@ -3544,7 +3550,7 @@ void auto_test()
103	min_rec_size,min_file_size);
104	#else
105	printf("Error: record length %lld is greater than filesize %lld kB\n ",
106	- min_rec_size,min_file_size);
107	+ min_rec_size,(long long)min_file_size);
108	#endif
109	exit(23);
110	}
111	@@ -3739,7 +3745,7 @@ throughput_test()
112	port,kilobytes64);
113	#else
114	if(!silent) printf("\tEach %s writes a %lld kByte file in telemetry controlled records\n",
115	- port,kilobytes64);
116	+ port,(long long)kilobytes64);
117	#endif
118	}
119	else
120	@@ -3749,7 +3755,7 @@ throughput_test()
121	port,kilobytes64,reclen/1024);
122	#else
123	if(!silent) printf("\tEach %s writes a %lld kByte file in %lld kByte records\n",
124	- port,kilobytes64,reclen/1024);
125	+ port,(long long)kilobytes64,reclen/1024);
126	#endif
127	}
128
129	@@ -7182,8 +7188,8 @@ char sverify;
130	printf("where %8.8lx loop %ld\n",where,i);
131	#else
132	printf("Error in file: Found ?%llx? Expecting ?%llx? addr %lx\n",*where, (long long)((pattern_buf<<32)\|pattern_buf),((long)where));
133	- printf("Error in file: Position %lld \n",file_position);
134	- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024);
135	+ printf("Error in file: Position %lld \n",(long long)file_position);
136	+ printf("Record # %lld Record size %lld kb \n",(long long)recnum,recsize/1024);
137	printf("where %px loop %lld\n",where,(long long)i);
138	#endif
139	return(1);
140	@@ -7226,9 +7232,9 @@ char sverify;
141	printf("Error in file: Position %ld \n",file_position);
142	printf("Record # %ld Record size %ld kb \n",recnum,recsize/1024);
143	#else
144	- printf("Error in file: Position %lld %lld %lld \n",i,j,k);
145	- printf("Error in file: Position %lld \n",file_position);
146	- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024);
147	+ printf("Error in file: Position %lld %lld %lld \n",(long long)i,j,k);
148	+ printf("Error in file: Position %lld \n",(long long)file_position);
149	+ printf("Record # %lld Record size %lld kb \n",(long long)recnum,recsize/1024);
150	#endif
151	printf("Found pattern: Char >>%c<< Expecting >>%c<<\n", where2,pattern_ptr);
152	printf("Found pattern: Hex >>%x<< Expecting >>%x<<\n", where2,pattern_ptr);
153	@@ -7835,9 +7841,9 @@ long long *data2;
154	else
155	fprintf(rwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
156	#else
157	- fprintf(wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
158	+ fprintf(wqfd,"%10.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
159	else
160	- fprintf(rwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
161	+ fprintf(rwqfd,"%10.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,((qtime_stop-qtime_start-time_res))*1000000,reclen);
162	#endif
163	}
164	w_traj_ops_completed++;
165	@@ -8331,7 +8337,7 @@ long long data1,data2;
166	printf("\nError freading block %lu %lx\n", i,
167	(unsigned long long)buffer);
168	#else
169	- printf("\nError freading block %llu %llx\n", i,
170	+ printf("\nError freading block %llu %llx\n", (long long)i,
171	(unsigned long long)buffer);
172	#endif
173	#else
174	@@ -8749,7 +8755,7 @@ long long data1,data2;
175	printf("\nError reading block %ld %lx\n", i,
176	(unsigned long long)nbuff);
177	#else
178	- printf("\nError reading block %lld %llx\n", i,
179	+ printf("\nError reading block %lld %llx\n", (long long)i,
180	(unsigned long long)nbuff);
181	#endif
182	#else
183	@@ -8798,9 +8804,9 @@ long long data1,data2;
184	else
185	fprintf(rrqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
186	#else
187	- fprintf(rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
188	+ fprintf(rqfd,"%10.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
189	else
190	- fprintf(rrqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
191	+ fprintf(rrqfd,"%10.1lld %10.0f %10.1lld\n",((long long)traj_offset)/1024,(qtime_stop-qtime_start-time_res)*1000000,reclen);
192	#endif
193	}
194	r_traj_ops_completed++;
195	@@ -9227,7 +9233,7 @@ long long data1, data2;
196	offset64);
197	#else
198	printf("\nError reading block at %lld\n",
199	- offset64);
200	+ (long long)offset64);
201	#endif
202	perror("read");
203	exit(70);
204	@@ -9351,7 +9357,7 @@ long long data1, data2;
205	offset64);
206	#else
207	printf("\nError writing block at %lld\n",
208	- offset64);
209	+ (long long)offset64);
210	#endif
211	if(wval==-1)
212	perror("write");
213	@@ -9667,7 +9673,7 @@ long long data1,data2;
214	#ifdef NO_PRINT_LLD
215	printf("\nError reading block %ld\n", i);
216	#else
217	- printf("\nError reading block %lld\n", i);
218	+ printf("\nError reading block %lld\n", (long long)i);
219	#endif
220	perror("read");
221	exit(79);
222	@@ -10272,8 +10278,8 @@ long long data1, data2;
223	printf("\nError reading block %ld, fd= %d Filename %s Read returned %ld\n", i, fd,filename,uu);
224	printf("\nSeeked to %ld Reclen = %ld\n", savepos64,reclen);
225	#else
226	- printf("\nError reading block %lld, fd= %d Filename %s Read returned %lld\n", i, fd,filename,uu);
227	- printf("\nSeeked to %lld Reclen = %lld\n", savepos64,reclen);
228	+ printf("\nError reading block %lld, fd= %d Filename %s Read returned %lld\n", (long long)i, fd,filename,uu);
229	+ printf("\nSeeked to %lld Reclen = %lld\n", (long long)savepos64,reclen);
230	#endif
231	perror("read");
232	exit(88);
233	@@ -11799,7 +11805,7 @@ long long who;
234	#ifdef NO_PRINT_LLD
235	if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"');
236	#else
237	- if(!silent) printf(" %c%lld%c",'"',rec_size/1024,'"');
238	+ if(!silent) printf(" %c%lld%c",'"',(long long)rec_size/1024,'"');
239	#endif
240	}
241	if(!silent) printf("\n");
242	@@ -11817,7 +11823,7 @@ long long who;
243	#ifdef NO_PRINT_LLD
244	if(!silent) printf("%c%ld%c ",'"',current_file_size,'"');
245	#else
246	- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"');
247	+ if(!silent) printf("%c%lld%c ",'"',(long long)current_file_size,'"');
248	#endif
249	for(i=0;i<=max_y;i++){
250	if(report_array[0][i] != current_file_size){
251	@@ -11832,7 +11838,7 @@ long long who;
252	#ifdef NO_PRINT_LLD
253	if(!silent) printf("%c%ld%c ",'"',current_file_size,'"');
254	#else
255	- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"');
256	+ if(!silent) printf("%c%lld%c ",'"',(long long)current_file_size,'"');
257	#endif
258	}
259	if(bif_flag)
260	@@ -11840,7 +11846,7 @@ long long who;
261	#ifdef NO_PRINT_LLD
262	if(!silent) printf(" %ld ",report_array[who][i]);
263	#else
264	- if(!silent) printf(" %lld ",report_array[who][i]);
265	+ if(!silent) printf(" %lld ",(long long)report_array[who][i]);
266	#endif
267	}
268	if(bif_flag)
269	@@ -12029,7 +12035,7 @@ long long who;
270	#ifdef NO_PRINT_LLD
271	if(!silent) printf(" %c%ld%c",'"',rec_size/1024,'"');
272	#else
273	- if(!silent) printf(" %c%lld%c",'"',rec_size/1024,'"');
274	+ if(!silent) printf(" %c%lld%c",'"',(long long)rec_size/1024,'"');
275	#endif
276	}
277	if(!silent) printf("\n");
278	@@ -12047,7 +12053,7 @@ long long who;
279	#ifdef NO_PRINT_LLD
280	if(!silent) printf("%c%ld%c ",'"',current_file_size,'"');
281	#else
282	- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"');
283	+ if(!silent) printf("%c%lld%c ",'"',(long long)current_file_size,'"');
284	#endif
285	for (i = 0; i <= max_y; i++) {
286	if (report_array[0][i] != current_file_size) {
287	@@ -12062,7 +12068,7 @@ long long who;
288	#ifdef NO_PRINT_LLD
289	if(!silent) printf("%c%ld%c ",'"',current_file_size,'"');
290	#else
291	- if(!silent) printf("%c%lld%c ",'"',current_file_size,'"');
292	+ if(!silent) printf("%c%lld%c ",'"',(long long)current_file_size,'"');
293	#endif
294	}
295	if (bif_flag)
296	@@ -13061,7 +13067,7 @@ printf("Desired rate %g Actual rate %g
297	#ifdef NO_PRINT_LLD
298	fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
299	#else
300	- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
301	+ 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);
302	#endif
303	}
304	w_traj_ops_completed++;
305	@@ -13715,7 +13721,7 @@ printf("Desired rate %g Actual rate %g
306	#ifdef NO_PRINT_LLD
307	fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
308	#else
309	- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
310	+ 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);
311	#endif
312	}
313	w_traj_ops_completed++;
314	@@ -14325,7 +14331,7 @@ printf("Desired rate %g Actual rate %g
315	#ifdef NO_PRINT_LLD
316	fprintf(thread_rwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
317	#else
318	- fprintf(thread_rwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
319	+ 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);
320	#endif
321	}
322	if(rlocking)
323	@@ -14840,7 +14846,7 @@ thread_read_test(x)
324	printf("\nError reading block %ld, fd= %d\n", i,
325	fd);
326	#else
327	- printf("\nError reading block %lld, fd= %d\n", i,
328	+ printf("\nError reading block %lld, fd= %d\n", (long long)i,
329	fd);
330	#endif
331	perror("read");
332	@@ -14914,7 +14920,7 @@ printf("Desired rate %g Actual rate %g
333	#ifdef NO_PRINT_LLD
334	fprintf(thread_rqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
335	#else
336	- fprintf(thread_rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
337	+ 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);
338	#endif
339	}
340
341	@@ -15375,7 +15381,7 @@ thread_pread_test(x)
342	printf("\nError preading block %ld, fd= %d\n", i,
343	fd);
344	#else
345	- printf("\nError preading block %lld, fd= %d\n", i,
346	+ printf("\nError preading block %lld, fd= %d\n", (long long)i,
347	fd);
348	#endif
349	perror("pread");
350	@@ -15449,7 +15455,7 @@ printf("Desired rate %g Actual rate %g
351	#ifdef NO_PRINT_LLD
352	fprintf(thread_rqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
353	#else
354	- fprintf(thread_rqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
355	+ 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);
356	#endif
357	}
358
359	@@ -15953,7 +15959,7 @@ thread_rread_test(x)
360	printf("\nError writing block %ld, fd= %d\n", i,
361	fd);
362	#else
363	- printf("\nError writing block %lld, fd= %d\n", i,
364	+ printf("\nError writing block %lld, fd= %d\n", (long long)i,
365	fd);
366	#endif
367	perror("read");
368	@@ -16027,7 +16033,7 @@ printf("Desired rate %g Actual rate %g
369	#ifdef NO_PRINT_LLD
370	fprintf(thread_rrqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
371	#else
372	- fprintf(thread_rrqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
373	+ 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);
374	#endif
375	}
376
377	@@ -16503,7 +16509,7 @@ thread_reverse_read_test(x)
378	#ifdef NO_PRINT_LLD
379	printf("\nError reading block %ld\n", i);
380	#else
381	- printf("\nError reading block %lld\n", i);
382	+ printf("\nError reading block %lld\n", (long long)i);
383	#endif
384	perror("read");
385	if (!no_unlink)
386	@@ -16585,7 +16591,7 @@ printf("Desired rate %g Actual rate %g
387	#ifdef NO_PRINT_LLD
388	fprintf(thread_revqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
389	#else
390	- fprintf(thread_revqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
391	+ 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);
392	#endif
393	}
394	}
395	@@ -17013,7 +17019,7 @@ thread_stride_read_test(x)
396	#ifdef NO_PRINT_LLD
397	printf("\nError reading block %ld, fd= %d\n", i, fd);
398	#else
399	- printf("\nError reading block %lld, fd= %d\n", i, fd);
400	+ printf("\nError reading block %lld, fd= %d\n", (long long)i, fd);
401	#endif
402	perror("read");
403	if (!no_unlink)
404	@@ -17130,7 +17136,7 @@ printf("Desired rate %g Actual rate %g
405	#ifdef NO_PRINT_LLD
406	fprintf(thread_strqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
407	#else
408	- fprintf(thread_strqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
409	+ 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);
410	#endif
411	}
412	}
413	@@ -17737,7 +17743,7 @@ thread_ranread_test(x)
414	offset);
415	#else
416	printf("\nError reading block at %lld\n",
417	- offset);
418	+ (long long)offset);
419	#endif
420	perror("ranread");
421	if (!no_unlink)
422	@@ -17814,7 +17820,7 @@ printf("Desired rate %g Actual rate %g
423	#ifdef NO_PRINT_LLD
424	fprintf(thread_randrfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
425	#else
426	- fprintf(thread_randrfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
427	+ 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);
428	#endif
429	}
430	}
431	@@ -18492,7 +18498,7 @@ printf("Desired rate %g Actual rate %g
432	#ifdef NO_PRINT_LLD
433	fprintf(thread_randwqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
434	#else
435	- fprintf(thread_randwqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
436	+ 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);
437	#endif
438	}
439	w_traj_ops_completed++;
440	@@ -25030,7 +25036,7 @@ void * thread_fwrite_test( x)
441	#ifdef NO_PRINT_LLD
442	fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
443	#else
444	- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
445	+ 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);
446	#endif
447	}
448	w_traj_ops_completed++;
449	@@ -25489,7 +25495,7 @@ void * thread_fread_test( x)
450	#ifdef NO_PRINT_LLD
451	fprintf(thread_wqfd,"%10.1ld %10.0f %10.1ld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
452	#else
453	- fprintf(thread_wqfd,"%10.1lld %10.0f %10.1lld\n",(traj_offset)/1024,((thread_qtime_stop-thread_qtime_start-time_res))*1000000,reclen);
454	+ 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);
455	#endif
456	}
457	w_traj_ops_completed++;