FreeBSD Bugzilla – Attachment 172598 Details for
Bug 211152
benchmarks/iozone: Build fails on typedef redefinition with different types ('long long' vs '__off64_t' (aka 'long'))
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff_benchmarks_iozone
svn-diff_benchmarks_iozone (text/plain), 5.50 KB, created by
Walter Schwarzenfeld
on 2016-07-16 23:39:04 UTC
(
hide
)
Description:
svn-diff_benchmarks_iozone
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2016-07-16 23:39:04 UTC
Size:
5.50 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 418649) >+++ Makefile (working copy) >@@ -29,6 +29,15 @@ > THREADS_LDFLAGS= -lpthread > THREADS_CFLAGS_OFF= -DNO_THREADS > >+.include <bsd.port.pre.mk> >+ >+post-patch: >+# Remove line 363 "typedef long long off64_t;" from iozone.c >+# Please, on update checK if it is the same line-number >+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 >+ @${REINPLACE_CMD} -e '363d' ${WRKSRC}/iozone.c >+.endif >+ > post-patch-SSH-on: > @${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \ > ${WRKSRC}/iozone.c >@@ -38,4 +47,4 @@ > ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \ > ${STAGEDIR}${MAN1PREFIX}/man/man1 > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: files/patch-iozone_2.c >=================================================================== >--- files/patch-iozone_2.c (nonexistent) >+++ files/patch-iozone_2.c (working copy) >@@ -0,0 +1,103 @@ >+--- iozone.c.orig 2016-07-16 17:05:13 UTC >++++ iozone.c >+@@ -1916,7 +1916,7 @@ char **argv; >+ break; >+ case 's': /* Set file size */ >+ #ifdef NO_PRINT_LLD >+- sscanf(optarg,"%ld",&kilobytes64); >++ sscanf(optarg,"%ld",(long long *)&kilobytes64); >+ #else >+ sscanf(optarg,"%lld",&kilobytes64); >+ #endif >+@@ -1940,7 +1940,7 @@ char **argv; >+ min_file_size = (off64_t)s_range[0]; /* Make visable globally */ >+ >+ #ifdef NO_PRINT_LLD >+- sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",kilobytes64); >++ sprintf(splash[splash_line++],"\tFile size set to %ld kB\n",(long long )kilobytes64); >+ #else >+ sprintf(splash[splash_line++],"\tFile size set to %lld kB\n",kilobytes64); >+ #endif >+@@ -2314,7 +2314,7 @@ char **argv; >+ if(minimum_file_size < page_size/1024) >+ minimum_file_size=(off64_t)(page_size/1024); >+ #ifdef NO_PRINT_LLD >+- sprintf(splash[splash_line++],"\tUsing minimum file size of %ld kilobytes.\n",minimum_file_size); >++ sprintf(splash[splash_line++],"\tUsing minimum file size of %ld (long long)kilobytes.\n",minimum_file_size); >+ #else >+ sprintf(splash[splash_line++],"\tUsing minimum file size of %lld kilobytes.\n",minimum_file_size); >+ #endif >+@@ -2337,7 +2337,7 @@ char **argv; >+ if(maximum_file_size < RECLEN_START/1024) >+ maximum_file_size=(off64_t)(RECLEN_START/1024); >+ #ifdef NO_PRINT_LLD >+- sprintf(splash[splash_line++],"\tUsing maximum file size of %ld kilobytes.\n",maximum_file_size); >++ sprintf(splash[splash_line++],"\tUsing maximum file size of %ld (long long)kilobytes.\n",maximum_file_size); >+ #else >+ sprintf(splash[splash_line++],"\tUsing maximum file size of %lld kilobytes.\n",maximum_file_size); >+ #endif >+@@ -2447,7 +2447,7 @@ char **argv; >+ #ifdef NO_PRINT_LLD >+ sscanf(subarg,"%ld",&burst_size_kb_64); >+ #else >+- sscanf(subarg,"%lld",&burst_size_kb_64); >++ sscanf(subarg,"%lld",(long long *)&burst_size_kb_64); >+ #endif >+ if(subarg[strlen(subarg)-1]=='k' || >+ subarg[strlen(subarg)-1]=='K'){ >+@@ -3109,7 +3109,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 +3345,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 +3403,7 @@ long long reclength; >+ printf("\n\tiozone %ld %ld ", kilobytes64, goodrecl); >+ printf("\t(i.e. record size = %ld bytes)\n", goodrecl); >+ #else >+- printf("\n\tiozone %lld %lld ", kilobytes64, goodrecl); >++ printf("\n\tiozone %lld %lld ", (long long)kilobytes64, goodrecl); >+ printf("\t(i.e. record size = %lld bytes)\n", goodrecl); >+ #endif >+ } >+@@ -3544,7 +3544,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); >+ } >+@@ -3749,7 +3749,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 +7182,8 @@ char sverify; >+ printf("where %8.8lx loop %ld\n",where,i); >+ #else >+ printf("Error in file: Found ?%llx? Expecting ?%llx? addr %lx\n",*where, (long long)((pattern_buf<<32)|pattern_buf),((long)where)); >+- printf("Error in file: Position %lld \n",file_position); >+- printf("Record # %lld Record size %lld kb \n",recnum,recsize/1024); >++ printf("Error in file: Position %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); > >Property changes on: files/patch-iozone_2.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 211152
:
172588
|
172593
|
172598
|
172600
|
172627
|
172630
|
172682
|
172683
|
172736