Attachment #172683 for bug #211152

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= iozone	4	PORTNAME= iozone
5	DISTVERSION= 3_434	5	DISTVERSION= 3_444
6	CATEGORIES= benchmarks	6	CATEGORIES= benchmarks
7	MASTER_SITES= http://www.iozone.org/src/current/	7	MASTER_SITES= http://www.iozone.org/src/current/
8	DISTNAME= ${PORTNAME}${DISTVERSION}	8	DISTNAME= ${PORTNAME}${DISTVERSION}
Lines 12-18 Link Here
12		12
13	WRKSRC= ${WRKDIR}/${DISTNAME}/src/current	13	WRKSRC= ${WRKDIR}/${DISTNAME}/src/current
14		14
15	USES= tar	15	USES= tar:tgz
16	MAKEFILE= makefile	16	MAKEFILE= makefile
17	MAKE_ARGS= ${MAKE_ENV}	17	MAKE_ARGS= ${MAKE_ENV}
18	ALL_TARGET= freebsd	18	ALL_TARGET= freebsd

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1466168535	1	TIMESTAMP = 1468829143
2	SHA256 (iozone3_434.tar) = 2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a	2	SHA256 (iozone3_444.tgz) = 715f14910e9cb2adda46500e343474a3a8bf9dbd688dfdd4e432af55d838c2bd
3	SIZE (iozone3_434.tar) = 1843200	3	SIZE (iozone3_444.tgz) = 823479




--- iozone.c.orig	2016-07-17 01:34:04 UTC
Also remove redundant casts and fix printf-formatting.

	-mi
--- iozone.c	2015-10-20 14:12:13.000000000 +0000
+++ iozone.c
@@ -351,6 +351,10 @@ typedef long long off64_t;
 typedef off_t off64_t;
 #endif
-				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;
 
+#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)
 	{
 		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
@@ -22185,5 +22179,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
 		}
 		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++;
+		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;
 	};




The bulk of this patch eliminates the gratutious differences between
LP64, LARGEFILE64 and normal cases. The differences are dealt with
in one location and the rest of the code need not differ.

Most of the other changes deal with printf-formats (%zd for ssize_t
and the like) and other warnings.

	-mi
--- libasync.c	2015-10-20 14:12:13.000000000 +0000
+++ libasync.c
@@ -97,4 +97,13 @@
 #include <sys/types.h>
 #include <aio.h>
+
+#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
@@ -133,9 +142,13 @@
 #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)
@@ -151,13 +164,14 @@
  * 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 */
@@ -192,6 +205,6 @@
 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();
@@ -275,5 +288,5 @@
 	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
@@ -348,87 +361,26 @@
 	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
 				);
 		}
@@ -444,13 +396,5 @@
 		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)
 		{
@@ -458,5 +402,5 @@
 				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);
 		}
 	}
@@ -483,13 +427,5 @@
 			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)
 		{
@@ -501,81 +437,25 @@
 	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",
+			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
-#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",
-				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
-#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;
@@ -602,5 +482,5 @@
 {
 	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)
@@ -610,31 +490,11 @@
 	}
 	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");
@@ -642,22 +502,8 @@
 	}
 	/*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;
@@ -688,6 +534,4 @@
 	}
 	move=gc->head;
-#ifdef _LARGEFILE64_SOURCE 
-#ifdef __LP64__
 	while(move)
 	{
@@ -699,26 +543,4 @@
 		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);
 }
@@ -805,24 +627,8 @@
 		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 */
@@ -865,98 +671,27 @@
 	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
 				);
 		}
@@ -974,22 +709,8 @@
 		/*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)
 		{
@@ -997,5 +718,5 @@
 				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);
 		}
 	}
@@ -1022,22 +743,8 @@
 			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)
 		{
@@ -1049,39 +756,10 @@
 	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 ||
@@ -1089,55 +767,20 @@
 			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);
@@ -1218,30 +861,14 @@
 	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)
 	{
@@ -1259,11 +886,11 @@
 		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);
@@ -1289,5 +916,5 @@
 {
 	struct cache_ent *ce;
-	long temp;
+	intptr_t temp;
 	if(fd==0LL)
 	{
@@ -1304,44 +931,10 @@
 	}
 	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;
@@ -1353,27 +946,12 @@
 	}
 	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);
@@ -1409,5 +987,5 @@
 	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);
 	}
@@ -1423,5 +1001,6 @@
 {
 	struct cache_ent *ce;
-	size_t ret,retval;
+	size_t ret;
+	int retval;
 	if(gc->w_head==0)
 		return;
@@ -1432,67 +1011,26 @@
 	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);
@@ -1534,19 +1072,11 @@
 	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)
 	{
@@ -1564,26 +1094,10 @@
 		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);
 		}
@@ -1596,5 +1110,6 @@
 
 void mbcopy(source, dest, len)
-char *source,*dest;
+const char *source;
+char *dest;
 size_t len;
 {




-	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,

Return to bug 211152

Lines 6-42 Link Here

(-)files/patch-pit_server.c (-34 lines)
6	- exit;	6	- exit;
7	}	7	}
8	/*	8	/*
9	@@ -311,6 +310,6 @@
10	" ai_socktype = %d (SOCK_STREAM = %d, SOCK_DGRAM = %d)\n"
11	" ai_protocol = %d (IPPROTO_TCP = %d, IPPROTO_UDP = %d)\n"
12	- " ai_addrlen = %d (sockaddr_in = %lu, "
13	- "sockaddr_in6 = %lu)\n",
14	+ " ai_addrlen = %d (sockaddr_in = %zu, "
15	+ "sockaddr_in6 = %zu)\n",
16	ai->ai_flags,
17	ai->ai_family,
18	@@ -621,6 +620,6 @@
19	"Sockaddr info for new TCP client:\n"
20	" sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n"
21	- " addr len = %d (sockaddr_in = %lu, "
22	- "sockaddr_in6 = %lu)\n",
23	+ " addr len = %d (sockaddr_in = %zu, "
24	+ "sockaddr_in6 = %zu)\n",
25	sadr->sa_family,
26	AF_INET,
27	@@ -729,5 +728,5 @@
28	ssize_t rBytes = count;
29	fprintf( stderr,
30	- "%s: UDP datagram received (%ld bytes).\n",
31	+ "%s: UDP datagram received (%zd bytes).\n",
32	pgmName,
33	count );
34	@@ -746,6 +745,6 @@
35	"Remote client's sockaddr info:\n"
36	" sa_family = %d (AF_INET = %d, AF_INET6 = %d)\n"
37	- " addr len = %d (sockaddr_in = %lu, "
38	- "sockaddr_in6 = %lu)\n",
39	+ " addr len = %d (sockaddr_in = %zu, "
40	+ "sockaddr_in6 = %zu)\n",
41	sadr->sa_family,
42	AF_INET,